--- php5-5.3.6.orig/ltmain.sh +++ php5-5.3.6/ltmain.sh @@ -1,52 +1,89 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# + +# libtool (GNU libtool) 2.4 +# Written by Gordon Matzigkeit , 1996 + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# Provide generalized library-building support services. +# +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION=1.5.26 -TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)" +VERSION="2.4 Debian-2.4-2ubuntu1" +TIMESTAMP="" +package_revision=1.3293 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -60,104 +97,462 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi +dirname="s,/[^/]*$,," +basename="s,^.*/,," -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} + +# The name of this program: +func_dirname_and_basename "$progpath" +progname=$func_basename_result + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=: + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + done + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} -##################################### -# Shell function definitions: -# This seems to be the best place for them # func_mktempdir [string] # Make a temporary directory that won't clash with other running @@ -167,7 +562,7 @@ { my_template="${TMPDIR-/tmp}/${1-$progname}" - if test "$run" = ":"; then + if test "$opt_dry_run" = ":"; then # Return a directory name, but don't create it in dry-run mode my_tmpdir="${my_template}-$$" else @@ -176,6359 +571,8865 @@ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $echo "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + esac +} + + +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "$1" | $SED \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" +} + + +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi +} + + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac + * ) + func_tr_sh_result=$1 ;; esac - $echo $win32_libid_type } -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () +# func_version +# Echo version message to standard output and exit. +func_version () { - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi -} + $opt_debug + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} -# func_extract_an_archive dir oldlib -func_extract_an_archive () +# func_usage +# Echo short help message to standard output and exit. +func_usage () { - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" + $opt_debug - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + echo + $ECHO "run \`$progname --help | more' for full usage" + exit $? } -# func_extract_archives gentop oldlib ... -func_extract_archives () +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. +func_help () { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" + $opt_debug - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret fi +} - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $opt_debug - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" + func_error "missing argument for $1." + exit_cmd=exit } -# End of Shell function definitions -##################################### -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" -disable_libs=no +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation - prev= - prevopt= - continue - fi +exit_cmd=: - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - --version) - echo "\ -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - -Copyright (C) 2008 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? - ;; - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + + +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" + +# Global variables. +nonopt= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" done - exit $? - ;; - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; + exit $? +} - --features) - $echo "host: $host" +# func_features +# Display the features supported by this script. +func_features () +{ + echo "host: $host" if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" + echo "enable shared libraries" else - $echo "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $echo "enable static libraries" + echo "enable static libraries" else - $echo "disable static libraries" + echo "disable static libraries" fi - exit $? - ;; - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; + exit $? +} - --preserve-dup-deps) duplicate_deps="yes" ;; +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi - *) - nonopt="$arg" - break - ;; - esac -done + exit $EXIT_MISMATCH + fi +} -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi -case $disable_libs in -no) +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift ;; -shared) - build_libtool_libs=no - build_old_libs=yes +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift ;; esac -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -if test -z "$show_help"; then - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_verbose=: +opt_silent=false +opt_verbose=false - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do + opt="$1" + shift + case $opt in + --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" + $opt_debug + ;; + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" + shift + ;; + --preserve-dup-deps) + opt_preserve_dup_deps=: + ;; + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) + opt_silent=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" + shift + ;; - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + + # Separate optargs to long options: + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; - target ) - libobj="$arg" - arg_mode=normal - continue - ;; + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; + # Validate options: - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi - -no-suppress) - suppress_opt=no - continue - ;; + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" + $opt_help || { + # Sanity checks first: + func_check_version_match - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" - * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - base_compile="$base_compile $lastarg" - done # for arg + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; - *.sx) xform=sx ;; - esac - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; +## ----------- ## +## Main. ## +## ----------- ## + +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} - func_infer_tag $base_compile +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +} - for arg in $later; do - case $arg in - -static) - build_old_libs=yes - continue - ;; +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} - -prefer-pic) - pic_mode=yes - continue - ;; - -prefer-non-pic) - pic_mode=no - continue - ;; - esac +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" done + IFS=$save_ifs +} - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no - lockfile= +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac fi +} - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo "$srcfile" > "$lockfile" +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none fi - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T <${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 - if test -z "$output_obj"; then - $run $rm "$lobj" - # Place PIC objects in $objdir - command="$command -o $lobj" - else - $run $rm "$lobj" "$output_obj" - fi - $show "$command" - if $run eval $lt_env "$command"; then : - else - test -n "$output_obj" && $run $rm $removelist - exit $EXIT_FAILURE +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` -but it should contain: -$srcfile +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - $run $rm $removelist - exit $EXIT_FAILURE - fi +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` -but it should contain: -$srcfile +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - $run $rm $removelist - exit $EXIT_FAILURE - fi +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_mode_compile arg... +func_mode_compile () +{ + $opt_debug + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal + ;; + + target ) + libobj="$arg" + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify \`-o' more than once" + arg_mode=target continue ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" continue ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" continue ;; - shrext) - shrext_cmds="$arg" - prev= + + -no-suppress) + suppress_opt=no continue ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" continue ;; + *) - eval "$prev=\"\$arg\"" - prev= - continue + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue + esac # case $arg ;; + esac # case $arg_mode - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg - -avoid-version) - avoid_version=yes - continue - ;; + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + func_fatal_error "you must specify a target with \`-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } + ;; + esac - -dlopen) - prev=dlfiles - continue - ;; + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac - -dlpreopen) - prev=dlprefiles - continue - ;; + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from \`$libobj'" + ;; + esac - -export-dynamic) - export_dynamic=yes - continue - ;; + func_infer_tag $base_compile - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi + for arg in $later; do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no continue ;; - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + -static) + build_libtool_libs=no + build_old_libs=yes continue ;; - -inst-prefix-dir) - prev=inst_prefix + -prefer-pic) + pic_mode=yes continue ;; - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac + -prefer-non-pic) + pic_mode=no continue ;; + esac + done - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi - -multi_module) - single_module="${wl}-multi_module" - continue - ;; + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + else + output_obj= + need_locks=no + lockfile= + fi - -module) - module=yes - continue - ;; + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi - -shrext) - prev=shrext - continue - ;; + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result - -no-fast-install) - fast_install=no - continue - ;; + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; + if test "$pic_mode" != no; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi - -no-undefined) - allow_undefined=no - continue - ;; + func_mkdir_p "$xdir$objdir" - -objectlist) - prev=objectlist - continue - ;; + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi - -o) prev=output ;; + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - -precious-files-regex) - prev=precious_regex - continue - ;; + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` - -release) - prev=release - continue - ;; +but it should contain: +$srcfile - -rpath) - prev=rpath - continue - ;; +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." - -R) - prev=xrpath - continue - ;; + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; then + suppress_output=' >/dev/null 2>&1' + fi + fi - -thread-safe) - thread_safe=yes - continue - ;; + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then + func_append command " -o $obj" + fi - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; +but it should contain: +$srcfile - -Xcompiler) - prev=xcompiler - continue - ;; +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." - -Xlinker) - prev=xlinker - continue - ;; + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi - -XCClinker) - prev=xcclinker - continue - ;; + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - *.$objext) - # A standard object. - objs="$objs $arg" - ;; + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + removelist=$lockfile + $RM "$lockfile" + fi + } - *.lo) - # A libtool-controlled object. + exit $EXIT_SUCCESS +} - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= +$opt_help || { + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +} - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Remove files from the build directory. - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi +Compile a source file into a libtool library object. - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +This mode accepts the following additional options: - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - *.la) - # A libtool-controlled library. +Automatically set library path, then run a program. - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; +This mode accepts the following additional options: - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg + -dlopen FILE add the directory containing FILE to the library path - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop +This mode sets the library path environment variable according to \`-dlopen' +flags. - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi +Then, COMMAND is executed, with ARGS as arguments." + ;; - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" +Complete the installation of libtool libraries. - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi - fi +Each LIBDIR is a directory that contains libtool libraries. - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with \`-') are ignored. + +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. + +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode \`$opt_mode'" + ;; esac - specialdeplibs= - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done + echo + $ECHO "Try \`$progname --help' for more information about other modes." +} - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" ;; - *) passes="conv" + + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + continue ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libs= + libdirs= + admincmds= - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" fi - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv + else + func_fatal_error "invalid argument \`$opt'" + fi + done + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" fi + done + fi - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi + echo "more information, such as the ld(1) and ld.so(8) manual pages." ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false fi + prev= + else + dest=$arg continue fi + ;; + esac + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= + else + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac + library_names= + old_library= + relink_command= + func_source "$file" - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi + func_dirname "$file" "/" "" + dir="$func_dirname_result" + func_append dir "$objdir" - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' fi - fi # link shared/static library? - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" done - dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$deplibdir/$depdepl" ; then - depdepl="$deplibdir/$depdepl" - elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - else - # Can't find it, oh well... - depdepl= - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" else - vars="compile_deplibs finalize_deplibs" + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" ;; esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - case $linkmode in - oldlib) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; - esac + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi + func_source "$wrapper" - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" fi ;; esac + done - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi + # Set up the ranlib parameters. + oldlib="$destdir/$name" - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $oldlib" 'exit $?' fi - install_libdir="$2" - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" +test "$opt_mode" = install && func_mode_install ${1+"$@"} - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi +#ifdef __cplusplus +extern \"C\" { +#endif - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; +/* External symbol declarations for the compiler. */\ +" - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac + echo >> "$output_objdir/$my_dlsyms" "\ - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; *) - verstring="0.0" + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; esac done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - #done + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; esac done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi + func_mkdir_p "$my_xdir" - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" else - # Error occurred in the first compile. Let's try to salvage - # the situation: Compile a separate program for each library. - for i in $deplibs; do - name=`expr $i : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then - $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) - newdeplibs="$newdeplibs $i" - i="" - ;; - esac - fi - if test -n "$i" ; then - libname=`eval \\$echo \"$libname_spec\"` - deplib_matches=`eval \\$echo \"$library_names_spec\"` - set dummy $deplib_matches - deplib_match=$2 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" - else - droppeddeps=yes - $echo - $echo "*** Warning: dynamic linker does not accept needed library $i." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because a test_compile did reveal that the linker did not use this one" - $echo "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - droppeddeps=yes - $echo - $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" - $echo "*** library that it depends on before this library will be fully" - $echo "*** functional. Installing it before continuing would be even better." - fi - else - newdeplibs="$newdeplibs $i" - fi - done - fi - ;; - file_magic*) - set dummy $deplibs_check_method - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac + func_extract_archives_result="$my_oldobjs" +} - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + $ECHO "\ +#! $SHELL - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi +relink_command=\"$relink_command\" - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done + func_exec_program_core \${1+\"\$@\"} +} - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi - $echo "creating a temporary reloadable object file: $output" + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" - libobjs=$output - # Restore the value of output. - output=$save_output + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. + file=\"\$\$-\$program\" - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? + $ECHO "\ - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi - exit $lt_exit - } - done - IFS="$save_ifs" + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? + $ECHO "\ - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi + if test -f \"\$progdir/\$program\"; then" - exit $EXIT_SUCCESS + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" fi - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" fi - fi - ;; - obj) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; - esac + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat <&2 - fi +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname + Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +*/ +EOF + cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif +#include +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif - # Delete the old objects. - $run $rm $obj $libobj +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ - exit $EXIT_SUCCESS - fi +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF - exit $EXIT_SUCCESS - ;; + cat <&2 - fi + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + func_to_host_path "$temp_rpath" + cat <&2 - fi + if test -n "$dllsearchpath"; then + func_to_host_path "$dllsearchpath:" + cat <&2 - fi - fi + cat < "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ +EOF -#ifdef __cplusplus -extern \"C\" { -#endif + case $host_os in + mingw*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); + rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); + if (rval == -1) + { + /* failed to start process */ + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +EOF + ;; + *) + cat <<"EOF" + execv (lt_argv_zero, newargz); + return rval; /* =127, but avoids unused variable warning */ +EOF + ;; + esac -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol + cat <<"EOF" +} -/* External symbol declarations for the compiler. */\ -" +void * +xmalloc (size_t num) +{ + void *p = (void *) malloc (num); + if (!p) + lt_fatal (__FILE__, __LINE__, "memory exhausted"); - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" + return p; +} - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), + string) : NULL; +} - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done +const char * +base_name (const char *name) +{ + const char *base; - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi - fi +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha ((unsigned char) name[0]) && name[1] == ':') + name += 2; +#endif - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return base; +} - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi +int +check_executable (const char *path) +{ + struct stat st; - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi + if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} - $echo >> "$output_objdir/$dlsyms" "\ +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; -#undef lt_preloaded_symbols + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} -/* The mapping between symbol names and symbols. */ -" +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; } -lt_preloaded_symbols[] = -{\ -" - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif + if (!has_symlinks) + { + return xstrdup (pathspec); + } -#ifdef __cplusplus + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif } -#endif\ -" - fi - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - esac +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + assert (str != NULL); + assert (pat != NULL); - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. + len = strlen (str); + patlen = strlen (pat); - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi + if (exit_status >= 0) + exit (exit_status); +} - exit $exit_status - fi +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); #else -# define LT_PATHMAX 1024 + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } #endif + } +} -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; -const char *program_name = NULL; + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; + cat <<"EOF" } - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; +EOF } +# end: func_emit_cwrapperexe_src -char * -xstrdup (const char *string) +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () { - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac } -const char * -base_name (const char *name) +# func_mode_link arg... +func_mode_link () { - const char *base; + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); + case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; + # Read the .lo file + func_source "$arg" - assert(str != NULL); - assert(pat != NULL); + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - len = strlen(str); - patlen = strlen(pat); + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi - if (exit_status >= 0) - exit (exit_status); -} + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - $echo > $output "\ -#! $SHELL + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file \`$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + prevarg="$arg" -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; -relink_command=\"$relink_command\" + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ + -avoid-version) + avoid_version=yes + continue + ;; - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_preserve_dup_deps ; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + else + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + echo + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + $ECHO "*** Warning: This system can not link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + func_append verstring ":${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_apped perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" + shlibpath="$finalize_shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi - file=\"\$\$-\$program\" + lib="$output_objdir/$realname" + linknames= + for link + do + func_append linknames " $link" + done - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= - $echo >> $output "\ + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd1 in $cmds; do + IFS="$save_ifs" + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - $echo >> $output "\ + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" - if test -f \"\$progdir/\$program\"; then" + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi - export $shlibpath_var -" + # Make a backup of the uninstalled library when relinking + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi fi - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + func_append delfiles " $output" - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + else + output= + fi - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi fi - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi - eval cmds=\"$old_archive_cmds\" + libobjs=$output + # Restore the value of output. + output=$save_output - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= + cmds=$module_cmds fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi fi fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' -# Version information for $libname. -current=$current -age=$age -revision=$revision + exit $lt_exit + } + done + IFS="$save_ifs" -# Is this an already installed library? -installed=$installed + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -# Should we warn about portability when linking against -modules? -shouldnotlink=$module + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' + exit $EXIT_SUCCESS + fi -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' fi done - fi - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi ;; - esac - exit $EXIT_SUCCESS - ;; - # libtool install mode - install) - modename="$modename: install" + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result ;; *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi + libobj= + obj="$output" ;; esac - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" + func_append generated " $gentop" - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS ;; - esac - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; + esac - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" + ;; + esac fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; esac - fi + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi + wrappers_required=yes + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' - exit $lt_exit - } - done - IFS="$save_ifs" + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' fi - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + fi - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; + exit $exit_status + fi - *.lo) - # Install (i.e. copy) a libtool object. + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi + fi - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' fi + exit $EXIT_SUCCESS - ;; + fi - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" fi + fi - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done + func_show_eval "$link_command" 'exit $?' - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + # Now create the wrapper script. + func_verbose "creating $output" - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi - fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - # Set up the ranlib parameters. - oldlib="$destdir/$name" + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" fi - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS + eval cmds=\"$old_archive_cmds\" - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi + test -n "$generated" && \ + func_show_eval "${RM}r$generated" - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi - # Read the libtool library. - dlname= - library_names= + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi +# The name that we can dlopen(3). +dlname='$tdlname' - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. +# Names of this library. +library_names='$library_names' - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - fi - ;; +# The name of the static archive. +old_library='$old_library' - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done +# Version information for $libname. +current=$current +age=$age +revision=$revision - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" +# Is this an already installed library? +installed=$installed - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# Should we warn about portability when linking against -modules? +shouldnotlink=$module - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - fi" - done + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" files= rmforce= exit_status=0 @@ -6540,44 +9441,41 @@ for arg do case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" rmdirs= - origobjdir="$objdir" for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" + func_basename "$file" + name="$func_basename_result" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then : elif test -d "$file"; then exit_status=1 @@ -6591,55 +9489,32 @@ case $name in *.la) # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name + if func_lalib_p "$file"; then + func_source $dir/$name # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -6649,288 +9524,95 @@ *.lo) # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if func_lalib_p "$file"; then # Read the .lo file - . $dir/$name + func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + if test -n "$pic_object" && + test "$pic_object" != none; then + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi ;; esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 + func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 + func_show_eval "rmdir $dir >/dev/null 2>&1" fi done exit $exit_status - ;; +} - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" +test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then - eval exec $exec_cmd + eval exec "$exec_cmd" exit $EXIT_FAILURE fi -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... +exit $exit_status -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6944,14 +9626,17 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: +# vi:sw=2 + --- php5-5.3.6.orig/config.guess +++ php5-5.3.6/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2011-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -170,7 +171,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -180,7 +181,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -324,14 +328,33 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -375,23 +398,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -461,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -475,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -532,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -575,52 +598,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -640,7 +663,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -711,22 +734,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -750,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -785,18 +808,18 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in + *:Interix*:*) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -806,6 +829,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -835,6 +861,20 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -842,7 +882,13 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -855,7 +901,18 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -866,74 +923,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + padre:Linux:*:*) + echo sparc-unknown-linux-gnu exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -943,14 +959,17 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -958,6 +977,9 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -965,71 +987,8 @@ echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1037,11 +996,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1058,7 +1017,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1073,7 +1032,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1101,10 +1060,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1139,8 +1101,18 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1153,7 +1125,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1173,10 +1145,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1202,11 +1174,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1216,6 +1188,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1243,6 +1218,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1258,6 +1243,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1303,13 +1291,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1324,6 +1312,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1346,11 +1337,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif --- php5-5.3.6.orig/configure +++ php5-5.3.6/configure @@ -1,3268 +1,6095 @@ #! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.68. +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +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 +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +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 + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +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" + 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'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +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. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + 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" +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith +# 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. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + 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; } + + # 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). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... 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'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + 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 +# 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'" +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +SHELL=${CONFIG_SHELL-/bin/sh} +test -n "$DJDIR" || exec 7<&0 &1 +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= +PACKAGE_URL= + +ac_unique_file="README.SVN-RULES" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" +ac_header_list= +ac_subst_vars='LTLIBOBJS +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +STRIP +ac_ct_AR +AR +DLLTOOL +OBJDUMP +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +LIBTOOL +PHP_VERSION_ID +PHP_VERSION +PHP_LIBS +PHP_LDFLAGS +PEAR_INSTALLDIR +NATIVE_RPATHS +INSTALL_IT +EXTRA_INCLUDES +INCLUDES +ZEND_EXTRA_LIBS +EXTRA_LIBS +EXTRA_LDFLAGS_PROGRAM +EXTRA_LDFLAGS +EXTENSION_DIR +DEBIAN_PHP_API +DEBUG_CFLAGS +program_suffix +program_prefix +php_abs_top_srcdir +php_abs_top_builddir +abs_srcdir +abs_builddir +PHP_INSTALLED_SAPIS +EXPANDED_PHP_CONFIG_FILE_SCAN_DIR +EXPANDED_PHP_CONFIG_FILE_PATH +EXPANDED_LOCALSTATEDIR +EXPANDED_SYSCONFDIR +EXPANDED_DATADIR +EXPANDED_LIBDIR +EXPANDED_SBINDIR +EXPANDED_BINDIR +EXPANDED_EXTENSION_DIR +EXPANDED_PEAR_INSTALLDIR +INCLUDE_PATH +INLINE_CFLAGS +RANLIB +LEMON +SNMP_CONFIG +PDO_OCI_VERSION +PDO_OCI_DIR +PDO_OCI_SHARED_LIBADD +PDO_MYSQL_MODULE_TYPE +ODBC_TYPE +ODBC_LFLAGS +ODBC_LIBS +ODBC_INCLUDE +OCI8_ORACLE_VERSION +OCI8_DIR +OCI8_SHARED_LIBADD +MYSQL_INCLUDE +MYSQL_LIBS +MYSQL_MODULE_TYPE +CXXCPP +ac_ct_CXX +CXXFLAGS +CXX +ICU_CONFIG +OPENSSL_INCDIR_OPT +PKG_CONFIG +KRB5_CONFIG +LTP_GENHTML +LTP +ALLOCA +LIBOBJS +PROG_SENDMAIL +php_fpm_prefix +php_fpm_localstatedir +php_fpm_sysconfdir +php_fpm_group +php_fpm_user +SHLIB_DL_SUFFIX_NAME +SHLIB_SUFFIX_NAME +RE2C +YFLAGS +YACC +AWK +LN_S +CPP +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +CONFIGURE_OPTIONS +CONFIGURE_COMMAND +SED +EGREP +GREP +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_libdir +enable_rpath +enable_re2c_cgoto +enable_ +with_aolserver +with_apxs +with_apache +enable_mod_charset +with_apxs2filter +with_apxs2 +with_apache_hooks +with_apache_hooks_static +with_caudium +enable_cli +with_continuity +enable_embed +enable_fpm +with_fpm_user +with_fpm_group +with_isapi +with_litespeed +with_milter +with_nsapi +with_phttpd +with_pi3web +with_roxen +enable_roxen_zts +with_thttpd +with_tux +with_webjames +enable_cgi +enable_gcov +enable_debug +with_layout +with_config_file_path +with_config_file_scan_dir +enable_safe_mode +with_exec_dir +enable_sigchild +enable_magic_quotes +enable_libgcc +enable_short_tags +enable_dmalloc +enable_ipv6 +enable_fd_setsize +enable_all +with_system_tzdata +with_regex +enable_libxml +with_libxml_dir +with_openssl +with_kerberos +with_pcre_regex +with_sqlite3 +with_zlib +with_zlib_dir +enable_bcmath +with_bz2 +enable_calendar +enable_ctype +with_curl +with_curlwrappers +enable_dba +with_qdbm +with_gdbm +with_ndbm +with_db4 +with_db3 +with_db2 +with_db1 +with_dbm +with_cdb +enable_inifile +enable_flatfile +enable_dom +with_enchant +enable_exif +enable_fileinfo +enable_filter +with_pcre_dir +enable_ftp +with_openssl_dir +with_gd +with_jpeg_dir +with_png_dir +with_xpm_dir +with_freetype_dir +with_t1lib +enable_gd_native_ttf +enable_gd_jis_conv +with_gettext +with_gmp +with_mhash +enable_hash +with_iconv +with_imap +with_imap_ssl +with_interbase +enable_intl +with_icu_dir +enable_json +with_ldap +with_ldap_sasl +enable_mbstring +enable_mbregex +enable_mbregex_backtrack +with_libmbfl +with_onig +with_mcrypt +with_mssql +with_mysql +with_mysql_sock +with_mysqli +enable_embedded_mysqli +with_oci8 +with_adabas +with_sapdb +with_solid +with_ibm_db2 +with_ODBCRouter +with_empress +with_empress_bcs +with_birdstep +with_custom_odbc +with_iodbc +with_esoob +with_unixODBC +with_dbmaker +enable_pcntl +enable_pdo +with_pdo_dblib +with_pdo_firebird +with_pdo_mysql +with_pdo_oci +with_pdo_odbc +with_pdo_pgsql +with_pdo_sqlite +with_pgsql +enable_phar +enable_posix +with_pspell +with_libedit +with_readline +with_recode +enable_session +with_mm +enable_shmop +enable_simplexml +with_snmp +enable_ucd_snmp_hack +enable_soap +enable_sockets +with_sqlite +enable_sqlite_utf8 +with_sybase_ct +enable_sysvmsg +enable_sysvsem +enable_sysvshm +with_tidy +enable_tokenizer +enable_wddx +with_libexpat_dir +enable_xml +enable_xmlreader +with_xmlrpc +with_iconv_dir +enable_xmlwriter +with_xsl +enable_zip +enable_disable_mysqlnd_compression_support +with_pear +with_zend_vm +enable_maintainer_zts +enable_inline_optimization +enable_zend_multibyte +with_tsrm_pth +with_tsrm_st +with_tsrm_pthreads +enable_shared +enable_static +with_pic +enable_fast_install +with_gnu_ld +with_sysroot +enable_libtool_lock +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +YACC +YFLAGS +CXX +CXXFLAGS +CCC +CXXCPP' +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + --config-cache | -C) + cache_file=config.cache ;; + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) + 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" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + -enable-* | --enable-*) + 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" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + -with-* | --with-*) + 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" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + -without-* | --without-*) + 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" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + --x) + # Obsolete; use --with-x. + with_x=yes ;; + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --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" + ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # 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'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + *) + # FIXME: should be removed in autoconf 3.0. + $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}" + ;; + esac +done +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + 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" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + 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' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +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 +fi +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +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" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +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" +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" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. +Usage: $0 [OPTION]... [VAR=VALUE]... +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. +Defaults for the options are specified in brackets. +Configuration: + -h, --help display this help and exit + --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 + --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 + --srcdir=DIR find the sources in DIR [configure dir or \`..'] +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] +_ACEOF +fi +if test -n "$ac_init_help"; then + cat <<\_ACEOF +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-rpath Disable passing additional runtime library + search paths + --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension +SAPI modules: + --enable-mod-charset APACHE: Enable transfer tables for mod_charset (Rus Apache) + --enable-mod-charset APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache) + --disable-cli Disable building CLI version of PHP + (this forces --without-pear) + --enable-embed=TYPE EXPERIMENTAL: Enable building of embedded SAPI library + TYPE is either 'shared' or 'static'. TYPE=shared + --enable-fpm EXPERIMENTAL: Enable building of the fpm SAPI executable + --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety + --disable-cgi Disable building CGI version of PHP +General settings: + --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!! + --enable-debug Compile with debugging symbols + --enable-safe-mode Enable safe mode by default + --enable-sigchild Enable PHP's own SIGCHLD handler + --enable-magic-quotes Enable magic quotes by default. + --enable-libgcc Enable explicitly linking against libgcc + --disable-short-tags Disable the short-form = 0.9.6) + --with-kerberos=DIR OPENSSL: Include Kerberos support + --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support. + DIR is the PCRE install prefix BUNDLED + --without-sqlite3=DIR Do not include SQLite3 support. DIR is the prefix to + SQLite3 installation directory. + --with-zlib=DIR Include ZLIB support (requires zlib >= 1.0.9) + --with-zlib-dir= Define the location of zlib install directory + --with-bz2=DIR Include BZip2 support + --with-curl=DIR Include cURL support + --with-curlwrappers EXPERIMENTAL: Use cURL for url streams + --with-qdbm=DIR DBA: QDBM support + --with-gdbm=DIR DBA: GDBM support + --with-ndbm=DIR DBA: NDBM support + --with-db4=DIR DBA: Oracle Berkeley DB 4.x or 5.x support + --with-db3=DIR DBA: Oracle Berkeley DB 3.x support + --with-db2=DIR DBA: Oracle Berkeley DB 2.x support + --with-db1=DIR DBA: Oracle Berkeley DB 1.x support/emulation + --with-dbm=DIR DBA: DBM support + --without-cdb=DIR DBA: CDB support (bundled) + --with-libxml-dir=DIR DOM: libxml2 install prefix + --with-enchant=DIR Include enchant support. + GNU Aspell version 1.1.3 or higher required. + --with-pcre-dir FILTER: pcre install prefix + --with-openssl-dir=DIR FTP: openssl install prefix + --with-gd=DIR Include GD support. DIR is the GD library base + install directory BUNDLED + --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix + --with-png-dir=DIR GD: Set the path to libpng install prefix + --with-zlib-dir=DIR GD: Set the path to libz install prefix + --with-xpm-dir=DIR GD: Set the path to libXpm install prefix + --with-freetype-dir=DIR GD: Set the path to FreeType 2 install prefix + --with-t1lib=DIR GD: Include T1lib support. T1lib version >= 5.0.0 required + --with-gettext=DIR Include GNU gettext support + --with-gmp=DIR Include GNU MP support + --with-mhash=DIR Include mhash support + --without-iconv=DIR Exclude iconv support + --with-imap=DIR Include IMAP support. DIR is the c-client install prefix + --with-kerberos=DIR IMAP: Include Kerberos support. DIR is the Kerberos install prefix + --with-imap-ssl=DIR IMAP: Include SSL support. DIR is the OpenSSL install prefix + --with-interbase=DIR Include InterBase support. DIR is the InterBase base + install directory /usr/interbase + --with-icu-dir=DIR Specify where ICU libraries and headers can be found + --with-ldap=DIR Include LDAP support + --with-ldap-sasl=DIR LDAP: Include Cyrus SASL support + --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base + install directory BUNDLED + --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. + If DIR is not set, the bundled oniguruma will be used + --with-mcrypt=DIR Include mcrypt support + --with-mssql=DIR Include MSSQL-DB support. DIR is the FreeTDS home + directory /usr/local/freetds + --with-mysql=DIR Include MySQL support. DIR is the MySQL base + directory. If mysqlnd is passed as DIR, + the MySQL native driver will be used /usr/local + --with-mysql-sock=DIR MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. + If unspecified, the default locations are searched + --with-zlib-dir=DIR MySQL: Set the path to libz install prefix + --with-mysqli=FILE Include MySQLi support. FILE is the path + to mysql_config. If mysqlnd is passed as FILE, + the MySQL native driver will be used mysql_config + --with-oci8=DIR Include Oracle (OCI8) support. DIR defaults to \$ORACLE_HOME. + Use --with-oci8=instantclient,/path/to/instant/client/lib + to use an Oracle Instant Client installation + --with-adabas=DIR Include Adabas D support /usr/local + --with-sapdb=DIR Include SAP DB support /usr/local + --with-solid=DIR Include Solid support /usr/local/solid + --with-ibm-db2=DIR Include IBM DB2 support /home/db2inst1/sqllib + --with-ODBCRouter=DIR Include ODBCRouter.com support /usr + --with-empress=DIR Include Empress support \$EMPRESSPATH + (Empress Version >= 8.60 required) + --with-empress-bcs=DIR + Include Empress Local Access support \$EMPRESSPATH + (Empress Version >= 8.60 required) + --with-birdstep=DIR Include Birdstep support /usr/local/birdstep + --with-custom-odbc=DIR + Include user defined ODBC support. DIR is ODBC install base + directory /usr/local. Make sure to define CUSTOM_ODBC_LIBS and + have some odbc.h in your include dirs. f.e. you should define + following for Sybase SQL Anywhere 5.5.00 on QNX, prior to + running this configure script: + CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" + LDFLAGS=-lunix + CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\" + --with-iodbc=DIR Include iODBC support /usr/local + --with-esoob=DIR Include Easysoft OOB support /usr/local/easysoft/oob/client + --with-unixODBC=DIR Include unixODBC support /usr/local + --with-dbmaker=DIR Include DBMaker support + --with-pdo-dblib=DIR PDO: DBLIB-DB support. DIR is the FreeTDS home directory + --with-pdo-firebird=DIR PDO: Firebird support. DIR is the Firebird base + install directory /opt/firebird + --with-pdo-mysql=DIR PDO: MySQL support. DIR is the MySQL base directory + If mysqlnd is passed as DIR, the MySQL native + native driver will be used /usr/local + --with-zlib-dir=DIR PDO_MySQL: Set the path to libz install prefix + --with-pdo-oci=DIR PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME. + Use --with-pdo-oci=instantclient,prefix,version + for an Oracle Instant Client SDK. + For Linux with 10.2.0.3 RPMs (for example) use: + --with-pdo-oci=instantclient,/usr,10.2.0.3 + --with-pdo-odbc=flavour,dir + PDO: Support for 'flavour' ODBC driver. + include and lib dirs are looked for under 'dir'. + 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic + If ',dir' part is omitted, default for the flavour + you have selected will used. e.g.: + --with-pdo-odbc=unixODBC + will check for unixODBC under /usr/local. You may attempt + to use an otherwise unsupported driver using the \"generic\" + flavour. The syntax for generic ODBC support is: + --with-pdo-odbc=generic,dir,libname,ldflags,cflags + When build as shared the extension filename is always pdo_odbc.so + --with-pdo-pgsql=DIR PDO: PostgreSQL support. DIR is the PostgreSQL base + install directory or the path to pg_config + --without-pdo-sqlite=DIR + PDO: sqlite 3 support. DIR is the sqlite base + install directory BUNDLED + --with-pgsql=DIR Include PostgreSQL support. DIR is the PostgreSQL + base install directory or the path to pg_config + --with-pspell=DIR Include PSPELL support. + GNU Aspell version 0.50.0 or higher required + --with-libedit=DIR Include libedit readline replacement (CLI/CGI only) + --with-readline=DIR Include readline support (CLI/CGI only) + --with-recode=DIR Include recode support + --with-mm=DIR SESSION: Include mm support for session storage + --with-libxml-dir=DIR SimpleXML: libxml2 install prefix + --with-snmp=DIR Include SNMP support + --with-openssl-dir=DIR SNMP: openssl install prefix + --with-libxml-dir=DIR SOAP: libxml2 install prefix + --without-sqlite=DIR Do not include sqlite support. DIR is the sqlite base + install directory BUNDLED + --with-sybase-ct=DIR Include Sybase-CT support. DIR is the Sybase home + directory /home/sybase + --with-tidy=DIR Include TIDY support + --with-libxml-dir=DIR WDDX: libxml2 install prefix + --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated) + --with-libxml-dir=DIR XML: libxml2 install prefix + --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated) + --with-libxml-dir=DIR XMLReader: libxml2 install prefix + --with-xmlrpc=DIR Include XMLRPC-EPI support + --with-libxml-dir=DIR XMLRPC-EPI: libxml2 install prefix + --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated) + --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI + --with-libxml-dir=DIR XMLWriter: libxml2 install prefix + --with-xsl=DIR Include XSL support. DIR is the libxslt base + install directory (libxslt >= 1.1.0 required) + --with-zlib-dir=DIR ZIP: Set the path to libz install prefix + --with-pcre-dir ZIP: pcre install prefix + --with-zlib-dir=DIR mysqlnd: Set the path to libz install prefix + --with-pear=DIR Install PEAR in DIR PREFIX/lib/php5 + --without-pear Do not install PEAR + --with-zend-vm=TYPE Set virtual machine dispatch method. Type is + one of "CALL", "SWITCH" or "GOTO" TYPE=CALL + --with-tsrm-pth=pth-config + Use GNU Pth + --with-tsrm-st Use SGI's State Threads + --with-tsrm-pthreads Use POSIX threads (default) + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + 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. + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.68 +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +} # ac_fn_c_try_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +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; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_header_mongrel +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_header_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_member +# 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_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 +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_type +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +} # ac_fn_cxx_try_compile +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +} # ac_fn_cxx_try_link +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +It was created by $as_me, which was +generated by GNU Autoconf 2.68. Invocation command line was + $ $0 $@ +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +_ASUNAME +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS +} >&5 +cat >&5 <<_ACEOF +## ----------- ## +## Core tests. ## +## ----------- ## +_ACEOF +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h +# Predefined preprocessor variables. +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +as_fn_append ac_header_list " utime.h" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$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 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +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 ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +# 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 +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_GREP_found && break 3 + done + done + 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 + fi +else + ac_cv_path_GREP=$GREP +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +# 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 +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + 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 + fi +else + ac_cv_path_EGREP=$EGREP +fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $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 ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + PHP_VAR_SUBST="$PHP_VAR_SUBST EGREP" + PHP_VAR_SUBST="$PHP_VAR_SUBST SED" + test -f config.nice && mv config.nice config.nice.old + rm -f config.nice.old + cat >config.nice<> config.nice + fi + done + echo "'$0' \\" >> config.nice + if test `expr -- $0 : "'.*"` = 0; then + CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$0'" + else + CONFIGURE_COMMAND="$CONFIGURE_COMMAND $0" + fi + for arg in $ac_configure_args; do + if test `expr -- $arg : "'.*"` = 0; then + if test `expr -- $arg : "--.*"` = 0; then + break; + fi + echo "'$arg' \\" >> config.nice + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '$arg'" + else + if test `expr -- $arg : "'--.*"` = 0; then + break; + fi + echo "$arg \\" >> config.nice + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $arg" + fi + done + echo '"$@"' >> config.nice + chmod +x config.nice + CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS" + PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_COMMAND" + PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_OPTIONS" +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +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 +fi +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +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_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $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 +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 + +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;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $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 +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if ${ac_cv_target+:} false; then : + $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 +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +esac +target=$ac_cv_target +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac + + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + if test -z "$host_alias" && test -n "$host"; then + host_alias=$host + fi + if test -z "$host_alias"; then + as_fn_error $? "host_alias is not set!" "$LINENO" 5 + fi +ac_config_headers="$ac_config_headers main/php_config.h" +PHP_MAJOR_VERSION=5 +PHP_MINOR_VERSION=3 +PHP_RELEASE_VERSION=6 +PHP_EXTRA_VERSION="-13ubuntu3" +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` + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MAJOR_VERSION" + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MINOR_VERSION" + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_RELEASE_VERSION" + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXTRA_VERSION" -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, -## 2008 Free Software Foundation, Inc. -## Originally by Gordon Matzigkeit , 1996 -## -## This file is free software; the Free Software Foundation gives -## unlimited permission to copy and/or distribute it, with or without -## modifications, as long as this notice is preserved. - -# serial 52 AC_PROG_LIBTOOL - - -# autoconf 2.13 compatibility -# Set PATH_SEPARATOR variable -# --------------------------------- -# Find the correct PATH separator. Usually this is :', but -# DJGPP uses ;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac - PATH_SEPARATOR=$lt_cv_sys_path_separator -fi - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. - - -# AC_PROG_LIBTOOL -# --------------- -# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -# _AC_PROG_LIBTOOL -# AC_LIBTOOL_SETUP -# ---------------- -# AC_LIBTOOL_SETUP +echo "/* automatically generated by configure */" > php_version.h.new +echo "/* edit configure.in to change version number */" >> php_version.h.new +echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new +echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new +echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new +echo "#define PHP_EXTRA_VERSION \"$PHP_EXTRA_VERSION\"" >> php_version.h.new +echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new +echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new +cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 +if test $? -ne 0 ; then + rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ + echo 'Updated main/php_version.h' +else + rm -f php_version.h.new +fi -# _LT_AC_SYS_COMPILER -# ------------------- -# _LT_AC_SYS_COMPILER +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 +fi -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +if test -n "$with_apache" && test -n "$with_apxs"; then + 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 +fi -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -# _LT_COMPILER_BOILERPLATE +cwd=`pwd` -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -# _LT_LINKER_BOILERPLATE +php_shtool=$srcdir/build/shtool +T_MD=`$php_shtool echo -n -e %B` +T_ME=`$php_shtool echo -n -e %b` +test -d include || $php_shtool mkdir include +> Makefile.objects +> Makefile.fragments +pattern=define +$EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/dev/null -# _LT_REQUIRED_DARWIN_CHECKS -# -------------------------- -# Check for some things on darwin +test -z "$CFLAGS" && auto_cflags=1 +abs_srcdir=`(cd $srcdir; pwd)` +abs_builddir=`pwd` -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# _LT_AC_SYS_LIBPATH_AIX +php_abs_top_srcdir=$abs_srcdir +php_abs_top_builddir=$abs_builddir -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -# _LT_AC_SHELL_INIT +$php_shtool mkdir -p libs +rm -f libs/* -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -# _LT_AC_PROG_ECHO_BACKSLASH +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in cc gcc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# _LT_AC_LOCK -# ----------- -# _LT_AC_LOCK + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cc gcc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $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 -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -# AC_LIBTOOL_COMPILER_OPTION +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -# AC_LIBTOOL_LINKER_OPTION + test -n "$ac_ct_CC" && break +done + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -# AC_LIBTOOL_SYS_MAX_CMD_LEN +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; } -# _LT_AC_CHECK_DLFCN -# ------------------ -# _LT_AC_CHECK_DLFCN +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -# _LT_AC_TRY_DLOPEN_SELF +int +main () +{ + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -# AC_LIBTOOL_DLOPEN_SELF +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -# AC_LIBTOOL_PROG_CC_C_O +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +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; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + 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. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# AC_LIBTOOL_OBJDIR -# ----------------- -# AC_LIBTOOL_OBJDIR +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +{ { $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; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -# AC_LIBTOOL_SYS_LIB_STRIP + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -# AC_LIBTOOL_SYS_DYNAMIC_LINKER +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# _LT_AC_TAGCONFIG -# ---------------- -# _LT_AC_TAGCONFIG +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -# AC_LIBTOOL_DLOPEN +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -# AC_LIBTOOL_WIN32_DLL + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* 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); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -# AC_ENABLE_SHARED +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -# AC_DISABLE_SHARED +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -# AC_ENABLE_STATIC +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_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; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -# AC_DISABLE_STATIC + done + ac_cv_prog_CPP=$CPP +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -# AC_ENABLE_FAST_INSTALL +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +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; } +fi -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -# AC_DISABLE_FAST_INSTALL +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -# AC_LIBTOOL_PICMODE + ICC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc" >&5 +$as_echo_n "checking for icc... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +__INTEL_COMPILER +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then : + ICC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + ICC="yes" + GCC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -# AC_PROG_EGREP -# ------------- +fi +rm -f conftest* -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognize shared library -# AC_PATH_TOOL_PREFIX + SUNCC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5 +$as_echo_n "checking for suncc... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +__SUNPRO_C +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then : + SUNCC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + SUNCC="yes" + GCC="no" + test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" + GCC="" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +rm -f conftest* -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognize a shared library -# AC_PATH_MAGIC +if test "x$CC" != xcc; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 +$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 eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -# AC_PROG_LD +int +main () +{ + ; + return 0; +} +_ACEOF +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +rm -f conftest2.* +if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi +else + eval ac_cv_prog_cc_${ac_cc}_c_o=no +fi +rm -f core conftest* -# AC_PROG_LD_GNU -# -------------- -# AC_PROG_LD_GNU +fi +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h -# AC_PROG_LD_RELOAD_FLAG -# ---------------------- -# find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -# AC_PROG_LD_RELOAD_FLAG +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_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; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext -# AC_DEPLIBS_CHECK_METHOD -# ----------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -# AC_DEPLIBS_CHECK_METHOD +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + done + ac_cv_prog_CPP=$CPP -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -# AC_PROG_NM +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : -# AC_CHECK_LIBM -# ------------- -# check for math library -# AC_CHECK_LIBM +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; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -# AC_LIBTOOL_CXX +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# _LT_AC_LANG_CXX -# --------------- -# _LT_AC_LANG_CXX +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# _LT_AC_PROG_CXXCPP -# ------------------ -# _LT_AC_PROG_CXXCPP +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +else + ac_cv_header_stdc=no +fi +rm -f conftest* -# AC_LIBTOOL_LANG_C_CONFIG +fi +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. - -# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -# AC_LIBTOOL_POSTDEP_PREDEP +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -# AC_LIBTOOL_CONFIG +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- - # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- +$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -# AC_LIBTOOL_PROG_LD_SHLIBS +fi +done -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -# _LT_AC_FILE_LTDLL_C -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- + 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" = xyes; then : + MINIX=yes +else + MINIX= +fi + if test "$MINIX" = yes; then -# old names +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h +$as_echo "#define _MINIX 1" >>confdefs.h + fi + { $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 ${ac_cv_safe_to_define___extensions__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# This is just to silence aclocal about the macro not being used +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes +else + ac_cv_safe_to_define___extensions__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --with-libdir=NAME Look for libraries in .../NAME rather than .../lib" -ac_help="$ac_help - --disable-rpath Disable passing additional runtime library - search paths" -ac_help="$ac_help - --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension" -ac_help="$ac_help + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h -SAPI modules: -" -ac_help="$ac_help - --with-aolserver=DIR Specify path to the installed AOLserver" -ac_help="$ac_help - --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional - pathname to the Apache apxs tool [apxs]" -ac_help="$ac_help - --with-apache[=DIR] Build Apache 1.x module. DIR is the top-level Apache - build directory [/usr/local/apache]" -ac_help="$ac_help - --enable-mod-charset APACHE: Enable transfer tables for mod_charset (Rus Apache)" -ac_help="$ac_help - --with-apxs2filter[=FILE] - EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional - pathname to the Apache apxs tool [apxs]" -ac_help="$ac_help - --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional - pathname to the Apache apxs tool [apxs]" -ac_help="$ac_help - --with-apache-hooks[=FILE] - EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional - pathname to the Apache apxs tool [apxs]" -ac_help="$ac_help - --with-apache-hooks-static[=DIR] - EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache - build directory [/usr/local/apache]" -ac_help="$ac_help - --enable-mod-charset APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)" -ac_help="$ac_help - --with-caudium[=DIR] Build PHP as a Pike module for use with Caudium. - DIR is the Caudium server dir [/usr/local/caudium/server]" -ac_help="$ac_help - --disable-cli Disable building CLI version of PHP - (this forces --without-pear)" -ac_help="$ac_help - --with-continuity=DIR Build PHP as Continuity Server module. - DIR is path to the installed Continuity Server root" -ac_help="$ac_help - --enable-embed[=TYPE] EXPERIMENTAL: Enable building of embedded SAPI library - TYPE is either 'shared' or 'static'. [TYPE=shared]" -ac_help="$ac_help - --enable-fpm EXPERIMENTAL: Enable building of the fpm SAPI executable" -ac_help="$ac_help - --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)" -ac_help="$ac_help - --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this - should usually be set to match the fpm username (default: nobody)" -ac_help="$ac_help - --with-isapi[=DIR] Build PHP as an ISAPI module for use with Zeus" -ac_help="$ac_help - --with-litespeed Build PHP as litespeed module" -ac_help="$ac_help - --with-milter[=DIR] Build PHP as Milter application" -ac_help="$ac_help - --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver" -ac_help="$ac_help - --with-phttpd=DIR Build PHP as phttpd module" -ac_help="$ac_help - --with-pi3web[=DIR] Build PHP as Pi3Web module" -ac_help="$ac_help - --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen - directory, normally /usr/local/roxen/server" -ac_help="$ac_help - --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety" -ac_help="$ac_help - --with-thttpd=SRCDIR Build PHP as thttpd module" -ac_help="$ac_help - --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)" -ac_help="$ac_help - --with-webjames=SRCDIR Build PHP as a WebJames module (RISC OS only)" -ac_help="$ac_help - --disable-cgi Disable building CGI version of PHP" -ac_help="$ac_help + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h -General settings: -" -ac_help="$ac_help - --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!" -ac_help="$ac_help - --enable-debug Compile with debugging symbols" -ac_help="$ac_help - --with-layout=TYPE Set how installed files will be laid out. Type can - be either PHP or GNU [PHP]" -ac_help="$ac_help - --with-config-file-path=PATH - Set the path in which to look for php.ini [PREFIX/lib]" -ac_help="$ac_help - --with-config-file-scan-dir=PATH - Set the path where to scan for configuration files" -ac_help="$ac_help - --enable-safe-mode Enable safe mode by default" -ac_help="$ac_help - --with-exec-dir[=DIR] Only allow executables in DIR under safe-mode - [/usr/local/php/bin]" -ac_help="$ac_help - --enable-sigchild Enable PHP's own SIGCHLD handler" -ac_help="$ac_help - --enable-magic-quotes Enable magic quotes by default." -ac_help="$ac_help - --enable-libgcc Enable explicitly linking against libgcc" -ac_help="$ac_help - --disable-short-tags Disable the short-form &5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi - Example: --with-foobar=shared,/usr/local/foobar/ - o Builds the foobar extension as shared extension. - o foobar package install prefix is /usr/local/foobar/ -" -ac_help="$ac_help - --disable-all Disable all extensions which are enabled by default -" -ac_help="$ac_help - --with-regex=TYPE regex library type: system, php. [TYPE=php] - WARNING: Do NOT use unless you know what you are doing!" -ac_help="$ac_help - --disable-libxml Disable LIBXML support" -ac_help="$ac_help - --with-libxml-dir[=DIR] LIBXML: libxml2 install prefix" -ac_help="$ac_help - --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.6)" -ac_help="$ac_help - --with-kerberos[=DIR] OPENSSL: Include Kerberos support" -ac_help="$ac_help - --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support. - DIR is the PCRE install prefix [BUNDLED]" -ac_help="$ac_help - --without-sqlite3[=DIR] Do not include SQLite3 support. DIR is the prefix to - SQLite3 installation directory." -ac_help="$ac_help - --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9)" -ac_help="$ac_help - --with-zlib-dir= Define the location of zlib install directory" -ac_help="$ac_help - --enable-bcmath Enable bc style precision math functions" -ac_help="$ac_help - --with-bz2[=DIR] Include BZip2 support" -ac_help="$ac_help - --enable-calendar Enable support for calendar conversion" -ac_help="$ac_help - --disable-ctype Disable ctype functions" -ac_help="$ac_help - --with-curl[=DIR] Include cURL support" -ac_help="$ac_help - --with-curlwrappers EXPERIMENTAL: Use cURL for url streams" -ac_help="$ac_help - --enable-dba Build DBA with bundled modules. To build shared DBA - extension use --enable-dba=shared" -ac_help="$ac_help - --with-qdbm[=DIR] DBA: QDBM support" -ac_help="$ac_help - --with-gdbm[=DIR] DBA: GDBM support" -ac_help="$ac_help - --with-ndbm[=DIR] DBA: NDBM support" -ac_help="$ac_help - --with-db4[=DIR] DBA: Oracle Berkeley DB 4.x or 5.x support" -ac_help="$ac_help - --with-db3[=DIR] DBA: Oracle Berkeley DB 3.x support" -ac_help="$ac_help - --with-db2[=DIR] DBA: Oracle Berkeley DB 2.x support" -ac_help="$ac_help - --with-db1[=DIR] DBA: Oracle Berkeley DB 1.x support/emulation" -ac_help="$ac_help - --with-dbm[=DIR] DBA: DBM support" -ac_help="$ac_help - --without-cdb[=DIR] DBA: CDB support (bundled)" -ac_help="$ac_help - --disable-inifile DBA: INI support (bundled)" -ac_help="$ac_help - --disable-flatfile DBA: FlatFile support (bundled)" -ac_help="$ac_help - --disable-dom Disable DOM support" -ac_help="$ac_help - --with-libxml-dir[=DIR] DOM: libxml2 install prefix" -ac_help="$ac_help - --with-enchant[=DIR] Include enchant support. - GNU Aspell version 1.1.3 or higher required." -ac_help="$ac_help - --enable-exif Enable EXIF (metadata from images) support" -ac_help="$ac_help - --disable-fileinfo Disable fileinfo support" -ac_help="$ac_help - --disable-filter Disable input filter support" -ac_help="$ac_help - --with-pcre-dir FILTER: pcre install prefix" -ac_help="$ac_help - --enable-ftp Enable FTP support" -ac_help="$ac_help - --with-openssl-dir[=DIR] FTP: openssl install prefix" -ac_help="$ac_help - --with-gd[=DIR] Include GD support. DIR is the GD library base - install directory [BUNDLED]" -ac_help="$ac_help - --with-jpeg-dir[=DIR] GD: Set the path to libjpeg install prefix" -ac_help="$ac_help - --with-png-dir[=DIR] GD: Set the path to libpng install prefix" -ac_help="$ac_help - --with-zlib-dir[=DIR] GD: Set the path to libz install prefix" -ac_help="$ac_help - --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix" -ac_help="$ac_help - --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix" -ac_help="$ac_help - --with-t1lib[=DIR] GD: Include T1lib support. T1lib version >= 5.0.0 required" -ac_help="$ac_help - --enable-gd-native-ttf GD: Enable TrueType string function" -ac_help="$ac_help - --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support" -ac_help="$ac_help - --with-gettext[=DIR] Include GNU gettext support" -ac_help="$ac_help - --with-gmp[=DIR] Include GNU MP support" -ac_help="$ac_help - --with-mhash[=DIR] Include mhash support" -ac_help="$ac_help - --disable-hash Disable hash support" -ac_help="$ac_help - --without-iconv[=DIR] Exclude iconv support" -ac_help="$ac_help - --with-imap[=DIR] Include IMAP support. DIR is the c-client install prefix" -ac_help="$ac_help - --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install prefix" -ac_help="$ac_help - --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix" -ac_help="$ac_help - --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base - install directory [/usr/interbase]" -ac_help="$ac_help - --enable-intl Enable internationalization support" -ac_help="$ac_help - --with-icu-dir=DIR Specify where ICU libraries and headers can be found" -ac_help="$ac_help - --disable-json Disable JavaScript Object Serialization support" -ac_help="$ac_help - --with-ldap[=DIR] Include LDAP support" -ac_help="$ac_help - --with-ldap-sasl[=DIR] LDAP: Include Cyrus SASL support" -ac_help="$ac_help - --enable-mbstring Enable multibyte string support" -ac_help="$ac_help - --disable-mbregex MBSTRING: Disable multibyte regex support" -ac_help="$ac_help - --disable-mbregex-backtrack - MBSTRING: Disable multibyte regex backtrack check" -ac_help="$ac_help - --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base - install directory [BUNDLED]" -ac_help="$ac_help - --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used" -ac_help="$ac_help - --with-mcrypt[=DIR] Include mcrypt support" -ac_help="$ac_help - --with-mssql[=DIR] Include MSSQL-DB support. DIR is the FreeTDS home - directory [/usr/local/freetds]" -ac_help="$ac_help - --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - directory. If mysqlnd is passed as DIR, - the MySQL native driver will be used [/usr/local]" -ac_help="$ac_help - --with-mysql-sock[=DIR] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. - If unspecified, the default locations are searched" -ac_help="$ac_help - --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix" -ac_help="$ac_help - --with-mysqli[=FILE] Include MySQLi support. FILE is the path - to mysql_config. If mysqlnd is passed as FILE, - the MySQL native driver will be used [mysql_config]" -ac_help="$ac_help - --enable-embedded-mysqli MYSQLi: Enable embedded support - Note: Does not work with MySQL native driver!" -ac_help="$ac_help - --with-oci8[=DIR] Include Oracle (OCI8) support. DIR defaults to \$ORACLE_HOME. - Use --with-oci8=instantclient,/path/to/instant/client/lib - to use an Oracle Instant Client installation" -ac_help="$ac_help - --with-adabas[=DIR] Include Adabas D support [/usr/local]" -ac_help="$ac_help - --with-sapdb[=DIR] Include SAP DB support [/usr/local]" -ac_help="$ac_help - --with-solid[=DIR] Include Solid support [/usr/local/solid]" -ac_help="$ac_help - --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]" -ac_help="$ac_help - --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]" -ac_help="$ac_help - --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)" -ac_help="$ac_help - --with-empress-bcs[=DIR] - Include Empress Local Access support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)" -ac_help="$ac_help - --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]" -ac_help="$ac_help - --with-custom-odbc[=DIR] - Include user defined ODBC support. DIR is ODBC install base - directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and - have some odbc.h in your include dirs. f.e. you should define - following for Sybase SQL Anywhere 5.5.00 on QNX, prior to - running this configure script: - CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix - CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"" -ac_help="$ac_help - --with-iodbc[=DIR] Include iODBC support [/usr/local]" -ac_help="$ac_help - --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]" -ac_help="$ac_help - --with-unixODBC[=DIR] Include unixODBC support [/usr/local]" -ac_help="$ac_help - --with-dbmaker[=DIR] Include DBMaker support" -ac_help="$ac_help - --enable-pcntl Enable pcntl support (CLI/CGI only)" -ac_help="$ac_help - --disable-pdo Disable PHP Data Objects support" -ac_help="$ac_help - --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home directory" -ac_help="$ac_help - --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base - install directory [/opt/firebird]" -ac_help="$ac_help - --with-pdo-mysql[=DIR] PDO: MySQL support. DIR is the MySQL base directory - If mysqlnd is passed as DIR, the MySQL native - native driver will be used [/usr/local]" -ac_help="$ac_help - --with-zlib-dir[=DIR] PDO_MySQL: Set the path to libz install prefix" -ac_help="$ac_help - --with-pdo-oci[=DIR] PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME. - Use --with-pdo-oci=instantclient,prefix,version - for an Oracle Instant Client SDK. - For Linux with 10.2.0.3 RPMs (for example) use: - --with-pdo-oci=instantclient,/usr,10.2.0.3" -ac_help="$ac_help - --with-pdo-odbc=flavour,dir - PDO: Support for 'flavour' ODBC driver. - include and lib dirs are looked for under 'dir'. - - 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic - If ',dir' part is omitted, default for the flavour - you have selected will used. e.g.: - - --with-pdo-odbc=unixODBC - - will check for unixODBC under /usr/local. You may attempt - to use an otherwise unsupported driver using the \"generic\" - flavour. The syntax for generic ODBC support is: - - --with-pdo-odbc=generic,dir,libname,ldflags,cflags +php_with_libdir=lib - When build as shared the extension filename is always pdo_odbc.so" -ac_help="$ac_help - --with-pdo-pgsql[=DIR] PDO: PostgreSQL support. DIR is the PostgreSQL base - install directory or the path to pg_config" -ac_help="$ac_help - --without-pdo-sqlite[=DIR] - PDO: sqlite 3 support. DIR is the sqlite base - install directory [BUNDLED]" -ac_help="$ac_help - --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL - base install directory or the path to pg_config" -ac_help="$ac_help - --disable-phar Disable phar support" -ac_help="$ac_help - --disable-posix Disable POSIX-like functions" -ac_help="$ac_help - --with-pspell[=DIR] Include PSPELL support. - GNU Aspell version 0.50.0 or higher required" -ac_help="$ac_help - --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)" -ac_help="$ac_help - --with-readline[=DIR] Include readline support (CLI/CGI only)" -ac_help="$ac_help - --with-recode[=DIR] Include recode support" -ac_help="$ac_help - --disable-session Disable session support" -ac_help="$ac_help - --with-mm[=DIR] SESSION: Include mm support for session storage" -ac_help="$ac_help - --enable-shmop Enable shmop support" -ac_help="$ac_help - --disable-simplexml Disable SimpleXML support" -ac_help="$ac_help - --with-libxml-dir=DIR SimpleXML: libxml2 install prefix" -ac_help="$ac_help - --with-snmp[=DIR] Include SNMP support" -ac_help="$ac_help - --with-openssl-dir[=DIR] SNMP: openssl install prefix" -ac_help="$ac_help - --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack" -ac_help="$ac_help - --enable-soap Enable SOAP support" -ac_help="$ac_help - --with-libxml-dir=DIR SOAP: libxml2 install prefix" -ac_help="$ac_help - --enable-sockets Enable sockets support" -ac_help="$ac_help - --without-sqlite=DIR Do not include sqlite support. DIR is the sqlite base - install directory [BUNDLED]" -ac_help="$ac_help - --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite" -ac_help="$ac_help - --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home - directory [/home/sybase]" -ac_help="$ac_help - --enable-sysvmsg Enable sysvmsg support" -ac_help="$ac_help - --enable-sysvsem Enable System V semaphore support" -ac_help="$ac_help - --enable-sysvshm Enable the System V shared memory support" -ac_help="$ac_help - --with-tidy[=DIR] Include TIDY support" -ac_help="$ac_help - --disable-tokenizer Disable tokenizer support" -ac_help="$ac_help - --enable-wddx Enable WDDX support" -ac_help="$ac_help - --with-libxml-dir=DIR WDDX: libxml2 install prefix" -ac_help="$ac_help - --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated)" -ac_help="$ac_help - --disable-xml Disable XML support" -ac_help="$ac_help - --with-libxml-dir=DIR XML: libxml2 install prefix" -ac_help="$ac_help - --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)" -ac_help="$ac_help - --disable-xmlreader Disable XMLReader support" -ac_help="$ac_help - --with-libxml-dir=DIR XMLReader: libxml2 install prefix" -ac_help="$ac_help - --with-xmlrpc[=DIR] Include XMLRPC-EPI support" -ac_help="$ac_help - --with-libxml-dir=DIR XMLRPC-EPI: libxml2 install prefix" -ac_help="$ac_help - --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)" -ac_help="$ac_help - --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI" -ac_help="$ac_help - --disable-xmlwriter Disable XMLWriter support" -ac_help="$ac_help - --with-libxml-dir=DIR XMLWriter: libxml2 install prefix" -ac_help="$ac_help - --with-xsl[=DIR] Include XSL support. DIR is the libxslt base - install directory (libxslt >= 1.1.0 required)" -ac_help="$ac_help - --enable-zip Include Zip read/write support" -ac_help="$ac_help - --with-zlib-dir[=DIR] ZIP: Set the path to libz install prefix" -ac_help="$ac_help - --with-pcre-dir ZIP: pcre install prefix" -ac_help="$ac_help - --disable-mysqlnd-compression-support - Enable support for the MySQL compressed protocol in mysqlnd" -ac_help="$ac_help - --with-zlib-dir[=DIR] mysqlnd: Set the path to libz install prefix" -ac_help="$ac_help +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5 +$as_echo_n "checking for system library directory... " >&6; } -PEAR: -" -ac_help="$ac_help - --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] - --without-pear Do not install PEAR" -ac_help="$ac_help +# Check whether --with-libdir was given. +if test "${with_libdir+set}" = set; then : + withval=$with_libdir; PHP_LIBDIR=$withval +else -Zend: -" -ac_help="$ac_help - --with-zend-vm=TYPE Set virtual machine dispatch method. Type is - one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]" -ac_help="$ac_help - --enable-maintainer-zts Enable thread safety - for code maintainers only!!" -ac_help="$ac_help - --disable-inline-optimization - If building zend_execute.lo fails, try this switch" -ac_help="$ac_help - --enable-zend-multibyte Compile with zend multibyte support" -ac_help="$ac_help + PHP_LIBDIR=lib -TSRM: -" -ac_help="$ac_help - --with-tsrm-pth[=pth-config] - Use GNU Pth" -ac_help="$ac_help - --with-tsrm-st Use SGI's State Threads" -ac_help="$ac_help - --with-tsrm-pthreads Use POSIX threads (default)" -ac_help="$ac_help -Libtool: -" -ac_help="$ac_help - --enable-shared[=PKGS] build shared libraries [default=yes]" -ac_help="$ac_help - --enable-static[=PKGS] build static libraries [default=yes]" -ac_help="$ac_help - --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" -ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" +fi -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} +ext_output=$PHP_LIBDIR +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : + + + +php_enable_rpath=yes + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5 +$as_echo_n "checking whether to enable runpaths... " >&6; } +# Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then : + enableval=$enable_rpath; PHP_RPATH=$enableval else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done +ext_output=$PHP_RPATH +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$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 ${php_cv_cc_dashr+:} false; then : + $as_echo_n "(cached) " >&6 +else + + SAVE_LIBS=$LIBS + LIBS="-R /usr/$PHP_LIBDIR $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + php_cv_cc_dashr=yes +else + php_cv_cc_dashr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS fi -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5 +$as_echo "$php_cv_cc_dashr" >&6; } +if test $php_cv_cc_dashr = "yes"; then + ld_runpath_switch=-R +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 ${php_cv_cc_rpath+:} false; then : + $as_echo_n "(cached) " >&6 else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" + SAVE_LIBS=$LIBS + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: +int +main () +{ - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + php_cv_cc_rpath=yes +else + php_cv_cc_rpath=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS +fi - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5 +$as_echo "$php_cv_cc_rpath" >&6; } + if test $php_cv_cc_rpath = "yes"; then + ld_runpath_switch=-Wl,-rpath, + else + ld_runpath_switch=-L fi fi +if test "$PHP_RPATH" = "no"; then + ld_runpath_switch= fi -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + + + for ac_prog in gawk nawk awk mawk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/usr/xpg4/bin/:$PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$AWK" && break +done +test -n "$AWK" || AWK="bork" -ac_help="$ac_help - --disable-libtool-lock avoid locking (might break parallel builds)" -ac_help="$ac_help - --with-pic try to use only PIC/non-PIC objects [default=use both]" -ac_help="$ac_help - --with-tags[=TAGS] include additional configurations [automatic] -" -ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" + case "$AWK" in + *mawk) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5 +$as_echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;} + ;; + *gawk) + ;; + bork) + 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 +$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 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + esac -tagnames=${tagnames+${tagnames},}CXX + PHP_VAR_SUBST="$PHP_VAR_SUBST AWK" -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 -ac_prev= -for ac_option + for ac_prog in 'bison -y' byacc do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_YACC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_YACC="$ac_prog" + $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 - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac +fi +fi +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + # we only support certain bison versions + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3" - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + # for standalone build of Zend Engine + test -z "$SED" && SED=sed - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; + bison_version=none + 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 ${php_cv_bison_version+:} false; then : + $as_echo_n "(cached) " >&6 +else - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z` + php_cv_bison_version=invalid + if test -n "$bison_version_vars"; then + set $bison_version_vars + bison_version="${1}.${2}" + for bison_check_version in $bison_version_list; do + if test "$bison_version" = "$bison_check_version"; then + php_cv_bison_version="$bison_check_version (ok)" + break + fi + done + fi - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_bison_version" >&5 +$as_echo "$php_cv_bison_version" >&6; } + fi + case $php_cv_bison_version in + ""|invalid) + bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)." + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $bison_msg" >&5 +$as_echo "$as_me: WARNING: $bison_msg" >&2;} + YACC="exit 0;" + ;; + esac - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; + PHP_VAR_SUBST="$PHP_VAR_SUBST YACC" - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + # Extract the first word of "re2c", so it can be a program name with args. +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 ${ac_cv_prog_RE2C+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RE2C"; then + ac_cv_prog_RE2C="$RE2C" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RE2C="re2c" + $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 - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; +fi +fi +RE2C=$ac_cv_prog_RE2C +if test -n "$RE2C"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5 +$as_echo "$RE2C" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + 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 ${php_cv_re2c_version+:} false; then : + $as_echo_n "(cached) " >&6 +else - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + re2c_vernum=`$RE2C --vernum 2>/dev/null` + if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1304"; then + php_cv_re2c_version=invalid + else + php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)" + fi - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_re2c_version" >&5 +$as_echo "$php_cv_re2c_version" >&6; } + fi + case $php_cv_re2c_version in + ""|invalid) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&5 +$as_echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&2;} + RE2C="exit 0;" + ;; + esac - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; + PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C" - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; +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 SVN checkout!" "$LINENO" 5 + fi + ;; +esac - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; +php_enable_re2c_cgoto=no - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5 +$as_echo_n "checking whether to enable computed goto gcc extension with re2c... " >&6; } +# Check whether --enable-re2c-cgoto was given. +if test "${enable_re2c_cgoto+set}" = set; then : + enableval=$enable_re2c_cgoto; PHP_RE2C_CGOTO=$enableval +else - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + PHP_RE2C_CGOTO=no - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; +fi - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; +ext_output=$PHP_RE2C_CGOTO +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; +if test "$PHP_RE2C_CGOTO" = "no"; then + RE2C_FLAGS="" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5 +$as_echo_n "checking whether re2c -g works... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; +int +main () +{ - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; +int main(int argc, const char **argv) +{ + argc = argc; + argv = argv; +label1: +label2: + static void *adr[] = { &&label1, &&label2}; + goto *adr[0]; + return 0; +} - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - --x) - # Obsolete; use --with-x. - with_x=yes ;; + RE2C_FLAGS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; +else - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + RE2C_FLAGS="-g" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 + PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS" + + + +case $host_cpu in + alpha*) + if test "$GCC" = "yes"; then + CFLAGS="$CFLAGS -mieee" + else + CFLAGS="$CFLAGS -ieee" fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + ;; + sparc*) + if test "$SUNCC" = "yes"; then + CFLAGS="$CFLAGS -xmemalign=8s" fi - nonopt="$ac_option" ;; +esac +if test "$GCC" = "yes"; then + case $host_alias in + *darwin*) + GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'` + ;; + *) + GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'` + ;; esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } + if test $GCC_MAJOR_VERSION -ge 4; then + CFLAGS="$CFLAGS -fvisibility=hidden" + fi fi -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +case $host_alias in + *solaris*) + CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" + if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then + enable_libgcc=yes + fi + ;; + *dgux*) + CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR" + ;; + *darwin*|*rhapsody*) + if test -n "$GCC"; then -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null + 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 ${ac_cv_gcc_arg_no_cpp_precomp+:} false; then : + $as_echo_n "(cached) " >&6 else - exec 6>&1 -fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=README.SVN-RULES - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + echo 'void somefunc() { };' > conftest.c + cmd='$CC -no-cpp-precomp -c conftest.c' + if eval $cmd 2>&1 | $EGREP -e -no-cpp-precomp >/dev/null ; then + ac_result=no else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + ac_result=yes fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + eval $gcc_arg_name=$ac_result + rm -f conftest.* -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_no_cpp_precomp" >&5 +$as_echo "$ac_cv_gcc_arg_no_cpp_precomp" >&6; } + if eval test "\$$gcc_arg_name" = "yes"; then + gcc_no_cpp_precomp=yes + else + : + fi -done -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi + if test "$gcc_no_cpp_precomp" = "yes"; then + CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + fi + fi + php_multiple_shlib_versions_ok=yes + ;; + *beos*) + beos_threads=1 + LIBS="$LIBS -lbe -lroot" + ;; + *mips*) + CPPFLAGS="$CPPFLAGS -D_XPG_IV" + ;; + *hpux*) + if test "$GCC" = "yes"; then + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + fi + ;; + *netware*) -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1892: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1925: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes + old_IFS=$IFS + for ac_src in internal_functions.c; do + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS -echo $ac_n "checking for egrep""... $ac_c" 1>&6 -echo "configure:1956: checking for egrep" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -echo "$ac_t""$ac_cv_prog_egrep" 1>&6 - EGREP=$ac_cv_prog_egrep - + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac -echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -echo "configure:1971: checking for a sed that does not truncate output" >&5 -if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi + cat >>Makefile.objects<&6 - - - - - PHP_VAR_SUBST="$PHP_VAR_SUBST EGREP" + case win32 in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "win32"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/win32/"; ac_bdir="win32/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac - - - - PHP_VAR_SUBST="$PHP_VAR_SUBST SED" - + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo - test -f config.nice && mv config.nice config.nice.old - rm -f config.nice.old - cat >config.nice<> config.nice - fi - done + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS - echo "'$0' \\" >> config.nice - if test `expr -- $0 : "'.*"` = 0; then - CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$0'" - else - CONFIGURE_COMMAND="$CONFIGURE_COMMAND $0" - fi - for arg in $ac_configure_args; do - if test `expr -- $arg : "'.*"` = 0; then - if test `expr -- $arg : "--.*"` = 0; then - break; - fi - echo "'$arg' \\" >> config.nice - CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '$arg'" - else - if test `expr -- $arg : "'--.*"` = 0; then - break; - fi - echo "$arg \\" >> config.nice - CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $arg" - fi + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre -I$CFLAGS $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + cat >>Makefile.objects<> config.nice - chmod +x config.nice - CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS" - - - PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_COMMAND" - - - - PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_OPTIONS" + PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) + EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP5LIB_SHARED_LIBADD" + install_modules="install-modules" -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break + case $host_alias in + *aix*) + suffix=so + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o 'netware'/php5lib.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS) $(PHP5LIB_SHARED_LIBADD) && mv -f 'netware'/.libs/php5lib.so 'netware'/php5lib.so' + ;; + *netware*) + suffix=nlm + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS) $(PHP5LIB_SHARED_LIBADD)' + ;; + *) + suffix=la + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS) $(PHP5LIB_SHARED_LIBADD)' + ;; + esac + + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/php5lib.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/php5lib.$suffix" fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS" -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi + cat >>Makefile.objects<&6 -echo "configure:2121: checking host system type" >&5 +netware/php5lib.$suffix: \$(PHP_GLOBAL_OBJS) \$(PHP5LIB_SHARED_DEPENDENCIES) + $link_cmd -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac +EOF -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:2142: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; + ;; esac -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - +# Disable PIC mode by default where it is known to be safe to do so, +# to avoid the performance hit from the lost register +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5 +$as_echo_n "checking whether to force non-PIC code in shared modules... " >&6; } +case $host_alias in + i?86-*-linux*|i?86-*-freebsd*) + if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then + with_pic=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; +esac - if test -z "$host_alias" && test -n "$host"; then - host_alias=$host - fi - if test -z "$host_alias"; then - { echo "configure: error: host_alias is not set!" 1>&2; exit 1; } - fi -PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=6 -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` - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MAJOR_VERSION" - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MINOR_VERSION" - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_RELEASE_VERSION" - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXTRA_VERSION" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /dev/urandom exists" >&5 +$as_echo_n "checking whether /dev/urandom exists... " >&6; } +if test -r "/dev/urandom" && test -c "/dev/urandom"; then +$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h -echo "/* automatically generated by configure */" > php_version.h.new -echo "/* edit configure.in to change version number */" >> php_version.h.new -echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new -echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new -echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new -echo "#define PHP_EXTRA_VERSION \"$PHP_EXTRA_VERSION\"" >> php_version.h.new -echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new -echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new -cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 -if test $? -ne 0 ; then - rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ - echo 'Updated main/php_version.h' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - rm -f php_version.h.new + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then - { echo "configure: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" 1>&2; exit 1; } -fi -if test -n "$with_apache" && test -n "$with_apxs"; then - { echo "configure: error: --with-apache and --with-apxs cannot be used together" 1>&2; exit 1; } -fi -if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then - { echo "configure: error: --with-apxs2filter and --with-apxs2 cannot be used together" 1>&2; exit 1; } -fi - -cwd=`pwd` -php_shtool=$srcdir/build/shtool -T_MD=`$php_shtool echo -n -e %B` -T_ME=`$php_shtool echo -n -e %b` -test -d include || $php_shtool mkdir include -> Makefile.objects -> Makefile.fragments -pattern=define -$EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/dev/null -test -z "$CFLAGS" && auto_cflags=1 -abs_srcdir=`(cd $srcdir; pwd)` -abs_builddir=`pwd` -php_abs_top_srcdir=$abs_srcdir -php_abs_top_builddir=$abs_builddir -$php_shtool mkdir -p libs -rm -f libs/* -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2254: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2284: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2335: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2367: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext << EOF +$as_echo "#define SUHOSIN_PATCH 1" >>confdefs.h -#line 2378 "configure" -#include "confdefs.h" -main(){return(0);} -EOF -if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2414: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2442: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi + + +if test "$beos_threads" = "1"; then + pthreads_working="yes" + ac_cv_pthreads_cflags="" else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi + save_CFLAGS=$CFLAGS + save_LIBS=$LIBS + +if test -n "$ac_cv_pthreads_lib"; then + LIBS="$LIBS -l$ac_cv_pthreads_lib" fi -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2474: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= +if test -n "$ac_cv_pthreads_cflags"; then + CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + + +if test "$cross_compiling" = yes; then : + + pthreads_working=no + case $host_alias in + *netware*) + pthreads_working=yes + esac + + else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +void *thread_routine(void *data) { + return data; +} + +int main() { + pthread_t thd; + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); + return pthread_create(&thd, NULL, thread_routine, &data); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + pthreads_working=yes + else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" + + pthreads_working=no + fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -echo "$ac_t""$CPP" 1>&6 + LIBS=$save_LIBS + CFLAGS=$save_CFLAGS - ICC="no" - echo $ac_n "checking for icc""... $ac_c" 1>&6 -echo "configure:2556: checking for icc" >&5 - cat > conftest.$ac_ext <&5 | - egrep "^__INTEL_COMPILER" >/dev/null 2>&1; then - rm -rf conftest* - ICC="no" - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 +$as_echo_n "checking for pthreads_cflags... " >&6; } +if ${ac_cv_pthreads_cflags+:} false; then : + $as_echo_n "(cached) " >&6 else - rm -rf conftest* - ICC="yes" - GCC="no" - echo "$ac_t""yes" 1>&6 - -fi -rm -f conftest* + ac_cv_pthreads_cflags= + if test "$pthreads_working" != "yes"; then + for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do + ac_save=$CFLAGS + CFLAGS="$CFLAGS $flag" + +if test "$cross_compiling" = yes; then : + + pthreads_working=no + case $host_alias in + *netware*) + pthreads_working=yes + esac - SUNCC="no" - echo $ac_n "checking for suncc""... $ac_c" 1>&6 -echo "configure:2580: checking for suncc" >&5 - cat > conftest.$ac_ext <&5 | - egrep "^__SUNPRO_C" >/dev/null 2>&1; then - rm -rf conftest* - SUNCC="no" - echo "$ac_t""no" 1>&6 else - rm -rf conftest* - SUNCC="yes" - GCC="no" - test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" - GCC="" - echo "$ac_t""yes" 1>&6 - -fi -rm -f conftest* + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +void *thread_routine(void *data) { + return data; +} + +int main() { + pthread_t thd; + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); + return pthread_create(&thd, NULL, thread_routine, &data); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + pthreads_working=yes -if test "x$CC" != xcc; then - echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:2605: checking whether $CC and cc understand -c and -o together" >&5 else - echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:2608: checking whether cc understands -c and -o together" >&5 + + pthreads_working=no + fi -set dummy $CC; ac_cc="`echo $2 | - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'foo(){}' > conftest.c -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + CFLAGS=$ac_save + if test "$pthreads_working" = "yes"; then + ac_cv_pthreads_cflags=$flag + break fi - fi + done fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no fi -rm -f conftest* fi -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5 +$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 ${ac_cv_pthreads_lib+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<\EOF -#define NO_MINUS_C_MINUS_O 1 -EOF -fi +ac_cv_pthreads_lib= +if test "$pthreads_working" != "yes"; then + for lib in pthread pthreads c_r; do + ac_save=$LIBS + LIBS="$LIBS -l$lib" + +if test "$cross_compiling" = yes; then : + + pthreads_working=no + case $host_alias in + *netware*) + pthreads_working=yes + esac + -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2656: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +void *thread_routine(void *data) { + return data; +} + +int main() { + pthread_t thd; + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); + return pthread_create(&thd, NULL, thread_routine, &data); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + pthreads_working=yes + else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + + pthreads_working=no + fi -rm -f conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f conftest* + + LIBS=$ac_save + if test "$pthreads_working" = "yes"; then + ac_cv_pthreads_lib=$lib + break + fi + done fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" + fi - CPP="$ac_cv_prog_CPP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5 +$as_echo "$ac_cv_pthreads_lib" >&6; } + +if test "$pthreads_working" = "yes"; then + threads_result="POSIX-Threads found" else - ac_cv_prog_CPP="$CPP" + threads_result="POSIX-Threads not found" fi -echo "$ac_t""$CPP" 1>&6 - -echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2736: checking for AIX" >&5 -cat > conftest.$ac_ext <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF -#define _ALL_SOURCE 1 -EOF -else - rm -rf conftest* - echo "$ac_t""no" 1>&6 +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi -rm -f conftest* -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2760: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -php_with_libdir=lib + PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_SUFFIX_NAME" -echo $ac_n "checking for system library directory""... $ac_c" 1>&6 -echo "configure:2785: checking for system library directory" >&5 -# Check whether --with-libdir or --without-libdir was given. -if test "${with_libdir+set}" = set; then - withval="$with_libdir" - PHP_LIBDIR=$withval -else - - PHP_LIBDIR=lib - -fi -ext_output=$PHP_LIBDIR -echo "$ac_t""$ext_output" 1>&6 + PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_DL_SUFFIX_NAME" + SHLIB_SUFFIX_NAME=so + SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME + case $host_alias in + *hpux*) + SHLIB_SUFFIX_NAME=sl + SHLIB_DL_SUFFIX_NAME=sl + ;; + *darwin*) + SHLIB_SUFFIX_NAME=dylib + SHLIB_DL_SUFFIX_NAME=so + ;; + esac -php_enable_rpath=yes +PHP_SAPI=default -echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 -echo "configure:2808: checking whether to enable runpaths" >&5 -# Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - PHP_RPATH=$enableval -else - - PHP_RPATH=yes - + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo -fi + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo -ext_output=$PHP_RPATH -echo "$ac_t""$ext_output" 1>&6 + php_build_target=program +SAPI_SHARED=libs/libphp$PHP_MAJOR_VERSION.$SHLIB_DL_SUFFIX_NAME +SAPI_STATIC=libs/libphp$PHP_MAJOR_VERSION.a +SAPI_LIBTOOL=libphp$PHP_MAJOR_VERSION.la -echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 -echo "configure:2829: checking if compiler supports -R" >&5 -if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - SAVE_LIBS=$LIBS - LIBS="-R /usr/$PHP_LIBDIR $LIBS" - cat > conftest.$ac_ext <&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5 +$as_echo "${T_MD}Configuring SAPI modules${T_ME}" >&6; } -; return 0; } -EOF -if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - php_cv_cc_dashr=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - php_cv_cc_dashr=no -fi -rm -f conftest* - LIBS=$SAVE_LIBS -fi -echo "$ac_t""$php_cv_cc_dashr" 1>&6 -if test $php_cv_cc_dashr = "yes"; then - ld_runpath_switch=-R -else - echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6 -echo "configure:2862: checking if compiler supports -Wl,-rpath," >&5 - if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - php_cv_cc_rpath=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - php_cv_cc_rpath=no -fi -rm -f conftest* - LIBS=$SAVE_LIBS -fi - echo "$ac_t""$php_cv_cc_rpath" 1>&6 - if test $php_cv_cc_rpath = "yes"; then - ld_runpath_switch=-Wl,-rpath, - else - ld_runpath_switch=-L - fi -fi -if test "$PHP_RPATH" = "no"; then - ld_runpath_switch= -fi +php_with_aolserver=no - for ac_prog in gawk nawk awk mawk -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2908: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/xpg4/bin/:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AWK="$ac_cv_prog_AWK" -if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 +# Check whether --with-aolserver was given. +if test "${with_aolserver+set}" = set; then : + withval=$with_aolserver; PHP_AOLSERVER=$withval else - echo "$ac_t""no" 1>&6 -fi -test -n "$AWK" && break -done -test -n "$AWK" || AWK="bork" + PHP_AOLSERVER=no - case "$AWK" in - *mawk) - echo "configure: warning: mawk is known to have problems on some systems. You should install GNU awk" 1>&2 - ;; - *gawk) - ;; - bork) - { echo "configure: error: Could not find awk; Install GNU awk" 1>&2; exit 1; } - ;; - *) - echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 -echo "configure:2949: checking if $AWK is broken" >&5 - if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then - echo "$ac_t""yes" 1>&6 - { echo "configure: error: You should install GNU awk" 1>&2; exit 1; } - else - echo "$ac_t""no" 1>&6 - fi - ;; - esac - - PHP_VAR_SUBST="$PHP_VAR_SUBST AWK" +fi - for ac_prog in 'bison -y' byacc -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2968: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YACC="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YACC="$ac_cv_prog_YACC" -if test -n "$YACC"; then - echo "$ac_t""$YACC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi +ext_output=$PHP_AOLSERVER -test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - - # we only support certain bison versions - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3" - # for standalone build of Zend Engine - test -z "$SED" && SED=sed - bison_version=none - if test "$YACC"; then - echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:3008: checking for bison version" >&5 -if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z` - php_cv_bison_version=invalid - if test -n "$bison_version_vars"; then - set $bison_version_vars - bison_version="${1}.${2}" - for bison_check_version in $bison_version_list; do - if test "$bison_version" = "$bison_check_version"; then - php_cv_bison_version="$bison_check_version (ok)" - break - fi - done - fi - -fi -echo "$ac_t""$php_cv_bison_version" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOLserver support" >&5 +$as_echo_n "checking for AOLserver support... " >&6; } + +if test "$PHP_AOLSERVER" != "no"; then + if test -d "$PHP_AOLSERVER/include"; 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 + 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 fi - case $php_cv_bison_version in - ""|invalid) - bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)." - echo "configure: warning: $bison_msg" 1>&2 - YACC="exit 0;" - ;; - esac - - PHP_VAR_SUBST="$PHP_VAR_SUBST YACC" + 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 + fi + if test "$PHP_AOLSERVER_SRC/include" != "/usr/include"; then - # Extract the first word of "re2c", so it can be a program name with args. -set dummy re2c; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3046: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RE2C"; then - ac_cv_prog_RE2C="$RE2C" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RE2C="re2c" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RE2C="$ac_cv_prog_RE2C" -if test -n "$RE2C"; then - echo "$ac_t""$RE2C" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + if test -z "$PHP_AOLSERVER_SRC/include" || echo "$PHP_AOLSERVER_SRC/include" | grep '^/' >/dev/null ; then + ai_p=$PHP_AOLSERVER_SRC/include + else - if test -n "$RE2C"; then - echo $ac_n "checking for re2c version""... $ac_c" 1>&6 -echo "configure:3074: checking for re2c version" >&5 -if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - re2c_vernum=`$RE2C --vernum 2>/dev/null` - if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1304"; then - php_cv_re2c_version=invalid - else - php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)" - fi - -fi + ep_dir="`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`" -echo "$ac_t""$php_cv_re2c_version" 1>&6 + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$PHP_AOLSERVER_SRC/include\"`" fi - case $php_cv_re2c_version in - ""|invalid) - echo "configure: warning: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." 1>&2 - RE2C="exit 0;" - ;; - esac - - PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C" -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 - { echo "configure: error: bison is required to build PHP/Zend when building a SVN checkout!" 1>&2; exit 1; } - fi - ;; -esac - + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -php_enable_re2c_cgoto=no + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" -echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6 -echo "configure:3113: checking whether to enable computed goto gcc extension with re2c" >&5 -# Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given. -if test "${enable_re2c_cgoto+set}" = set; then - enableval="$enable_re2c_cgoto" - PHP_RE2C_CGOTO=$enableval -else - - PHP_RE2C_CGOTO=no - + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" + fi -fi + fi + fi -ext_output=$PHP_RE2C_CGOTO -echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_AOLSERVER 1" >>confdefs.h + if test "$PHP_SAPI" != "default"; then +as_fn_error $? " ++--------------------------------------------------------------------+ +| *** ATTENTION *** | +| | +| You've configured multiple SAPIs to be build. You can build only | +| one SAPI module and CLI binary at the same time. | ++--------------------------------------------------------------------+ +" "$LINENO" 5 + fi -if test "$PHP_RE2C_CGOTO" = "no"; then - RE2C_FLAGS="" -else - echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6 -echo "configure:3136: checking whether re2c -g works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - RE2C_FLAGS="" - echo "$ac_t""no" 1>&6 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - RE2C_FLAGS="-g" - echo "$ac_t""yes" 1>&6 - -fi -rm -f conftest* -fi + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo - PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS" + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program -case $host_cpu in - alpha*) - if test "$GCC" = "yes"; then - CFLAGS="$CFLAGS -mieee" - else - CFLAGS="$CFLAGS -ieee" - fi - ;; - sparc*) - if test "$SUNCC" = "yes"; then - CFLAGS="$CFLAGS -xmemalign=8s" - fi - ;; -esac + OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la + php_build_target=static +;; + shared) -if test "$GCC" = "yes"; then - case $host_alias in - *darwin*) - GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'` - ;; - *) - GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'` - ;; + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; esac - if test $GCC_MAJOR_VERSION -ge 4; then - CFLAGS="$CFLAGS -fvisibility=hidden" - fi -fi -case $host_alias in - *solaris*) - CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" - if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then - enable_libgcc=yes - fi - ;; - *dgux*) - CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR" - ;; - *darwin*|*rhapsody*) - if test -n "$GCC"; then - - gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp - echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6 -echo "configure:3222: checking whether $CC supports -no-cpp-precomp" >&5 -if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo 'void somefunc() { };' > conftest.c - cmd='$CC -no-cpp-precomp -c conftest.c' - if eval $cmd 2>&1 | $EGREP -e -no-cpp-precomp >/dev/null ; then - ac_result=no - else - ac_result=yes - fi - eval $gcc_arg_name=$ac_result - rm -f conftest.* - -fi + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo -echo "$ac_t""$ac_cv_gcc_arg_no_cpp_precomp" 1>&6 - if eval test "\$$gcc_arg_name" = "yes"; then - gcc_no_cpp_precomp=yes - else - : - - fi + php_build_target=program + + OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la + php_build_target=shared + + php_c_pre=$shared_c_pre + php_c_meta=$shared_c_meta + php_c_post=$shared_c_post + php_cxx_pre=$shared_cxx_pre + php_cxx_meta=$shared_cxx_meta + php_cxx_post=$shared_cxx_post + php_lo=$shared_lo +;; + bundle) - if test "$gcc_no_cpp_precomp" = "yes"; then - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" - fi - fi - php_multiple_shlib_versions_ok=yes - ;; - *beos*) - beos_threads=1 - LIBS="$LIBS -lbe -lroot" - ;; - *mips*) - CPPFLAGS="$CPPFLAGS -D_XPG_IV" - ;; - *hpux*) - if test "$GCC" = "yes"; then - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - fi - ;; - *netware*) - OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -3287,15 +6114,45 @@ php_build_target=program - - - case /main in + OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle + php_build_target=static +;; + program) + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + + php_build_target=program +;; + esac + + + + case sapi/aolserver in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "sapi/aolserver"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/sapi/aolserver/"; ac_bdir="sapi/aolserver/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -3307,14 +6164,14 @@ old_IFS=$IFS - for ac_src in internal_functions.c; do - + for ac_src in aolserver.c; do + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -3330,535 +6187,410 @@ done - - - case win32 in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "win32"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/win32/"; ac_bdir="win32/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_AOLSERVER" >&5 +$as_echo "$PHP_AOLSERVER" >&6; } - old_IFS=$IFS - for ac_src in sendmail.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - case $ac_src in - *.c) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre -I$CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre -I$CFLAGS $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - cat >>Makefile.objects<&5 +$as_echo_n "checking for Apache 1.x module support via DSO through APXS... " >&6; } + +if test "$PHP_APXS" != "no"; then + if test "$PHP_APXS" = "yes"; then + APXS=apxs + $APXS -q CFLAGS >/dev/null 2>&1 + if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x + APXS=/usr/sbin/apxs + fi else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/php5lib.$suffix" + + if test -z "$PHP_APXS" || echo "$PHP_APXS" | grep '^/' >/dev/null ; then + APXS=$PHP_APXS + else + + ep_dir="`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + APXS="$ep_realdir/`basename \"$PHP_APXS\"`" fi - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS" - cat >>Makefile.objects</dev/null 2>&1 + if test "$?" != "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I was not able to successfully run APXS. Possible reasons:" >&5 +$as_echo "Sorry, I was not able to successfully run APXS. Possible reasons:" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed;" >&5 +$as_echo "1. Perl is not installed;" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. Apache was not compiled with DSO support (--enable-module=so);" >&5 +$as_echo "2. Apache was not compiled with DSO support (--enable-module=so);" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&5 +$as_echo "3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&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 + fi -EOF + APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" + APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` + APXS_CFLAGS=`$APXS -q CFLAGS` + APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + APACHE_INCLUDE=-I$APXS_INCLUDEDIR + + + for flag in $APXS_CFLAGS; do + case $flag in + -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";; + esac + done + case $host_alias in + *aix*) + APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared ;; -esac + *darwin*) + MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" -# Disable PIC mode by default where it is known to be safe to do so, -# to avoid the performance hit from the lost register -echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6 -echo "configure:3423: checking whether to force non-PIC code in shared modules" >&5 -case $host_alias in - i?86-*-linux*|i?86-*-freebsd*) - if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then - with_pic=no - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi + PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" + + SAPI_SHARED=libs/libphp5.so + build_type=bundle ;; *) - echo "$ac_t""no" 1>&6 + build_type=shared ;; -esac + esac + if test "$PHP_SAPI" != "default"; then +as_fn_error $? " ++--------------------------------------------------------------------+ +| *** ATTENTION *** | +| | +| You've configured multiple SAPIs to be build. You can build only | +| one SAPI module and CLI binary at the same time. | ++--------------------------------------------------------------------+ +" "$LINENO" 5 + fi + PHP_SAPI=apache + case "$build_type" in + static) + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program + OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la + php_build_target=static +;; + shared) + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program + OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la + php_build_target=shared -echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 -echo "configure:3453: checking whether /dev/urandom exists" >&5 -if test -r "/dev/urandom" && test -c "/dev/urandom"; then - cat >> confdefs.h <<\EOF -#define HAVE_DEV_URANDOM 1 -EOF + php_c_pre=$shared_c_pre + php_c_meta=$shared_c_meta + php_c_post=$shared_c_post + php_cxx_pre=$shared_cxx_pre + php_cxx_meta=$shared_cxx_meta + php_cxx_post=$shared_cxx_post + php_lo=$shared_lo +;; + bundle) - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program + OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle + php_build_target=static +;; + program) + OVERALL_TARGET=php + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo + php_build_target=program +;; + esac + case sapi/apache in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo + old_IFS=$IFS + for ac_src in sapi_apache.c mod_php5.c php_apache.c; do + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" + case $ac_src in + *.c) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + cat >>Makefile.objects</dev/null 2>&1 -if test "$beos_threads" = "1"; then - pthreads_working="yes" - ac_cv_pthreads_cflags="" -else - save_CFLAGS=$CFLAGS - save_LIBS=$LIBS - -if test -n "$ac_cv_pthreads_lib"; then - LIBS="$LIBS -l$ac_cv_pthreads_lib" -fi + if test "$?" != "0"; then + APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php5 $SAPI_SHARED" + else + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ + -i -a -n php5 $SAPI_SHARED" + fi + fi -if test -n "$ac_cv_pthreads_cflags"; then - CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" -fi + if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then + PHP_APXS_BROKEN=yes + fi + STRONGHOLD= - -if test "$cross_compiling" = yes; then - - pthreads_working=no - case $host_alias in - *netware*) - pthreads_working=yes - esac +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h -else - cat > conftest.$ac_ext <>confdefs.h -#include -#include -void *thread_routine(void *data) { - return data; -} +$as_echo "#define HAVE_APACHE 1" >>confdefs.h -int main() { - pthread_t thd; - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); - return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - pthreads_working=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - pthreads_working=no - -fi -rm -fr conftest* -fi - - LIBS=$save_LIBS - CFLAGS=$save_CFLAGS - - echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:3552: checking for pthreads_cflags" >&5 -if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - ac_cv_pthreads_cflags= - if test "$pthreads_working" != "yes"; then - for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do - ac_save=$CFLAGS - CFLAGS="$CFLAGS $flag" - -if test "$cross_compiling" = yes; then - - pthreads_working=no - case $host_alias in - *netware*) - pthreads_working=yes - esac - - -else - cat > conftest.$ac_ext < -#include - -void *thread_routine(void *data) { - return data; -} - -int main() { - pthread_t thd; - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); - return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - pthreads_working=yes - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - pthreads_working=no - -fi -rm -fr conftest* -fi - - CFLAGS=$ac_save - if test "$pthreads_working" = "yes"; then - ac_cv_pthreads_cflags=$flag - break - fi - done - fi -fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 - -echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:3622: checking for pthreads_lib" >&5 -if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -ac_cv_pthreads_lib= -if test "$pthreads_working" != "yes"; then - for lib in pthread pthreads c_r; do - ac_save=$LIBS - LIBS="$LIBS -l$lib" - -if test "$cross_compiling" = yes; then - - pthreads_working=no - case $host_alias in - *netware*) - pthreads_working=yes - esac - -else - cat > conftest.$ac_ext < -#include -void *thread_routine(void *data) { - return data; -} -int main() { - pthread_t thd; - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); - return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - pthreads_working=yes - +# Check whether --with-apache was given. +if test "${with_apache+set}" = set; then : + withval=$with_apache; PHP_APACHE=$withval else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - pthreads_working=no - -fi -rm -fr conftest* -fi - - LIBS=$ac_save - if test "$pthreads_working" = "yes"; then - ac_cv_pthreads_lib=$lib - break - fi - done -fi - -fi -echo "$ac_t""$ac_cv_pthreads_lib" 1>&6 - -if test "$pthreads_working" = "yes"; then - threads_result="POSIX-Threads found" -else - threads_result="POSIX-Threads not found" -fi + PHP_APACHE=no -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : fi - - - - PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_SUFFIX_NAME" - - - - - - PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_DL_SUFFIX_NAME" - - - - SHLIB_SUFFIX_NAME=so - SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME - case $host_alias in - *hpux*) - SHLIB_SUFFIX_NAME=sl - SHLIB_DL_SUFFIX_NAME=sl - ;; - *darwin*) - SHLIB_SUFFIX_NAME=dylib - SHLIB_DL_SUFFIX_NAME=so - ;; - esac - -PHP_SAPI=default - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - - - -SAPI_SHARED=libs/libphp$PHP_MAJOR_VERSION.$SHLIB_DL_SUFFIX_NAME -SAPI_STATIC=libs/libphp$PHP_MAJOR_VERSION.a -SAPI_LIBTOOL=libphp$PHP_MAJOR_VERSION.la - - - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring SAPI modules${T_ME}" 1>&6 - - - - - -php_with_aolserver=no +ext_output=$PHP_APACHE -# Check whether --with-aolserver or --without-aolserver was given. -if test "${with_aolserver+set}" = set; then - withval="$with_aolserver" - PHP_AOLSERVER=$withval -else - - PHP_AOLSERVER=no - -fi -ext_output=$PHP_AOLSERVER +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x module support" >&5 +$as_echo_n "checking for Apache 1.x module support... " >&6; } +if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then + if test "$PHP_APACHE" = "yes"; then + # Apache's default directory + PHP_APACHE=/usr/local/apache + fi + APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module" -echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 -echo "configure:3793: checking for AOLserver support" >&5 +$as_echo "#define HAVE_APACHE 1" >>confdefs.h -if test "$PHP_AOLSERVER" != "no"; then - if test -d "$PHP_AOLSERVER/include"; then - PHP_AOLSERVER_SRC=$PHP_AOLSERVER - fi - if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then - { echo "configure: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" 1>&2; exit 1; } - fi - if test ! -d $PHP_AOLSERVER/bin ; then - { echo "configure: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" 1>&2; exit 1; } - fi - - enable_maintainer_zts=yes - if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } - fi + APACHE_MODULE=yes - - if test "$PHP_AOLSERVER_SRC/include" != "/usr/include"; then - - if test -z "$PHP_AOLSERVER_SRC/include" || echo "$PHP_AOLSERVER_SRC/include" | grep '^/' >/dev/null ; then - ai_p=$PHP_AOLSERVER_SRC/include + if test -z "$PHP_APACHE" || echo "$PHP_APACHE" | grep '^/' >/dev/null ; then + PHP_APACHE=$PHP_APACHE else - - ep_dir="`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PHP_AOLSERVER_SRC/include\"`" - 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 + ep_dir="`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`" + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + PHP_APACHE="$ep_realdir/`basename \"$PHP_APACHE\"`" fi - cat >> confdefs.h <<\EOF -#define HAVE_AOLSERVER 1 -EOF + # For Apache 1.2.x + if test -f $PHP_APACHE/src/httpd.h; then + APACHE_INCLUDE=-I$PHP_APACHE/src + APACHE_TARGET=$PHP_APACHE/src - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi - PHP_SAPI=aolserver - - case "shared" in - static) - + PHP_SAPI=apache + + case "static" in + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -3886,8 +6618,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -3914,7 +6646,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -3923,8 +6655,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -3952,7 +6684,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -3978,16 +6710,16 @@ php_build_target=program ;; esac - - - - case sapi/aolserver in + + + + case sapi/apache in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "sapi/aolserver"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/sapi/aolserver/"; ac_bdir="sapi/aolserver/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -3999,20 +6731,20 @@ old_IFS=$IFS - for ac_src in aolserver.c; do - + for ac_src in sapi_apache.c mod_php5.c php_apache.c; do + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in - *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + *.c) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_INCLUDE $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; esac cat >>Makefile.objects<&6 - - - - - -php_with_apxs=no - - -# Check whether --with-apxs or --without-apxs was given. -if test "${with_apxs+set}" = set; then - withval="$with_apxs" - PHP_APXS=$withval -else - - PHP_APXS=no - - -fi - - -ext_output=$PHP_APXS - - - - + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" + PHP_LIBS="-L. -lphp3" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.2.x" >&5 +$as_echo "yes - Apache 1.2.x" >&6; } + STRONGHOLD= + if test -f $PHP_APACHE/src/ap_config.h; then -echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:4058: checking for Apache 1.x module support via DSO through APXS" >&5 +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h -if test "$PHP_APXS" != "no"; then - if test "$PHP_APXS" = "yes"; then - APXS=apxs - $APXS -q CFLAGS >/dev/null 2>&1 - if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x - APXS=/usr/sbin/apxs fi - else - - if test -z "$PHP_APXS" || echo "$PHP_APXS" | grep '^/' >/dev/null ; then - APXS=$PHP_APXS - else - - ep_dir="`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - APXS="$ep_realdir/`basename \"$PHP_APXS\"`" - fi - - fi - - $APXS -q CFLAGS >/dev/null 2>&1 - if test "$?" != "0"; then - echo "$ac_t""" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""Sorry, I was not able to successfully run APXS. Possible reasons:" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""1. Perl is not installed;" 1>&6 - echo "$ac_t""2. Apache was not compiled with DSO support (--enable-module=so);" 1>&6 - echo "$ac_t""3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" 1>&6 - echo "$ac_t""The output of $APXS follows" 1>&6 - $APXS -q CFLAGS - { echo "configure: error: Aborting" 1>&2; exit 1; } - fi - - APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" - APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` - APXS_CFLAGS=`$APXS -q CFLAGS` - APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` - APACHE_INCLUDE=-I$APXS_INCLUDEDIR - - # Test that we're trying to configure with apache 1.x - - ac_output=`$APXS_HTTPD -v 2>&1 | grep version` - ac_IFS=$IFS -IFS="- /. -" - set $ac_output - IFS=$ac_IFS - - APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` - - if test "$APACHE_VERSION" -ge 2000000; then - { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } - fi - - for flag in $APXS_CFLAGS; do - case $flag in - -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";; - esac - done - - case $host_alias in - *aix*) - APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - PHP_AIX_LDFLAGS="-Wl,-brtl" - build_type=shared - ;; - *darwin*) - MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" - - PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" - - SAPI_SHARED=libs/libphp5.so - build_type=bundle - ;; - *) - build_type=shared - ;; - esac + # 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 + # For Apache 1.3.x + elif test -f $PHP_APACHE/src/main/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE/src/main -I$PHP_APACHE/src/os/unix -I$PHP_APACHE/src/ap" + APACHE_TARGET=$PHP_APACHE/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache - - case "$build_type" in - static) - + + case "static" in + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4182,8 +6820,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4210,7 +6848,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -4219,8 +6857,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4248,7 +6886,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4274,16 +6912,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -4296,19 +6934,19 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in - *.c) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + *.c) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_INCLUDE $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; esac cat >>Makefile.objects<&5 +$as_echo "yes - Apache 1.3.x" >&6; } + STRONGHOLD= + if test -f $PHP_APACHE/src/include/ap_config.h; then - # Test whether apxs support -S option - $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h - if test "$?" != "0"; then - APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then - APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5 $SAPI_SHARED" - else - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` - APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ - -i -a -n php5 $SAPI_SHARED" fi - fi - - if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then - PHP_APXS_BROKEN=yes - fi - STRONGHOLD= - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_APACHE 1 -EOF - - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -php_with_apache=no - - -# Check whether --with-apache or --without-apache was given. -if test "${with_apache+set}" = set; then - withval="$with_apache" - PHP_APACHE=$withval -else - - PHP_APACHE=no - - -fi - - -ext_output=$PHP_APACHE - - - - - -echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 -echo "configure:4389: checking for Apache 1.x module support" >&5 + if test -f $PHP_APACHE/src/include/ap_compat.h; then -if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then - - if test "$PHP_APACHE" = "yes"; then - # Apache's default directory - PHP_APACHE=/usr/local/apache - fi +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h - APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module" + 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 + fi + elif test -f $PHP_APACHE/src/include/compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_APACHE 1 -EOF +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h - APACHE_MODULE=yes - - if test -z "$PHP_APACHE" || echo "$PHP_APACHE" | grep '^/' >/dev/null ; then - PHP_APACHE=$PHP_APACHE - else - - ep_dir="`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - PHP_APACHE="$ep_realdir/`basename \"$PHP_APACHE\"`" - fi + fi + # Also for Apache 1.3.x + elif test -f $PHP_APACHE/src/include/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE/src/include -I$PHP_APACHE/src/os/unix" + APACHE_TARGET=$PHP_APACHE/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi - # For Apache 1.2.x - if test -f $PHP_APACHE/src/httpd.h; then - APACHE_INCLUDE=-I$PHP_APACHE/src - APACHE_TARGET=$PHP_APACHE/src - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4460,8 +7031,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4488,7 +7059,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -4497,8 +7068,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4526,7 +7097,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4552,16 +7123,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -4574,12 +7145,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -4597,44 +7168,49 @@ - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" - PHP_LIBS="-L. -lphp3" - echo "$ac_t""yes - Apache 1.2.x" 1>&6 + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5 +$as_echo "yes - Apache 1.3.x" >&6; } STRONGHOLD= - if test -f $PHP_APACHE/src/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + if test -f $PHP_APACHE/src/include/ap_config.h; then + +$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 - { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; } - # For Apache 1.3.x - elif test -f $PHP_APACHE/src/main/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE/src/main -I$PHP_APACHE/src/os/unix -I$PHP_APACHE/src/ap" - APACHE_TARGET=$PHP_APACHE/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET + if test -f $PHP_APACHE/src/include/ap_compat.h; then + +$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 + fi + elif test -f $PHP_APACHE/src/include/compat.h; then + +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h + fi - + # For StrongHold 2.2 + elif test -f $PHP_APACHE/apache/httpd.h; then + APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include" + APACHE_TARGET=$PHP_APACHE/apache + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4662,8 +7238,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4690,7 +7266,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -4699,8 +7275,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4728,7 +7304,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -4754,16 +7330,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -4776,434 +7352,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - - PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_INCLUDE $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<&6 - STRONGHOLD= - if test -f $PHP_APACHE/src/include/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF - - fi - if test -f $PHP_APACHE/src/include/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF - - if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } - fi - elif test -f $PHP_APACHE/src/include/compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF - - fi - # Also for Apache 1.3.x - elif test -f $PHP_APACHE/src/include/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE/src/include -I$PHP_APACHE/src/os/unix" - APACHE_TARGET=$PHP_APACHE/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: -+--------------------------------------------------------------------+ -| *** ATTENTION *** | -| | -| You've configured multiple SAPIs to be build. You can build only | -| one SAPI module and CLI binary at the same time. | -+--------------------------------------------------------------------+ -" 1>&2; exit 1; } - fi - - PHP_SAPI=apache - - case "static" in - static) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la - php_build_target=static -;; - shared) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la - php_build_target=shared - - php_c_pre=$shared_c_pre - php_c_meta=$shared_c_meta - php_c_post=$shared_c_post - php_cxx_pre=$shared_cxx_pre - php_cxx_meta=$shared_cxx_meta - php_cxx_post=$shared_cxx_post - php_lo=$shared_lo -;; - bundle) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle - php_build_target=static -;; - program) - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program -;; - esac - - - - case sapi/apache in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $APACHE_INCLUDE $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $APACHE_INCLUDE $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<&6 - STRONGHOLD= - if test -f $PHP_APACHE/src/include/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF - - fi - if test -f $PHP_APACHE/src/include/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF - - if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } - fi - elif test -f $PHP_APACHE/src/include/compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF - - fi - # For StrongHold 2.2 - elif test -f $PHP_APACHE/apache/httpd.h; then - APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include" - APACHE_TARGET=$PHP_APACHE/apache - - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: -+--------------------------------------------------------------------+ -| *** ATTENTION *** | -| | -| You've configured multiple SAPIs to be build. You can build only | -| one SAPI module and CLI binary at the same time. | -+--------------------------------------------------------------------+ -" 1>&2; exit 1; } - fi - - PHP_SAPI=apache - - case "static" in - static) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la - php_build_target=static -;; - shared) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la - php_build_target=shared - - php_c_pre=$shared_c_pre - php_c_meta=$shared_c_meta - php_c_post=$shared_c_post - php_cxx_pre=$shared_cxx_pre - php_cxx_meta=$shared_cxx_meta - php_cxx_post=$shared_cxx_post - php_lo=$shared_lo -;; - bundle) - - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program - - OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle - php_build_target=static -;; - program) - OVERALL_TARGET=php - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' - php_c_post= - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' - php_cxx_post= - php_lo=lo - - case $with_pic in - yes) pic_setting='-prefer-pic';; - no) pic_setting='-prefer-non-pic';; - esac - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting - shared_c_post= - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting - shared_cxx_post= - shared_lo=lo - - php_build_target=program -;; - esac - - - - case sapi/apache in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -5224,81 +7378,80 @@ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 - echo "$ac_t""yes - StrongHold" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - StrongHold" >&5 +$as_echo "yes - StrongHold" >&6; } if test -f $PHP_APACHE/apache/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi if test -f $PHP_APACHE/src/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } + 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 - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h fi else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" 1>&2; exit 1; } + { $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 fi else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # compatibility if test -z "$enable_mod_charset" && test "$with_mod_charset"; then enable_mod_charset=$with_mod_charset fi - + php_enable_mod_charset=no -echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 -echo "configure:5266: checking whether to enable Apache charset compatibility option" >&5 -# Check whether --enable-mod-charset or --disable-mod-charset was given. -if test "${enable_mod_charset+set}" = set; then - enableval="$enable_mod_charset" - PHP_MOD_CHARSET=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Apache charset compatibility option" >&5 +$as_echo_n "checking whether to enable Apache charset compatibility option... " >&6; } +# Check whether --enable-mod-charset was given. +if test "${enable_mod_charset+set}" = set; then : + enableval=$enable_mod_charset; PHP_MOD_CHARSET=$enableval else - + PHP_MOD_CHARSET=no - + fi ext_output=$PHP_MOD_CHARSET -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_MOD_CHARSET" = "yes"; then - cat >> confdefs.h <<\EOF -#define USE_TRANSFER_TABLES 1 -EOF + +$as_echo "#define USE_TRANSFER_TABLES 1" >>confdefs.h fi if test "$APACHE_MODULE" = "yes"; then - + if test -n "$GCC"; then - + gcc_arg_name=ac_cv_gcc_arg_rdynamic - echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:5298: checking whether $CC supports -rdynamic" >&5 -if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 +$as_echo_n "checking whether $CC supports -rdynamic... " >&6; } +if ${ac_cv_gcc_arg_rdynamic+:} false; then : + $as_echo_n "(cached) " >&6 else - + echo 'void somefunc() { };' > conftest.c cmd='$CC -rdynamic -c conftest.c' if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then @@ -5308,15 +7461,15 @@ fi eval $gcc_arg_name=$ac_result rm -f conftest.* - -fi -echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5 +$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; } if eval test "\$$gcc_arg_name" = "yes"; then gcc_rdynamic=yes else : - + fi if test "$gcc_rdynamic" = "yes"; then @@ -5325,7 +7478,7 @@ fi $php_shtool mkdir -p sapi/apache - + PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache/libphp5.module" fi @@ -5335,71 +7488,69 @@ APXS_EXP=-bE:sapi/apache/mod_php5.exp fi - -echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:5341: checking for member fd in BUFF *" >&5 -if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $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 ${ac_cv_php_fd_in_buff+:} false; then : + $as_echo_n "(cached) " >&6 else - + save=$CPPFLAGS if test -n "$APXS_INCLUDEDIR"; then CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR" else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ conn_rec *c; int fd = c->client->fd; -; return 0; } -EOF -if { (eval echo configure:5360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_php_fd_in_buff=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_php_fd_in_buff=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$save fi - -echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_fd_in_buff" >&5 +$as_echo "$ac_cv_php_fd_in_buff" >&6; } if test "$ac_cv_php_fd_in_buff" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_APACHE_HAVE_CLIENT_FD 1 -EOF + +$as_echo "#define PHP_APACHE_HAVE_CLIENT_FD 1" >>confdefs.h fi INSTALL_IT=$APACHE_INSTALL - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INSTALL" - + PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD" fi @@ -5410,14 +7561,14 @@ php_with_apxs2filter=no -# Check whether --with-apxs2filter or --without-apxs2filter was given. -if test "${with_apxs2filter+set}" = set; then - withval="$with_apxs2filter" - PHP_APXS2FILTER=$withval + +# Check whether --with-apxs2filter was given. +if test "${with_apxs2filter+set}" = set; then : + withval=$with_apxs2filter; PHP_APXS2FILTER=$withval else - + PHP_APXS2FILTER=no - + fi @@ -5428,8 +7579,8 @@ -echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:5433: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 +$as_echo_n "checking for Apache 2.0 filter-module support via DSO through APXS... " >&6; } if test "$PHP_APXS2FILTER" != "no"; then if test "$PHP_APXS2FILTER" = "yes"; then @@ -5439,13 +7590,13 @@ APXS=/usr/sbin/apxs fi else - + if test -z "$PHP_APXS2FILTER" || echo "$PHP_APXS2FILTER" | grep '^/' >/dev/null ; then APXS=$PHP_APXS2FILTER else - + ep_dir="`echo $PHP_APXS2FILTER|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" APXS="$ep_realdir/`basename \"$PHP_APXS2FILTER\"`" fi @@ -5454,18 +7605,27 @@ $APXS -q CFLAGS >/dev/null 2>&1 if test "$?" != "0"; then - echo "$ac_t""" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""Sorry, I cannot run apxs. Possible reasons follow:" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""1. Perl is not installed" 1>&6 - echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" 1>&6 - echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""The output of $APXS follows:" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 +$as_echo "Sorry, I cannot run apxs. Possible reasons follow:" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5 +$as_echo "1. Perl is not installed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&5 +$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 +$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$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 - { echo "configure: error: Aborting" 1>&2; exit 1; } - fi + as_fn_error $? "Aborting" "$LINENO" 5 + fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_BINDIR=`$APXS -q BINDIR` @@ -5492,22 +7652,6 @@ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" - # Test that we're trying to configure with apache 2.x - - ac_output=`$APXS_HTTPD -v 2>&1 | grep version` - ac_IFS=$IFS -IFS="- /. -" - set $ac_output - IFS=$ac_IFS - - APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` - - if test "$APACHE_VERSION" -le 2000000; then - { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; } - elif test "$APACHE_VERSION" -lt 2000040; then - { echo "configure: error: Please note that Apache version >= 2.0.40 is required" 1>&2; exit 1; } - fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then @@ -5526,23 +7670,23 @@ case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2filter - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5570,8 +7714,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5598,7 +7742,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -5607,8 +7751,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5636,7 +7780,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5662,16 +7806,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -5684,12 +7828,12 @@ old_IFS=$IFS for ac_src in sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -5707,7 +7851,7 @@ - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) if test -x "$APR_CONFIG"; then @@ -5717,26 +7861,26 @@ MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" fi MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2filter - + case "bundle" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5764,8 +7908,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5792,7 +7936,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -5801,8 +7945,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5830,7 +7974,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5856,16 +8000,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -5878,12 +8022,12 @@ old_IFS=$IFS for ac_src in sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -5908,23 +8052,23 @@ if test -f _APP_; then `rm _APP_`; fi `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS="$EXTRA_LIBS _APP_" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2filter - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5952,8 +8096,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -5980,7 +8124,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -5989,8 +8133,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6018,7 +8162,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6044,16 +8188,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -6066,12 +8210,12 @@ old_IFS=$IFS for ac_src in sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -6092,23 +8236,23 @@ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2filter - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6136,8 +8280,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6164,7 +8308,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -6173,8 +8317,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6202,7 +8346,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6228,16 +8372,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -6250,12 +8394,12 @@ old_IFS=$IFS for ac_src in sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -6272,25 +8416,27 @@ done - + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; esac if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6299,14 +8445,14 @@ php_with_apxs2=no -# Check whether --with-apxs2 or --without-apxs2 was given. -if test "${with_apxs2+set}" = set; then - withval="$with_apxs2" - PHP_APXS2=$withval + +# Check whether --with-apxs2 was given. +if test "${with_apxs2+set}" = set; then : + withval=$with_apxs2; PHP_APXS2=$withval else - + PHP_APXS2=no - + fi @@ -6317,8 +8463,8 @@ -echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:6322: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 +$as_echo_n "checking for Apache 2.0 handler-module support via DSO through APXS... " >&6; } if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then @@ -6328,13 +8474,13 @@ APXS=/usr/sbin/apxs fi else - + if test -z "$PHP_APXS2" || echo "$PHP_APXS2" | grep '^/' >/dev/null ; then APXS=$PHP_APXS2 else - + ep_dir="`echo $PHP_APXS2|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" APXS="$ep_realdir/`basename \"$PHP_APXS2\"`" fi @@ -6343,18 +8489,27 @@ $APXS -q CFLAGS >/dev/null 2>&1 if test "$?" != "0"; then - echo "$ac_t""" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""Sorry, I cannot run apxs. Possible reasons follow:" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""1. Perl is not installed" 1>&6 - echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" 1>&6 - echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""The output of $APXS follows:" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 +$as_echo "Sorry, I cannot run apxs. Possible reasons follow:" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5 +$as_echo "1. Perl is not installed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5 +$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 +$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$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 - { echo "configure: error: Aborting" 1>&2; exit 1; } - fi + as_fn_error $? "Aborting" "$LINENO" 5 + fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_BINDIR=`$APXS -q BINDIR` @@ -6381,22 +8536,6 @@ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" - # Test that we're trying to configure with apache 2.x - - ac_output=`$APXS_HTTPD -v 2>&1 | grep version` - ac_IFS=$IFS -IFS="- /. -" - set $ac_output - IFS=$ac_IFS - - APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` - - if test "$APACHE_VERSION" -le 2000000; then - { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; } - elif test "$APACHE_VERSION" -lt 2000044; then - { echo "configure: error: Please note that Apache version >= 2.0.44 is required" 1>&2; exit 1; } - fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then @@ -6415,23 +8554,23 @@ case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2handler - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6459,8 +8598,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6487,7 +8626,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -6496,8 +8635,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6525,7 +8664,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6551,16 +8690,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2handler in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -6573,12 +8712,12 @@ old_IFS=$IFS for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -6596,7 +8735,7 @@ - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) if test -x "$APR_CONFIG"; then @@ -6606,26 +8745,26 @@ MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" fi MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2handler - + case "bundle" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6653,9 +8792,9 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - - OVERALL_TARGET=php + shared) + + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' php_c_post= @@ -6681,7 +8820,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -6690,8 +8829,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6719,7 +8858,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6745,16 +8884,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2handler in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -6767,12 +8906,12 @@ old_IFS=$IFS for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -6797,23 +8936,23 @@ if test -f _APP_; then `rm _APP_`; fi `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS="$EXTRA_LIBS _APP_" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2handler - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6841,8 +8980,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6869,7 +9008,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -6878,8 +9017,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6907,7 +9046,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -6933,16 +9072,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2handler in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -6955,12 +9094,12 @@ old_IFS=$IFS for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -6981,23 +9120,23 @@ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache2handler - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7025,8 +9164,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7053,7 +9192,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -7062,8 +9201,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7091,7 +9230,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7117,16 +9256,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache2handler in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -7139,12 +9278,12 @@ old_IFS=$IFS for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -7161,25 +9300,27 @@ done - + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; esac if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7189,14 +9330,14 @@ php_with_apache_hooks=no -# Check whether --with-apache-hooks or --without-apache-hooks was given. -if test "${with_apache_hooks+set}" = set; then - withval="$with_apache_hooks" - PHP_APACHE_HOOKS=$withval + +# Check whether --with-apache-hooks was given. +if test "${with_apache_hooks+set}" = set; then : + withval=$with_apache_hooks; PHP_APACHE_HOOKS=$withval else - + PHP_APACHE_HOOKS=no - + fi @@ -7207,24 +9348,24 @@ -echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:7212: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 +$as_echo_n "checking for Apache 1.x (hooks) module support via DSO through APXS... " >&6; } if test "$PHP_APACHE_HOOKS" != "no"; then if test "$PHP_APACHE_HOOKS" = "yes"; then APXS=apxs $APXS -q CFLAGS >/dev/null 2>&1 - if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x + if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x APXS=/usr/sbin/apxs fi else - + if test -z "$PHP_APACHE_HOOKS" || echo "$PHP_APACHE_HOOKS" | grep '^/' >/dev/null ; then APXS=$PHP_APACHE_HOOKS else - + ep_dir="`echo $PHP_APACHE_HOOKS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" APXS="$ep_realdir/`basename \"$PHP_APACHE_HOOKS\"`" fi @@ -7233,17 +9374,25 @@ $APXS -q CFLAGS >/dev/null 2>&1 if test "$?" != "0"; then - echo "$ac_t""" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""Sorry, I was not able to successfully run APXS. Possible reasons:" 1>&6 - echo "$ac_t""" 1>&6 - echo "$ac_t""1. Perl is not installed;" 1>&6 - echo "$ac_t""2. Apache was not compiled with DSO support (--enable-module=so);" 1>&6 - echo "$ac_t""3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" 1>&6 - echo "$ac_t""The output of $APXS follows" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I was not able to successfully run APXS. Possible reasons:" >&5 +$as_echo "Sorry, I was not able to successfully run APXS. Possible reasons:" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed;" >&5 +$as_echo "1. Perl is not installed;" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. Apache was not compiled with DSO support (--enable-module=so);" >&5 +$as_echo "2. Apache was not compiled with DSO support (--enable-module=so);" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&5 +$as_echo "3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&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 - { echo "configure: error: Aborting" 1>&2; exit 1; } - fi + as_fn_error $? "Aborting" "$LINENO" 5 + fi APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` @@ -7251,20 +9400,6 @@ APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` APACHE_INCLUDE=-I$APXS_INCLUDEDIR - # Test that we're trying to configure with apache 1.x - - ac_output=`$APXS_HTTPD -v 2>&1 | grep version` - ac_IFS=$IFS -IFS="- /. -" - set $ac_output - IFS=$ac_IFS - - APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` - - if test "$APACHE_VERSION" -ge 2000000; then - { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } - fi for flag in $APXS_CFLAGS; do case $flag in @@ -7281,7 +9416,7 @@ ;; *darwin*) MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" - + PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" SAPI_SHARED=libs/libphp5.so @@ -7292,23 +9427,23 @@ ;; esac - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache_hooks - + case "$build_type" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7336,8 +9471,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7364,7 +9499,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -7373,8 +9508,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7402,7 +9537,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7428,16 +9563,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache_hooks in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -7450,12 +9585,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -7479,7 +9614,7 @@ if test "$?" != "0"; then APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else + else APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ @@ -7499,35 +9634,34 @@ PHP_APXS_BROKEN=yes fi STRONGHOLD= - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_APACHE_HOOKS 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h + + +$as_echo "#define HAVE_APACHE_HOOKS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi php_with_apache_hooks_static=no -# Check whether --with-apache-hooks-static or --without-apache-hooks-static was given. -if test "${with_apache_hooks_static+set}" = set; then - withval="$with_apache_hooks_static" - PHP_APACHE_HOOKS_STATIC=$withval + +# Check whether --with-apache-hooks-static was given. +if test "${with_apache_hooks_static+set}" = set; then : + withval=$with_apache_hooks_static; PHP_APACHE_HOOKS_STATIC=$withval else - + PHP_APACHE_HOOKS_STATIC=no - + fi @@ -7538,8 +9672,8 @@ -echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 -echo "configure:7543: checking for Apache 1.x (hooks) module support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x (hooks) module support" >&5 +$as_echo_n "checking for Apache 1.x (hooks) module support... " >&6; } if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then @@ -7550,43 +9684,42 @@ APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module" - cat >> confdefs.h <<\EOF -#define HAVE_APACHE 1 -EOF + +$as_echo "#define HAVE_APACHE 1" >>confdefs.h APACHE_HOOKS_MODULE=yes - + if test -z "$PHP_APACHE_HOOKS_STATIC" || echo "$PHP_APACHE_HOOKS_STATIC" | grep '^/' >/dev/null ; then PHP_APACHE_HOOKS_STATIC=$PHP_APACHE_HOOKS_STATIC else - + ep_dir="`echo $PHP_APACHE_HOOKS_STATIC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" PHP_APACHE_HOOKS_STATIC="$ep_realdir/`basename \"$PHP_APACHE_HOOKS_STATIC\"`" fi # For Apache 1.2.x - if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then + if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache_hooks - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7614,8 +9747,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7642,7 +9775,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -7651,8 +9784,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7680,7 +9813,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7706,16 +9839,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache_hooks in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -7728,12 +9861,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -7753,17 +9886,17 @@ APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" PHP_LIBS="-L. -lphp3" - echo "$ac_t""yes - Apache 1.2.x" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.2.x" >&5 +$as_echo "yes - Apache 1.2.x" >&6; } STRONGHOLD= if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + +$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 - { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; } + 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 @@ -7772,23 +9905,23 @@ if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache_hooks - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7816,8 +9949,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7844,7 +9977,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -7853,8 +9986,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7882,7 +10015,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -7908,16 +10041,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache_hooks in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -7930,12 +10063,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -7955,26 +10088,24 @@ APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - echo "$ac_t""yes - Apache 1.3.x" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5 +$as_echo "yes - Apache 1.3.x" >&6; } STRONGHOLD= if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } + 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 - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h fi # Also for Apache 1.3.x @@ -7985,23 +10116,23 @@ if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache_hooks - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8029,8 +10160,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8057,7 +10188,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -8066,8 +10197,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8095,7 +10226,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8121,16 +10252,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache_hooks in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -8143,12 +10274,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -8168,49 +10299,47 @@ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - echo "$ac_t""yes - Apache 1.3.x" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5 +$as_echo "yes - Apache 1.3.x" >&6; } STRONGHOLD= if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } + 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 - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h fi # For StrongHold 2.2 elif test -f $PHP_APACHE_HOOKS_STATIC/apache/httpd.h; then APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include" APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=apache_hooks - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8238,8 +10367,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8266,7 +10395,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -8275,8 +10404,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8304,7 +10433,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8330,16 +10459,16 @@ php_build_target=program ;; esac - - - + + + case sapi/apache_hooks in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -8352,12 +10481,12 @@ old_IFS=$IFS for ac_src in sapi_apache.c mod_php5.c php_apache.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -8378,33 +10507,33 @@ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 - echo "$ac_t""yes - StrongHold" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - StrongHold" >&5 +$as_echo "yes - StrongHold" >&6; } if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h fi if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_compat.h; then - cat >> confdefs.h <<\EOF -#define HAVE_AP_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then - { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } + 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 - cat >> confdefs.h <<\EOF -#define HAVE_OLD_COMPAT_H 1 -EOF + +$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h fi else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" 1>&2; exit 1; } + { $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 fi else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # compatibility @@ -8415,44 +10544,43 @@ php_enable_mod_charset=no -echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 -echo "configure:8420: checking whether to enable Apache charset compatibility option" >&5 -# Check whether --enable-mod-charset or --disable-mod-charset was given. -if test "${enable_mod_charset+set}" = set; then - enableval="$enable_mod_charset" - PHP_MOD_CHARSET=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Apache charset compatibility option" >&5 +$as_echo_n "checking whether to enable Apache charset compatibility option... " >&6; } +# Check whether --enable-mod-charset was given. +if test "${enable_mod_charset+set}" = set; then : + enableval=$enable_mod_charset; PHP_MOD_CHARSET=$enableval else - + PHP_MOD_CHARSET=no - + fi ext_output=$PHP_MOD_CHARSET -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_MOD_CHARSET" = "yes"; then - cat >> confdefs.h <<\EOF -#define USE_TRANSFER_TABLES 1 -EOF + +$as_echo "#define USE_TRANSFER_TABLES 1" >>confdefs.h fi if test "$APACHE_HOOKS_MODULE" = "yes"; then - + if test -n "$GCC"; then - + gcc_arg_name=ac_cv_gcc_arg_rdynamic - echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:8452: checking whether $CC supports -rdynamic" >&5 -if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 +$as_echo_n "checking whether $CC supports -rdynamic... " >&6; } +if ${ac_cv_gcc_arg_rdynamic+:} false; then : + $as_echo_n "(cached) " >&6 else - + echo 'void somefunc() { };' > conftest.c cmd='$CC -rdynamic -c conftest.c' if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then @@ -8462,15 +10590,15 @@ fi eval $gcc_arg_name=$ac_result rm -f conftest.* - -fi -echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5 +$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; } if eval test "\$$gcc_arg_name" = "yes"; then gcc_rdynamic=yes else : - + fi if test "$gcc_rdynamic" = "yes"; then @@ -8479,7 +10607,7 @@ fi $php_shtool mkdir -p sapi/apache_hooks - + PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache_hooks/libphp5.module" fi @@ -8489,71 +10617,69 @@ APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp fi - -echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:8495: checking for member fd in BUFF *" >&5 -if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $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 ${ac_cv_php_fd_in_buff+:} false; then : + $as_echo_n "(cached) " >&6 else - + save=$CPPFLAGS if test -n "$APXS_INCLUDEDIR"; then CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR" else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ conn_rec *c; int fd = c->client->fd; -; return 0; } -EOF -if { (eval echo configure:8514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_php_fd_in_buff=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_php_fd_in_buff=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$save fi - -echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_fd_in_buff" >&5 +$as_echo "$ac_cv_php_fd_in_buff" >&6; } if test "$ac_cv_php_fd_in_buff" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_APACHE_HAVE_CLIENT_FD 1 -EOF + +$as_echo "#define PHP_APACHE_HAVE_CLIENT_FD 1" >>confdefs.h fi INSTALL_IT=$APACHE_HOOKS_INSTALL - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_HOOKS_INSTALL" - + PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD" fi @@ -8565,14 +10691,14 @@ php_with_caudium=no -# Check whether --with-caudium or --without-caudium was given. -if test "${with_caudium+set}" = set; then - withval="$with_caudium" - PHP_CAUDIUM=$withval + +# Check whether --with-caudium was given. +if test "${with_caudium+set}" = set; then : + withval=$with_caudium; PHP_CAUDIUM=$withval else - + PHP_CAUDIUM=no - + fi @@ -8583,8 +10709,8 @@ -echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 -echo "configure:8588: checking for Caudium support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Caudium support" >&5 +$as_echo_n "checking for Caudium support... " >&6; } if test "$PHP_CAUDIUM" != "no"; then if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi @@ -8600,15 +10726,16 @@ elif test -f $PHP_CAUDIUM/bin/pike; then PIKE=$PHP_CAUDIUM/bin/pike else - { echo "configure: error: Could not find a pike in $PHP_CAUDIUM/bin/" 1>&2; exit 1; } + 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,' ` + PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Master file' | sed -e 's/.*: //' -e 's/master.pike/modules/'` + PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/modules,,' -e 's,modules,include,' ` if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; } + as_fn_error $? "Failed to figure out Pike module and include directories" "$LINENO" 5 fi - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PIKE=`echo $PIKE | pike -e 'int tries=100; string orig,pike=Stdio.File("stdin")->read()-"\n"; orig=pike; @@ -8617,33 +10744,33 @@ while(!catch(pike=readlink(pike)) && tries--) ; write(combine_path(dirname(orig), pike)); '` - + if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then - + if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then ai_p=$PIKE_INCLUDE_DIR else - + ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`" 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 @@ -8653,8 +10780,8 @@ else PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` fi - echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6 -echo "configure:8658: checking for C includes in $PIKE_C_INCLUDE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C includes in $PIKE_C_INCLUDE" >&5 +$as_echo_n "checking for C includes in $PIKE_C_INCLUDE... " >&6; } if test -f $PIKE_C_INCLUDE/version.h; then PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` ###### VERSION MATCH CHECK ####### @@ -8677,70 +10804,72 @@ fi if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then - + if test "$PIKE_C_INCLUDE" != "/usr/include"; then - + if test -z "$PIKE_C_INCLUDE" || echo "$PIKE_C_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$PIKE_C_INCLUDE else - + ep_dir="`echo $PIKE_C_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PIKE_C_INCLUDE\"`" 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 PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE" - echo "$ac_t""found" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } else - echo "$ac_t""version mismatch" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: version mismatch" >&5 +$as_echo "version mismatch" >&6; } fi else - echo "$ac_t""not found" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } fi else - { echo "configure: error: Caudium PHP5 requires Pike 7.0 or newer" 1>&2; exit 1; } + 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);'` - cat >> confdefs.h <<\EOF -#define HAVE_CAUDIUM 1 -EOF + PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` + +$as_echo "#define HAVE_CAUDIUM 1" >>confdefs.h + - if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=caudium - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8768,8 +10897,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8796,7 +10925,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -8805,8 +10934,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8834,7 +10963,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -8860,16 +10989,16 @@ php_build_target=program ;; esac - - - + + + case sapi/caudium in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/caudium"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/caudium/"; ac_bdir="sapi/caudium/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -8882,12 +11011,12 @@ old_IFS=$IFS for ac_src in caudium.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -8905,18 +11034,19 @@ - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/ && \$(INSTALL) -m 0755 .$SAPI_SHARED \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" RESULT=" *** Pike binary used: $PIKE *** Pike include dir(s) used: $PIKE_INCLUDE_DIR *** Pike version: $PIKE_VERSION" - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi fi -echo "$ac_t""$RESULT" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESULT" >&5 +$as_echo "$RESULT" >&6; } @@ -8924,14 +11054,13 @@ php_enable_cli=yes -# Check whether --enable-cli or --disable-cli was given. -if test "${enable_cli+set}" = set; then - enableval="$enable_cli" - PHP_CLI=$enableval +# Check whether --enable-cli was given. +if test "${enable_cli+set}" = set; then : + enableval=$enable_cli; PHP_CLI=$enableval else - + PHP_CLI=yes - + fi @@ -8942,17 +11071,17 @@ -echo $ac_n "checking for CLI build""... $ac_c" 1>&6 -echo "configure:8947: checking for CLI build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5 +$as_echo_n "checking for CLI build... " >&6; } if test "$PHP_CLI" != "no"; then - + src=$abs_srcdir/sapi/cli/Makefile.frag ac_srcdir=$abs_srcdir/sapi/cli ac_builddir=sapi/cli test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments SAPI_CLI_PATH=sapi/cli/php - + PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH" @@ -8976,72 +11105,75 @@ esac INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" - + PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI" - + PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_CLI" - + PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1" fi -echo "$ac_t""$PHP_CLI" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5 +$as_echo "$PHP_CLI" >&6; } php_with_continuity=no -echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 -echo "configure:8997: checking for Continuity support" >&5 -# Check whether --with-continuity or --without-continuity was given. -if test "${with_continuity+set}" = set; then - withval="$with_continuity" - PHP_CONTINUITY=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Continuity support" >&5 +$as_echo_n "checking for Continuity support... " >&6; } + +# Check whether --with-continuity was given. +if test "${with_continuity+set}" = set; then : + withval=$with_continuity; PHP_CONTINUITY=$withval else - + PHP_CONTINUITY=no - + fi ext_output=$PHP_CONTINUITY -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_CONTINUITY" != "no"; then if test ! -d $PHP_CONTINUITY; then - { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; } + as_fn_error $? "Please specify the path to the root of your Continuity server using --with-continuity=DIR" "$LINENO" 5 fi - echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6 -echo "configure:9021: checking for Continuity include files" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Continuity include files" >&5 +$as_echo_n "checking for Continuity include files... " >&6; } if test -d $PHP_CONTINUITY/include ; then CAPI_INCLUDE=$PHP_CONTINUITY/include - echo "$ac_t""Continuity Binary Distribution" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Continuity Binary Distribution" >&5 +$as_echo "Continuity Binary Distribution" >&6; } else - { echo "configure: error: Cannot find your CAPI include files in either DIR/src or DIR/include" 1>&2; exit 1; } + as_fn_error $? "Cannot find your CAPI include files in either DIR/src or DIR/include" "$LINENO" 5 fi - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=continuity - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9069,8 +11201,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9097,7 +11229,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -9106,8 +11238,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9135,7 +11267,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9161,16 +11293,16 @@ php_build_target=program ;; esac - - - + + + case sapi/continuity in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/continuity"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/continuity/"; ac_bdir="sapi/continuity/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -9183,12 +11315,12 @@ old_IFS=$IFS for ac_src in capi.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -9206,46 +11338,45 @@ - + if test "$CAPI_INCLUDE" != "/usr/include"; then - + if test -z "$CAPI_INCLUDE" || echo "$CAPI_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$CAPI_INCLUDE else - + ep_dir="`echo $CAPI_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$CAPI_INCLUDE\"`" 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 - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_CONTINUITY 1 -EOF + +$as_echo "#define HAVE_CONTINUITY 1" >>confdefs.h INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CONTINUITY/lib/" fi @@ -9256,14 +11387,13 @@ php_enable_embed=no -# Check whether --enable-embed or --disable-embed was given. -if test "${enable_embed+set}" = set; then - enableval="$enable_embed" - PHP_EMBED=$enableval +# Check whether --enable-embed was given. +if test "${enable_embed+set}" = set; then : + enableval=$enable_embed; PHP_EMBED=$enableval else - + PHP_EMBED=no - + fi @@ -9274,8 +11404,8 @@ -echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 -echo "configure:9279: checking for embedded SAPI library support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5 +$as_echo_n "checking for embedded SAPI library support... " >&6; } if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in @@ -9292,23 +11422,23 @@ ;; esac if test "$PHP_EMBED_TYPE" != "no"; then - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=embed - + case "$PHP_EMBED_TYPE" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9336,8 +11466,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9364,7 +11494,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -9373,8 +11503,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9402,7 +11532,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -9428,16 +11558,16 @@ php_build_target=program ;; esac - - - + + + case sapi/embed in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/embed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/embed/"; ac_bdir="sapi/embed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -9450,12 +11580,12 @@ old_IFS=$IFS for ac_src in php_embed.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -9473,28 +11603,30 @@ - - + + for header_file in sapi/embed/php_embed.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + fi - echo "$ac_t""$PHP_EMBED_TYPE" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5 +$as_echo "$PHP_EMBED_TYPE" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9503,14 +11635,13 @@ php_enable_fpm=no -# Check whether --enable-fpm or --disable-fpm was given. -if test "${enable_fpm+set}" = set; then - enableval="$enable_fpm" - PHP_FPM=$enableval +# Check whether --enable-fpm was given. +if test "${enable_fpm+set}" = set; then : + enableval=$enable_fpm; PHP_FPM=$enableval else - + PHP_FPM=no - + fi @@ -9533,427 +11664,297 @@ -echo $ac_n "checking for FPM build""... $ac_c" 1>&6 -echo "configure:9538: checking for FPM build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5 +$as_echo_n "checking for FPM build... " >&6; } if test "$PHP_FPM" != "no"; then - echo "$ac_t""$PHP_FPM" 1>&6 - - - for ac_func in setenv clearenv setproctitle -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9546: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5 +$as_echo "$PHP_FPM" >&6; } -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif -; return 0; } -EOF -if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + for ac_func in setenv clearenv setproctitle +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - -echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 -echo "configure:9601: checking for library containing socket" >&5 -if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_func_search_save_LIBS="$LIBS" -ac_cv_search_socket="no" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_socket="none required" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +$as_echo_n "checking for library containing socket... " >&6; } +if ${ac_cv_search_socket+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socket (); +int +main () +{ +return socket (); + ; + return 0; +} +_ACEOF +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_socket=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_socket+:} false; then : + break fi -rm -f conftest* -test "$ac_cv_search_socket" = "no" && for i in socket; do -LIBS="-l$i $ac_func_search_save_LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_socket="-l$i" -break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ac_cv_search_socket=no fi -rm -f conftest* -done -LIBS="$ac_func_search_save_LIBS" +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +$as_echo "$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -echo "$ac_t""$ac_cv_search_socket" 1>&6 -if test "$ac_cv_search_socket" != "no"; then - test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS" - -else : - -fi - -echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 -echo "configure:9663: checking for library containing inet_addr" >&5 -if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_func_search_save_LIBS="$LIBS" -ac_cv_search_inet_addr="no" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_inet_addr="none required" + { $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 ${ac_cv_search_inet_addr+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inet_addr (); +int +main () +{ +return inet_addr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_inet_addr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_inet_addr+:} false; then : + break fi -rm -f conftest* -test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do -LIBS="-l$i $ac_func_search_save_LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_inet_addr="-l$i" -break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ac_cv_search_inet_addr=no fi -rm -f conftest* -done -LIBS="$ac_func_search_save_LIBS" +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5 +$as_echo "$ac_cv_search_inet_addr" >&6; } +ac_res=$ac_cv_search_inet_addr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -echo "$ac_t""$ac_cv_search_inet_addr" 1>&6 -if test "$ac_cv_search_inet_addr" != "no"; then - test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS" - -else : - fi - for ac_hdr in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9728: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + + for ac_header in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done - for ac_hdr in sys/select.h sys/socket.h sys/time.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9768: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + for ac_header in sys/select.h sys/socket.h sys/time.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done - for ac_hdr in arpa/inet.h netinet/in.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9808: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + for ac_header in arpa/inet.h netinet/in.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done - - echo $ac_n "checking for prctl""... $ac_c" 1>&6 -echo "configure:9847: checking for prctl" >&5 - cat > conftest.$ac_ext < -int main() { + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5 +$as_echo_n "checking for prctl... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ prctl(0, 0, 0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:9857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HAVE_PRCTL 1 -EOF + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + +$as_echo "#define HAVE_PRCTL 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - echo "$ac_t""yes" 1>&6 - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + - have_clock_gettime=no - echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 -echo "configure:9880: checking for clock_gettime" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5 +$as_echo_n "checking for clock_gettime... " >&6; } - cat > conftest.$ac_ext < -int main() { + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); -; return 0; } -EOF -if { (eval echo configure:9890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_clock_gettime=yes - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$have_clock_gettime" = "no"; then - echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 -echo "configure:9908: checking for clock_gettime in -lrt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } SAVED_LIBS="$LIBS" LIBS="$LIBS -lrt" - cat > conftest.$ac_ext < -int main() { + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); -; return 0; } -EOF -if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_clock_gettime=yes - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + LIBS="$SAVED_LIBS" - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi if test "$have_clock_gettime" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_CLOCK_GETTIME 1 -EOF + +$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h fi have_clock_get_time=no if test "$have_clock_gettime" = "no"; then - echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6 -echo "configure:9950: checking for clock_get_time" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5 +$as_echo_n "checking for clock_get_time... " >&6; } - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + 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; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include @@ -9974,77 +11975,78 @@ return 0; } - -EOF -if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + have_clock_get_time=yes - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi if test "$have_clock_get_time" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_CLOCK_GET_TIME 1 -EOF + +$as_echo "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h fi - + have_ptrace=no have_broken_ptrace=no - echo $ac_n "checking for ptrace""... $ac_c" 1>&6 -echo "configure:10011: checking for ptrace" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5 +$as_echo_n "checking for ptrace... " >&6; } - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include - #include -int main() { + #include +int +main () +{ ptrace(0, 0, (void *) 0, 0); -; return 0; } -EOF -if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + have_ptrace=yes - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$have_ptrace" = "yes"; then - echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6 -echo "configure:10041: checking whether ptrace works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5 +$as_echo_n "checking whether ptrace works... " >&6; } - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + 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; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -10112,74 +12114,72 @@ return 0; } } - -EOF -if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + have_ptrace=no have_broken_ptrace=yes - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi if test "$have_ptrace" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_PTRACE 1 -EOF + +$as_echo "#define HAVE_PTRACE 1" >>confdefs.h fi have_mach_vm_read=no if test "$have_broken_ptrace" = "yes"; then - echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6 -echo "configure:10149: checking for mach_vm_read" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5 +$as_echo_n "checking for mach_vm_read... " >&6; } - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include - -int main() { + +int +main () +{ mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0); - -; return 0; } -EOF -if { (eval echo configure:10163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + have_mach_vm_read=yes - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - -fi -rm -f conftest* + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "$have_mach_vm_read" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_MACH_VM_READ 1 -EOF + +$as_echo "#define HAVE_MACH_VM_READ 1" >>confdefs.h fi @@ -10194,15 +12194,17 @@ fi if test -n "$proc_mem_file" ; then - echo $ac_n "checking for proc mem file""... $ac_c" 1>&6 -echo "configure:10199: checking for proc mem file" >&5 - - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5 +$as_echo_n "checking for proc mem file... " >&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; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 @@ -10229,170 +12231,172 @@ close(fd); return v1 != v2; } - -EOF -if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""$proc_mem_file" 1>&6 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5 +$as_echo "$proc_mem_file" >&6; } + +else + proc_mem_file="" - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - + if test -n "$proc_mem_file"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PROC_MEM_FILE "$proc_mem_file" -EOF +_ACEOF fi - + fpm_trace_type="" if test "$have_ptrace" = "yes"; then fpm_trace_type=ptrace - + elif test -n "$proc_mem_file"; then fpm_trace_type=pread - + elif test "$have_mach_vm_read" = "yes" ; then fpm_trace_type=mach - + else - echo "configure: warning: FPM Trace - ptrace, pread, or mach: could not be found" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5 +$as_echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;} fi - - - echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6 -echo "configure:10279: checking if gcc supports __sync_bool_compare_and_swap" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if gcc supports __sync_bool_compare_and_swap... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ int variable = 1; return (__sync_bool_compare_and_swap(&variable, 1, 2) && __sync_add_and_fetch(&variable, 1)) ? 1 : 0; - -; return 0; } -EOF -if { (eval echo configure:10292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_BUILTIN_ATOMIC 1 -EOF - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + - have_lq=no - echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6 -echo "configure:10315: checking for TCP_INFO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5 +$as_echo_n "checking for TCP_INFO... " >&6; } - cat > conftest.$ac_ext < -int main() { + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ struct tcp_info ti; int x = TCP_INFO; -; return 0; } -EOF -if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + have_lq=tcp_info - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$have_lq" = "tcp_info"; then - cat >> confdefs.h <<\EOF -#define HAVE_LQ_TCP_INFO 1 -EOF + +$as_echo "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h fi if test "$have_lq" = "no" ; then - echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6 -echo "configure:10350: checking for SO_LISTENQLEN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5 +$as_echo_n "checking for SO_LISTENQLEN... " >&6; } - cat > conftest.$ac_ext < -int main() { + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +int +main () +{ int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN; -; return 0; } -EOF -if { (eval echo configure:10360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + have_lq=so_listenq - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$have_lq" = "tcp_info"; then - cat >> confdefs.h <<\EOF -#define HAVE_LQ_SO_LISTENQ 1 -EOF + +$as_echo "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h fi fi - + php_with_fpm_user=nobody -# Check whether --with-fpm-user or --without-fpm-user was given. -if test "${with_fpm_user+set}" = set; then - withval="$with_fpm_user" - PHP_FPM_USER=$withval + +# Check whether --with-fpm-user was given. +if test "${with_fpm_user+set}" = set; then : + withval=$with_fpm_user; PHP_FPM_USER=$withval else - + PHP_FPM_USER=nobody - + fi @@ -10403,18 +12407,18 @@ - + php_with_fpm_group=nobody -# Check whether --with-fpm-group or --without-fpm-group was given. -if test "${with_fpm_group+set}" = set; then - withval="$with_fpm_group" - PHP_FPM_GROUP=$withval + +# Check whether --with-fpm-group was given. +if test "${with_fpm_group+set}" = set; then : + withval=$with_fpm_group; PHP_FPM_GROUP=$withval else - + PHP_FPM_GROUP=nobody - + fi @@ -10437,53 +12441,55 @@ php_fpm_group="$PHP_FPM_GROUP" fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_user" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_group" - + php_fpm_sysconfdir=`eval echo $sysconfdir` - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_sysconfdir" - + php_fpm_localstatedir=`eval echo $localstatedir` - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_localstatedir" - + php_fpm_prefix=`eval echo $prefix` - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_prefix" - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_FPM_USER "$php_fpm_user" -EOF +_ACEOF + - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_FPM_GROUP "$php_fpm_group" -EOF +_ACEOF + - PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8" - + src=$abs_srcdir/sapi/fpm/Makefile.frag ac_srcdir=$abs_srcdir/sapi/fpm ac_builddir=sapi/fpm @@ -10491,16 +12497,16 @@ SAPI_FPM_PATH=sapi/fpm/php-fpm - + PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH" - + if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" fi - + PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" - + INSTALL_IT=":" PHP_FPM_FILES="fpm/fastcgi.c \ fpm/fpm.c \ @@ -10526,23 +12532,23 @@ fpm/zlog.c \ " - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=fpm - + case "program" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10570,8 +12576,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10598,7 +12604,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -10607,8 +12613,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10636,7 +12642,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET='$(SAPI_FPM_PATH)' php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10662,16 +12668,16 @@ php_build_target=program ;; esac - - - + + + case sapi/fpm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/fpm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/fpm/"; ac_bdir="sapi/fpm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -10684,12 +12690,12 @@ old_IFS=$IFS for ac_src in $PHP_FPM_FILES $PHP_FPM_TRACE_FILES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -10720,33 +12726,35 @@ ;; esac - + PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_FPM" else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi php_with_isapi=no -echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 -echo "configure:10736: checking for Zeus ISAPI support" >&5 -# Check whether --with-isapi or --without-isapi was given. -if test "${with_isapi+set}" = set; then - withval="$with_isapi" - PHP_ISAPI=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Zeus ISAPI support" >&5 +$as_echo_n "checking for Zeus ISAPI support... " >&6; } + +# Check whether --with-isapi was given. +if test "${with_isapi+set}" = set; then : + withval=$with_isapi; PHP_ISAPI=$withval else - + PHP_ISAPI=no - + fi ext_output=$PHP_ISAPI -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -10757,65 +12765,64 @@ else ZEUSPATH=$PHP_ISAPI fi - test -f "$ZEUSPATH/web/include/httpext.h" || { echo "configure: error: Unable to find httpext.h in $ZEUSPATH/web/include" 1>&2; exit 1; } - + 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 - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define WITH_ZEUS 1 -EOF - +$as_echo "#define WITH_ZEUS 1" >>confdefs.h + + if test "$ZEUSPATH/web/include" != "/usr/include"; then - + if test -z "$ZEUSPATH/web/include" || echo "$ZEUSPATH/web/include" | grep '^/' >/dev/null ; then ai_p=$ZEUSPATH/web/include else - + ep_dir="`echo $ZEUSPATH/web/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ZEUSPATH/web/include\"`" 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 - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=isapi - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10843,8 +12850,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10871,7 +12878,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -10880,8 +12887,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10909,7 +12916,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -10935,16 +12942,16 @@ php_build_target=program ;; esac - - - + + + case sapi/isapi in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/isapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/isapi/"; ac_bdir="sapi/isapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -10957,12 +12964,12 @@ old_IFS=$IFS for ac_src in php5isapi.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -10985,19 +12992,19 @@ -echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6 -echo "configure:10990: checking for LiteSpeed support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5 +$as_echo_n "checking for LiteSpeed support... " >&6; } php_with_litespeed=no -# Check whether --with-litespeed or --without-litespeed was given. -if test "${with_litespeed+set}" = set; then - withval="$with_litespeed" - PHP_LITESPEED=$withval + +# Check whether --with-litespeed was given. +if test "${with_litespeed+set}" = set; then : + withval=$with_litespeed; PHP_LITESPEED=$withval else - + PHP_LITESPEED=no test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL @@ -11032,33 +13039,33 @@ if test "$PHP_LITESPEED" != "no"; then - + src=$abs_srcdir/sapi/litespeed/Makefile.frag ac_srcdir=$abs_srcdir/sapi/litespeed ac_builddir=sapi/litespeed test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments SAPI_LITESPEED_PATH=sapi/litespeed/php - + PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=litespeed - + case "program" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11086,8 +13093,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11114,7 +13121,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -11123,8 +13130,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11152,7 +13159,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET='$(SAPI_LITESPEED_PATH)' php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11178,16 +13185,16 @@ php_build_target=program ;; esac - - - + + + case sapi/litespeed in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/litespeed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/litespeed/"; ac_bdir="sapi/litespeed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -11200,12 +13207,12 @@ old_IFS=$IFS for ac_src in lsapi_main.c lsapilib.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -11222,7 +13229,7 @@ done - + INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp" case $host_alias in *darwin*) @@ -11237,33 +13244,35 @@ ;; esac - + PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_LITESPEED" fi -echo "$ac_t""$PHP_LITESPEED" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5 +$as_echo "$PHP_LITESPEED" >&6; } php_with_milter=no -echo $ac_n "checking for Milter support""... $ac_c" 1>&6 -echo "configure:11253: checking for Milter support" >&5 -# Check whether --with-milter or --without-milter was given. -if test "${with_milter+set}" = set; then - withval="$with_milter" - PHP_MILTER=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Milter support" >&5 +$as_echo_n "checking for Milter support... " >&6; } + +# Check whether --with-milter was given. +if test "${with_milter+set}" = set; then : + withval=$with_milter; PHP_MILTER=$withval else - + PHP_MILTER=no - + fi ext_output=$PHP_MILTER -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -11276,43 +13285,43 @@ if test -f /usr/lib/libmilter/libmilter.a ; then MILTERPATH=/usr/lib/libmilter else - { echo "configure: error: Unable to find libmilter.a" 1>&2; exit 1; } + as_fn_error $? "Unable to find libmilter.a" "$LINENO" 5 fi fi else MILTERPATH=$PHP_MILTER fi - + SAPI_MILTER_PATH=sapi/milter/php-milter - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - + src=$abs_srcdir/sapi/milter/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=milter - + case "program" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11340,8 +13349,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11368,7 +13377,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -11377,8 +13386,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11406,7 +13415,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET='$(SAPI_MILTER_PATH)' php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11432,16 +13441,16 @@ php_build_target=program ;; esac - - - + + + case sapi/milter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/milter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/milter/"; ac_bdir="sapi/milter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -11454,12 +13463,12 @@ old_IFS=$IFS for ac_src in php_milter.c getopt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -11476,50 +13485,50 @@ done - - + + if test -n "$MILTERPATH"; then - + if test "$MILTERPATH" != "/usr/$PHP_LIBDIR" && test "$MILTERPATH" != "/usr/lib"; then - + if test -z "$MILTERPATH" || echo "$MILTERPATH" | grep '^/' >/dev/null ; then ai_p=$MILTERPATH else - + ep_dir="`echo $MILTERPATH|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MILTERPATH\"`" 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 milter in c|c_r|pthread*) ;; - *) - LIBS="-lmilter $LIBS" + *) + LIBS="-lmilter $LIBS" ;; esac @@ -11528,10 +13537,10 @@ BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter" - + PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_MILTER_PATH" - + PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_MILTER" fi @@ -11540,158 +13549,107 @@ php_with_nsapi=no -echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 -echo "configure:11545: checking for NSAPI support" >&5 -# Check whether --with-nsapi or --without-nsapi was given. -if test "${with_nsapi+set}" = set; then - withval="$with_nsapi" - PHP_NSAPI=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSAPI support" >&5 +$as_echo_n "checking for NSAPI support... " >&6; } + +# Check whether --with-nsapi was given. +if test "${with_nsapi+set}" = set; then : + withval=$with_nsapi; PHP_NSAPI=$withval else - + PHP_NSAPI=no - + fi ext_output=$PHP_NSAPI -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_NSAPI" != "no"; then if test ! -d $PHP_NSAPI/bin ; then - { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; } + as_fn_error $? "Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" "$LINENO" 5 fi - echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 -echo "configure:11569: checking for NSAPI include files" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSAPI include files" >&5 +$as_echo_n "checking for NSAPI include files... " >&6; } if test -d $PHP_NSAPI/include ; then NSAPI_INC_DIR="$PHP_NSAPI/include" - echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6 - for ac_hdr in $NSAPI_INC_DIR/nsapi.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11577: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape 3.x / Sun 7.x style" >&5 +$as_echo "Netscape 3.x / Sun 7.x style" >&6; } + for ac_header in $NSAPI_INC_DIR/nsapi.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done NSAPI_INCLUDE="-I$NSAPI_INC_DIR" fi if test -d $PHP_NSAPI/plugins/include ; then NSAPI_INC_DIR="$PHP_NSAPI/plugins/include" - echo "$ac_t""iPlanet 4.x / Sun 6.x style" 1>&6 - for ac_hdr in $NSAPI_INC_DIR/nsapi.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11622: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: iPlanet 4.x / Sun 6.x style" >&5 +$as_echo "iPlanet 4.x / Sun 6.x style" >&6; } + for ac_header in $NSAPI_INC_DIR/nsapi.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR" fi if test -z "$NSAPI_INCLUDE"; then - { echo "configure: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" 1>&2; exit 1; } + as_fn_error $? "Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" "$LINENO" 5 fi - + for ac_i in $NSAPI_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 @@ -11700,33 +13658,32 @@ esac done - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_NSAPI 1 -EOF - +$as_echo "#define HAVE_NSAPI 1" >>confdefs.h + + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=nsapi - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11754,8 +13711,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11782,7 +13739,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -11791,8 +13748,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11820,7 +13777,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -11846,16 +13803,16 @@ php_build_target=program ;; esac - - - + + + case sapi/nsapi in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/nsapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/nsapi/"; ac_bdir="sapi/nsapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -11868,12 +13825,12 @@ old_IFS=$IFS for ac_src in nsapi.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -11900,88 +13857,88 @@ php_with_phttpd=no -echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 -echo "configure:11905: checking for PHTTPD support" >&5 -# Check whether --with-phttpd or --without-phttpd was given. -if test "${with_phttpd+set}" = set; then - withval="$with_phttpd" - PHP_PHTTPD=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHTTPD support" >&5 +$as_echo_n "checking for PHTTPD support... " >&6; } + +# Check whether --with-phttpd was given. +if test "${with_phttpd+set}" = set; then : + withval=$with_phttpd; PHP_PHTTPD=$withval else - + PHP_PHTTPD=no - + fi ext_output=$PHP_PHTTPD -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_PHTTPD" != "no"; then if test ! -d $PHP_PHTTPD ; then - { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } + as_fn_error $? "You did not specify a directory" "$LINENO" 5 fi - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - + if test "$PHP_PHTTPD/include" != "/usr/include"; then - + if test -z "$PHP_PHTTPD/include" || echo "$PHP_PHTTPD/include" | grep '^/' >/dev/null ; then ai_p=$PHP_PHTTPD/include else - + ep_dir="`echo $PHP_PHTTPD/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_PHTTPD/include\"`" 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 - cat >> confdefs.h <<\EOF -#define HAVE_PHTTPD 1 -EOF - +$as_echo "#define HAVE_PHTTPD 1" >>confdefs.h + + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=phttpd - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12009,8 +13966,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12037,7 +13994,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -12046,8 +14003,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12075,7 +14032,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12101,16 +14058,16 @@ php_build_target=program ;; esac - - - + + + case sapi/phttpd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/phttpd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/phttpd/"; ac_bdir="sapi/phttpd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -12123,12 +14080,12 @@ old_IFS=$IFS for ac_src in phttpd.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -12154,22 +14111,23 @@ php_with_pi3web=no -echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 -echo "configure:12159: checking for Pi3Web support" >&5 -# Check whether --with-pi3web or --without-pi3web was given. -if test "${with_pi3web+set}" = set; then - withval="$with_pi3web" - PHP_PI3WEB=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pi3Web support" >&5 +$as_echo_n "checking for Pi3Web support... " >&6; } + +# Check whether --with-pi3web was given. +if test "${with_pi3web+set}" = set; then : + withval=$with_pi3web; PHP_PI3WEB=$withval else - + PHP_PI3WEB=no - + fi ext_output=$PHP_PI3WEB -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -12180,158 +14138,157 @@ else PI3PATH=$PHP_PI3WEB fi - test -f "$PI3PATH/PiAPI/PiAPI.h" || { echo "configure: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" 1>&2; exit 1; } - + 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 - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define WITH_PI3WEB 1 -EOF - +$as_echo "#define WITH_PI3WEB 1" >>confdefs.h + + if test "$PI3PATH/PiAPI" != "/usr/include"; then - + if test -z "$PI3PATH/PiAPI" || echo "$PI3PATH/PiAPI" | grep '^/' >/dev/null ; then ai_p=$PI3PATH/PiAPI else - + ep_dir="`echo $PI3PATH/PiAPI|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PI3PATH/PiAPI\"`" 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 - + if test "$PI3PATH/Pi2API" != "/usr/include"; then - + if test -z "$PI3PATH/Pi2API" || echo "$PI3PATH/Pi2API" | grep '^/' >/dev/null ; then ai_p=$PI3PATH/Pi2API else - + ep_dir="`echo $PI3PATH/Pi2API|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PI3PATH/Pi2API\"`" 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 - + if test "$PI3PATH/Pi3API" != "/usr/include"; then - + if test -z "$PI3PATH/Pi3API" || echo "$PI3PATH/Pi3API" | grep '^/' >/dev/null ; then ai_p=$PI3PATH/Pi3API else - + ep_dir="`echo $PI3PATH/Pi3API|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PI3PATH/Pi3API\"`" 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 - + if test "$PI3PATH/PHP5" != "/usr/include"; then - + if test -z "$PI3PATH/PHP5" || echo "$PI3PATH/PHP5" | grep '^/' >/dev/null ; then ai_p=$PI3PATH/PHP5 else - + ep_dir="`echo $PI3PATH/PHP5|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PI3PATH/PHP5\"`" 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 - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=pi3web - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12359,8 +14316,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12387,7 +14344,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -12396,8 +14353,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12425,7 +14382,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12451,16 +14408,16 @@ php_build_target=program ;; esac - - - + + + case sapi/pi3web in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/pi3web"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/pi3web/"; ac_bdir="sapi/pi3web/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -12473,12 +14430,12 @@ old_IFS=$IFS for ac_src in pi3web_sapi.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -12505,14 +14462,14 @@ php_with_roxen=no -# Check whether --with-roxen or --without-roxen was given. -if test "${with_roxen+set}" = set; then - withval="$with_roxen" - PHP_ROXEN=$withval + +# Check whether --with-roxen was given. +if test "${with_roxen+set}" = set; then : + withval=$with_roxen; PHP_ROXEN=$withval else - + PHP_ROXEN=no - + fi @@ -12526,103 +14483,102 @@ php_enable_roxen_zts=no -echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6 -echo "configure:12531: checking whether Roxen module is build using ZTS" >&5 -# Check whether --enable-roxen-zts or --disable-roxen-zts was given. -if test "${enable_roxen_zts+set}" = set; then - enableval="$enable_roxen_zts" - PHP_ROXEN_ZTS=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Roxen module is build using ZTS" >&5 +$as_echo_n "checking whether Roxen module is build using ZTS... " >&6; } +# Check whether --enable-roxen-zts was given. +if test "${enable_roxen_zts+set}" = set; then : + enableval=$enable_roxen_zts; PHP_ROXEN_ZTS=$enableval else - + PHP_ROXEN_ZTS=no - + fi ext_output=$PHP_ROXEN_ZTS -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } RESULT= -echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 -echo "configure:12552: checking for Roxen/Pike support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Roxen/Pike support" >&5 +$as_echo_n "checking for Roxen/Pike support... " >&6; } if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then - { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } + 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 - { echo "configure: error: Could not find a pike in $PHP_ROXEN/bin/" 1>&2; exit 1; } + 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 - { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; } + as_fn_error $? "Failed to figure out Pike module and include directories" "$LINENO" 5 fi else - { echo "configure: error: Roxen/PHP requires Pike 0.7.79 or newer" 1>&2; exit 1; } + as_fn_error $? "Roxen/PHP requires Pike 0.7.79 or newer" "$LINENO" 5 fi - - + + if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then - + if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then ai_p=$PIKE_INCLUDE_DIR else - + ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`" 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 - cat >> confdefs.h <<\EOF -#define HAVE_ROXEN 1 -EOF - +$as_echo "#define HAVE_ROXEN 1" >>confdefs.h + + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=roxen - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12650,8 +14606,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12678,7 +14634,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -12687,8 +14643,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12716,7 +14672,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12742,16 +14698,16 @@ php_build_target=program ;; esac - - - + + + case sapi/roxen in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/roxen"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/roxen/"; ac_bdir="sapi/roxen/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -12764,12 +14720,12 @@ old_IFS=$IFS for ac_src in roxen.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -12795,19 +14751,19 @@ PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR " if test "$PHP_ROXEN_ZTS" != "no"; then - + enable_maintainer_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define ROXEN_USE_ZTS 1 -EOF + +$as_echo "#define ROXEN_USE_ZTS 1" >>confdefs.h fi fi -echo "$ac_t""$RESULT" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESULT" >&5 +$as_echo "$RESULT" >&6; } @@ -12815,14 +14771,14 @@ php_with_thttpd=no -# Check whether --with-thttpd or --without-thttpd was given. -if test "${with_thttpd+set}" = set; then - withval="$with_thttpd" - PHP_THTTPD=$withval + +# Check whether --with-thttpd was given. +if test "${with_thttpd+set}" = set; then : + withval=$with_thttpd; PHP_THTTPD=$withval else - + PHP_THTTPD=no - + fi @@ -12833,26 +14789,27 @@ -echo $ac_n "checking for thttpd""... $ac_c" 1>&6 -echo "configure:12838: checking for thttpd" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thttpd" >&5 +$as_echo_n "checking for thttpd... " >&6; } if test "$PHP_THTTPD" != "no"; then if test ! -d $PHP_THTTPD; then - echo "$ac_t""thttpd directory does not exist ($PHP_THTTPD)" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: thttpd directory does not exist ($PHP_THTTPD)" >&5 +$as_echo "thttpd directory does not exist ($PHP_THTTPD)" >&6; } fi - + if test -z "$PHP_THTTPD" || echo "$PHP_THTTPD" | grep '^/' >/dev/null ; then THTTPD=$PHP_THTTPD else - + ep_dir="`echo $PHP_THTTPD|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" THTTPD="$ep_realdir/`basename \"$PHP_THTTPD\"`" fi - + if grep thttpd.2.21b $PHP_THTTPD/version.h >/dev/null; then patch="test -f $THTTPD/php_patched || \ (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)" @@ -12860,18 +14817,18 @@ elif grep Premium $PHP_THTTPD/version.h >/dev/null; then patch= else - { echo "configure: error: This version only supports thttpd-2.21b and Premium thttpd" 1>&2; exit 1; } + as_fn_error $? "This version only supports thttpd-2.21b and Premium thttpd" "$LINENO" 5 fi - + if test -n "$GCC"; then - + gcc_arg_name=ac_cv_gcc_arg_rdynamic - echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:12871: checking whether $CC supports -rdynamic" >&5 -if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5 +$as_echo_n "checking whether $CC supports -rdynamic... " >&6; } +if ${ac_cv_gcc_arg_rdynamic+:} false; then : + $as_echo_n "(cached) " >&6 else - + echo 'void somefunc() { };' > conftest.c cmd='$CC -rdynamic -c conftest.c' if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then @@ -12881,15 +14838,15 @@ fi eval $gcc_arg_name=$ac_result rm -f conftest.* - -fi -echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5 +$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; } if eval test "\$$gcc_arg_name" = "yes"; then gcc_rdynamic=yes else : - + fi if test "$gcc_rdynamic" = "yes"; then @@ -12906,54 +14863,54 @@ \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\ $patch" PHP_THTTPD="yes, using $THTTPD" - + if test "$THTTPD" != "/usr/include"; then - + if test -z "$THTTPD" || echo "$THTTPD" | grep '^/' >/dev/null ; then ai_p=$THTTPD else - + ep_dir="`echo $THTTPD|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THTTPD\"`" 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 - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=thttpd - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -12981,8 +14938,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13009,7 +14966,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -13018,8 +14975,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13047,7 +15004,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13073,25 +15030,26 @@ php_build_target=program ;; esac - - + + fi -echo "$ac_t""$PHP_THTTPD" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_THTTPD" >&5 +$as_echo "$PHP_THTTPD" >&6; } php_with_tux=no -# Check whether --with-tux or --without-tux was given. -if test "${with_tux+set}" = set; then - withval="$with_tux" - PHP_TUX=$withval + +# Check whether --with-tux was given. +if test "${with_tux+set}" = set; then : + withval=$with_tux; PHP_TUX=$withval else - + PHP_TUX=no - + fi @@ -13102,68 +15060,41 @@ -echo $ac_n "checking for TUX""... $ac_c" 1>&6 -echo "configure:13107: checking for TUX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TUX" >&5 +$as_echo_n "checking for TUX... " >&6; } if test "$PHP_TUX" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" - for ac_hdr in tuxmodule.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13114: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define HAVE_TUXMODULE_H 1 +_ACEOF : else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: Cannot find tuxmodule.h" 1>&2; exit 1; } + as_fn_error $? "Cannot find tuxmodule.h" "$LINENO" 5 fi + done - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=tux - + case "shared" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13191,8 +15122,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13219,7 +15150,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -13228,8 +15159,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13257,7 +15188,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13283,16 +15214,16 @@ php_build_target=program ;; esac - - - + + + case sapi/tux in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/tux"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/tux/"; ac_bdir="sapi/tux/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -13305,12 +15236,12 @@ old_IFS=$IFS for ac_src in php_tux.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -13328,9 +15259,11 @@ - echo "$ac_t""$PHP_TUX" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_TUX" >&5 +$as_echo "$PHP_TUX" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13338,14 +15271,14 @@ php_with_webjames=no -# Check whether --with-webjames or --without-webjames was given. -if test "${with_webjames+set}" = set; then - withval="$with_webjames" - PHP_WEBJAMES=$withval + +# Check whether --with-webjames was given. +if test "${with_webjames+set}" = set; then : + withval=$with_webjames; PHP_WEBJAMES=$withval else - + PHP_WEBJAMES=no - + fi @@ -13356,17 +15289,17 @@ -echo $ac_n "checking for webjames""... $ac_c" 1>&6 -echo "configure:13361: checking for webjames" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for webjames" >&5 +$as_echo_n "checking for webjames... " >&6; } if test "$PHP_WEBJAMES" != "no"; then - + if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then PHP_WEBJAMES=$PHP_WEBJAMES else - + ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" PHP_WEBJAMES="$ep_realdir/`basename \"$PHP_WEBJAMES\"`" fi @@ -13375,54 +15308,54 @@ echo 'PHP_LIBS = -l$abs_srcdir/$SAPI_STATIC \$(PHP_LIBS) \$(EXTRA_LIBS)' > $PHP_WEBJAMES/build/php; \ echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $PHP_WEBJAMES/build/php; \ echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $PHP_WEBJAMES/build/php;" - + if test "$PHP_WEBJAMES" != "/usr/include"; then - + if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then ai_p=$PHP_WEBJAMES else - + ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_WEBJAMES\"`" 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 - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=webjames - + case "static" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13450,8 +15383,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13478,7 +15411,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -13487,8 +15420,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13516,7 +15449,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13542,16 +15475,16 @@ php_build_target=program ;; esac - - - + + + case sapi/webjames in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/webjames"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/webjames/"; ac_bdir="sapi/webjames/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -13564,12 +15497,12 @@ old_IFS=$IFS for ac_src in webjames.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -13587,9 +15520,11 @@ - echo "$ac_t""yes, using $PHP_WEBJAMES" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using $PHP_WEBJAMES" >&5 +$as_echo "yes, using $PHP_WEBJAMES" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -13597,14 +15532,13 @@ php_enable_cgi=yes -# Check whether --enable-cgi or --disable-cgi was given. -if test "${enable_cgi+set}" = set; then - enableval="$enable_cgi" - PHP_CGI=$enableval +# Check whether --enable-cgi was given. +if test "${enable_cgi+set}" = set; then : + enableval=$enable_cgi; PHP_CGI=$enableval else - + PHP_CGI=yes - + fi @@ -13616,71 +15550,71 @@ if test "$PHP_SAPI" = "default"; then - echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6 -echo "configure:13621: checking whether to build CGI binary" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build CGI binary" >&5 +$as_echo_n "checking whether to build CGI binary... " >&6; } if test "$PHP_CGI" != "no"; then - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 -echo "configure:13626: checking for socklen_t in sys/socket.h" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for socklen_t in sys/socket.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "socklen_t" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_SOCKLEN_T 1 -EOF + $EGREP "socklen_t" >/dev/null 2>&1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h else - rm -rf conftest* - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f conftest* - echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6 -echo "configure:13648: checking for sun_len in sys/un.h" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for sun_len in sys/un.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "sun_len" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_SOCKADDR_UN_SUN_LEN 1 -EOF + $EGREP "sun_len" >/dev/null 2>&1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h else - rm -rf conftest* - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f conftest* - echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6 -echo "configure:13670: checking whether cross-process locking is required by accept()" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5 +$as_echo_n "checking whether cross-process locking is required by accept()... " >&6; } case "`uname -sr`" in - IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define USE_LOCKING 1 -EOF + IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define USE_LOCKING 1" >>confdefs.h ;; *) - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac - + src=$abs_srcdir/sapi/cgi/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -13695,28 +15629,28 @@ SAPI_CGI_PATH=sapi/cgi/php-cgi ;; esac - + PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" - + if test "$PHP_SAPI" != "default"; then -{ echo "configure: error: +as_fn_error $? " +--------------------------------------------------------------------+ | *** ATTENTION *** | | | | You've configured multiple SAPIs to be build. You can build only | | one SAPI module and CLI binary at the same time. | +--------------------------------------------------------------------+ -" 1>&2; exit 1; } +" "$LINENO" 5 fi PHP_SAPI=cgi - + case "program" in - static) - + static) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13744,8 +15678,8 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=static ;; - shared) - + shared) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13772,7 +15706,7 @@ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la php_build_target=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -13781,8 +15715,8 @@ php_cxx_post=$shared_cxx_post php_lo=$shared_lo ;; - bundle) - + bundle) + OVERALL_TARGET=php php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13810,7 +15744,7 @@ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle php_build_target=static ;; - program) + program) OVERALL_TARGET='$(SAPI_CGI_PATH)' php_c_pre='$(LIBTOOL) --mode=compile $(CC)' php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' @@ -13836,18 +15770,18 @@ php_build_target=program ;; esac - - - + + + case sapi/cgi in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/cgi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/cgi/"; ac_bdir="sapi/cgi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - - b_c_pre=$php_c_pre + + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre b_c_meta=$php_c_meta b_cxx_meta=$php_cxx_meta @@ -13858,12 +15792,12 @@ old_IFS=$IFS for ac_src in cgi_main.c fastcgi.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -13894,27 +15828,29 @@ ;; esac - + PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CGI" elif test "$PHP_CLI" != "no"; then - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } OVERALL_TARGET= - PHP_SAPI=cli + PHP_SAPI=cli else - { echo "configure: error: No SAPIs selected." 1>&2; exit 1; } + as_fn_error $? "No SAPIs selected." "$LINENO" 5 fi fi -echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 -echo "configure:13914: checking for chosen SAPI module" >&5 -echo "$ac_t""$PHP_SAPI" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5 +$as_echo_n "checking for chosen SAPI module... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5 +$as_echo "$PHP_SAPI" >&6; } if test "$enable_maintainer_zts" = "yes"; then - + if test -n "$ac_cv_pthreads_lib"; then LIBS="$LIBS -l$ac_cv_pthreads_lib" fi @@ -13923,12 +15859,12 @@ CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" fi - + if test -z "$host_alias" && test -n "$host"; then host_alias=$host fi if test -z "$host_alias"; then - { echo "configure: error: host_alias is not set. Make sure to run config.guess" 1>&2; exit 1; } + as_fn_error $? "host_alias is not set. Make sure to run config.guess" "$LINENO" 5 fi case $host_alias in *solaris*) @@ -13957,114 +15893,115 @@ - - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Running system checks${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5 +$as_echo "${T_MD}Running system checks${T_ME}" >&6; } PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13971: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PROG_SENDMAIL+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$PROG_SENDMAIL" in - /*) + case $PROG_SENDMAIL in + [\\/]* | ?:[\\/]*) ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:$PHP_ALT_PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PROG_SENDMAIL="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:$PHP_ALT_PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + ;; esac fi -PROG_SENDMAIL="$ac_cv_path_PROG_SENDMAIL" +PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL if test -n "$PROG_SENDMAIL"; then - echo "$ac_t""$PROG_SENDMAIL" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5 +$as_echo "$PROG_SENDMAIL" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PROG_SENDMAIL" - echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 -echo "configure:14010: checking whether system uses EBCDIC" >&5 -if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5 +$as_echo_n "checking whether system uses EBCDIC... " >&6; } +if ${ac_cv_ebcdic+:} false; then : + $as_echo_n "(cached) " >&6 else - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + ac_cv_ebcdic=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +int main(void) { + return (unsigned char)'A' != (unsigned char)0xC1; +} -int main(void) { - return (unsigned char)'A' != (unsigned char)0xC1; -} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -EOF -if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_ebcdic=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_ebcdic=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_ebcdic" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5 +$as_echo "$ac_cv_ebcdic" >&6; } if test "$ac_cv_ebcdic" = "yes"; then - cat >> confdefs.h <<\EOF -#define CHARSET_EBCDIC 1 -EOF + +$as_echo "#define CHARSET_EBCDIC 1" >>confdefs.h fi -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:14057: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian_php+:} false; then : + $as_echo_n "(cached) " >&6 else - + ac_cv_c_bigendian_php=unknown - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_bigendian_php=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ int main(void) { @@ -14077,47 +16014,42 @@ return(1); } } - -EOF -if { (eval echo configure:14083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian_php=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_c_bigendian_php=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5 +$as_echo "$ac_cv_c_bigendian_php" >&6; } if test $ac_cv_c_bigendian_php = yes; then - cat >> confdefs.h <<\EOF -#define WORDS_BIGENDIAN -EOF + +$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h fi - echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 -echo "configure:14109: checking whether writing to stdout works" >&5 -if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - if test "$cross_compiling" = yes; then - + { $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 ${ac_cv_write_stdout+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test "$cross_compiling" = yes; then : + ac_cv_write_stdout=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #ifdef HAVE_UNISTD_H #include @@ -14132,32 +16064,28 @@ n = write(1, TEXT, sizeof(TEXT)-1); return (!(n == sizeof(TEXT)-1)); } - -EOF -if { (eval echo configure:14138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_write_stdout=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_write_stdout=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$ac_cv_write_stdout" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5 +$as_echo "$ac_cv_write_stdout" >&6; } if test "$ac_cv_write_stdout" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_WRITE_STDOUT 1 -EOF + +$as_echo "#define PHP_WRITE_STDOUT 1" >>confdefs.h fi @@ -14166,37 +16094,37 @@ CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -test -d /usr/ucblib && +test -d /usr/ucblib && if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then - + if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then ai_p=/usr/ucblib else - + ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"/usr/ucblib\"`" 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 @@ -14207,1542 +16135,1008 @@ unset ac_cv_func_socket unset ac_cv_func___socket unset found - - echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:14213: checking for socket" >&5 -if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_socket) || defined (__stub___socket) -choke me -#else -socket(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_socket=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_socket=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" +if test "x$ac_cv_func_socket" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __socket""... $ac_c" 1>&6 -echo "configure:14259: checking for __socket" >&5 -if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __socket(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___socket) || defined (__stub_____socket) -choke me -#else -__socket(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___socket=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___socket=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__socket`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket" +if test "x$ac_cv_func___socket" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_SOCKET 1 -EOF + yes) + +$as_echo "#define HAVE_SOCKET 1" >>confdefs.h ac_cv_func_socket=yes ;; - - *) - + + *) + unset ac_cv_lib_socket_socket unset ac_cv_lib_socket___socket unset found - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:14325: checking for socket in -lsocket" >&5 -ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if ${ac_cv_lib_socket_socket+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socket (); +int +main () +{ +return socket (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_socket=yes +else + ac_cv_lib_socket_socket=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 -echo "configure:14364: checking for __socket in -lsocket" >&5 -ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5 +$as_echo_n "checking for __socket in -lsocket... " >&6; } +if ${ac_cv_lib_socket___socket+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __socket (); +int +main () +{ +return __socket (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___socket=yes +else + ac_cv_lib_socket___socket=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5 +$as_echo "$ac_cv_lib_socket___socket" >&6; } +if test "x$ac_cv_lib_socket___socket" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:14419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_SOCKET 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_SOCKET 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_socket=yes else - + : fi - + ;; - + esac unset ac_cv_func_socketpair unset ac_cv_func___socketpair unset found - - echo $ac_n "checking for socketpair""... $ac_c" 1>&6 -echo "configure:14470: checking for socketpair" >&5 -if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socketpair(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_socketpair) || defined (__stub___socketpair) -choke me -#else -socketpair(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_socketpair=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_socketpair=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" +if test "x$ac_cv_func_socketpair" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 -echo "configure:14516: checking for __socketpair" >&5 -if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __socketpair(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___socketpair) || defined (__stub_____socketpair) -choke me -#else -__socketpair(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___socketpair=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___socketpair=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__socketpair`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair" +if test "x$ac_cv_func___socketpair" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_SOCKETPAIR 1 -EOF + yes) + +$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h ac_cv_func_socketpair=yes ;; - - *) - + + *) + unset ac_cv_lib_socket_socketpair unset ac_cv_lib_socket___socketpair unset found - echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:14582: checking for socketpair in -lsocket" >&5 -ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5 +$as_echo_n "checking for socketpair in -lsocket... " >&6; } +if ${ac_cv_lib_socket_socketpair+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socketpair (); +int +main () +{ +return socketpair (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_socketpair=yes +else + ac_cv_lib_socket_socketpair=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5 +$as_echo "$ac_cv_lib_socket_socketpair" >&6; } +if test "x$ac_cv_lib_socket_socketpair" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:14621: checking for __socketpair in -lsocket" >&5 -ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5 +$as_echo_n "checking for __socketpair in -lsocket... " >&6; } +if ${ac_cv_lib_socket___socketpair+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __socketpair (); +int +main () +{ +return __socketpair (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___socketpair=yes +else + ac_cv_lib_socket___socketpair=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5 +$as_echo "$ac_cv_lib_socket___socketpair" >&6; } +if test "x$ac_cv_lib_socket___socketpair" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:14676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_SOCKETPAIR 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_socketpair=yes else - + : fi - + ;; - + esac unset ac_cv_func_htonl unset ac_cv_func___htonl unset found - - echo $ac_n "checking for htonl""... $ac_c" 1>&6 -echo "configure:14727: checking for htonl" >&5 -if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char htonl(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_htonl) || defined (__stub___htonl) -choke me -#else -htonl(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_htonl=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_htonl=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl" +if test "x$ac_cv_func_htonl" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __htonl""... $ac_c" 1>&6 -echo "configure:14773: checking for __htonl" >&5 -if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __htonl(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___htonl) || defined (__stub_____htonl) -choke me -#else -__htonl(); -#endif - -; return 0; } -EOF -if { (eval echo configure:14801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___htonl=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___htonl=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__htonl`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl" +if test "x$ac_cv_func___htonl" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_HTONL 1 -EOF + yes) + +$as_echo "#define HAVE_HTONL 1" >>confdefs.h ac_cv_func_htonl=yes ;; - - *) - + + *) + unset ac_cv_lib_socket_htonl unset ac_cv_lib_socket___htonl unset found - echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:14839: checking for htonl in -lsocket" >&5 -ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5 +$as_echo_n "checking for htonl in -lsocket... " >&6; } +if ${ac_cv_lib_socket_htonl+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char htonl (); +int +main () +{ +return htonl (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_htonl=yes +else + ac_cv_lib_socket_htonl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5 +$as_echo "$ac_cv_lib_socket_htonl" >&6; } +if test "x$ac_cv_lib_socket_htonl" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:14878: checking for __htonl in -lsocket" >&5 -ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5 +$as_echo_n "checking for __htonl in -lsocket... " >&6; } +if ${ac_cv_lib_socket___htonl+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __htonl (); +int +main () +{ +return __htonl (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___htonl=yes +else + ac_cv_lib_socket___htonl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5 +$as_echo "$ac_cv_lib_socket___htonl" >&6; } +if test "x$ac_cv_lib_socket___htonl" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:14933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_HTONL 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_HTONL 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_htonl=yes else - + : fi - + ;; - + esac unset ac_cv_func_gethostname unset ac_cv_func___gethostname unset found - - echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:14984: checking for gethostname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostname) || defined (__stub___gethostname) -choke me -#else -gethostname(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostname=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" +if test "x$ac_cv_func_gethostname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -echo "configure:15030: checking for __gethostname" >&5 -if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __gethostname(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___gethostname) || defined (__stub_____gethostname) -choke me -#else -__gethostname(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___gethostname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___gethostname=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname" +if test "x$ac_cv_func___gethostname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_GETHOSTNAME 1 -EOF + yes) + +$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h ac_cv_func_gethostname=yes ;; - - *) - + + *) + unset ac_cv_lib_nsl_gethostname unset ac_cv_lib_nsl___gethostname unset found - echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15096: checking for gethostname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5 +$as_echo_n "checking for gethostname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostname (); +int +main () +{ +return gethostname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostname=yes +else + ac_cv_lib_nsl_gethostname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostname" >&6; } +if test "x$ac_cv_lib_nsl_gethostname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15135: checking for __gethostname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5 +$as_echo_n "checking for __gethostname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl___gethostname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __gethostname (); +int +main () +{ +return __gethostname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl___gethostname=yes +else + ac_cv_lib_nsl___gethostname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5 +$as_echo "$ac_cv_lib_nsl___gethostname" >&6; } +if test "x$ac_cv_lib_nsl___gethostname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lnsl" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:15190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case nsl in c|c_r|pthread*) ;; - *) - LIBS="-lnsl $LIBS" + *) + LIBS="-lnsl $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_GETHOSTNAME 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBNSL 1 -EOF +$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h ac_cv_func_gethostname=yes else - + : fi - + ;; - + esac unset ac_cv_func_gethostbyaddr unset ac_cv_func___gethostbyaddr unset found - - echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 -echo "configure:15241: checking for gethostbyaddr" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyaddr(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyaddr) || defined (__stub___gethostbyaddr) -choke me -#else -gethostbyaddr(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyaddr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyaddr=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr" +if test "x$ac_cv_func_gethostbyaddr" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 -echo "configure:15287: checking for __gethostbyaddr" >&5 -if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __gethostbyaddr(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___gethostbyaddr) || defined (__stub_____gethostbyaddr) -choke me -#else -__gethostbyaddr(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___gethostbyaddr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___gethostbyaddr=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__gethostbyaddr`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr" +if test "x$ac_cv_func___gethostbyaddr" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_GETHOSTBYADDR 1 -EOF + yes) + +$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h ac_cv_func_gethostbyaddr=yes ;; - - *) - + + *) + unset ac_cv_lib_nsl_gethostbyaddr unset ac_cv_lib_nsl___gethostbyaddr unset found - echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:15353: checking for gethostbyaddr in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5 +$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gethostbyaddr() -; return 0; } -EOF -if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyaddr (); +int +main () +{ +return gethostbyaddr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyaddr=yes +else + ac_cv_lib_nsl_gethostbyaddr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:15392: checking for __gethostbyaddr in -lnsl" >&5 -ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5 +$as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; } +if ${ac_cv_lib_nsl___gethostbyaddr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __gethostbyaddr (); +int +main () +{ +return __gethostbyaddr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl___gethostbyaddr=yes +else + ac_cv_lib_nsl___gethostbyaddr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5 +$as_echo "$ac_cv_lib_nsl___gethostbyaddr" >&6; } +if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lnsl" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:15447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case nsl in c|c_r|pthread*) ;; - *) - LIBS="-lnsl $LIBS" + *) + LIBS="-lnsl $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_GETHOSTBYADDR 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBNSL 1 -EOF +$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h ac_cv_func_gethostbyaddr=yes else - + : fi - + ;; - + esac unset ac_cv_func_yp_get_default_domain unset ac_cv_func___yp_get_default_domain unset found - - echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:15498: checking for yp_get_default_domain" >&5 -if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char yp_get_default_domain(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_yp_get_default_domain) || defined (__stub___yp_get_default_domain) -choke me -#else -yp_get_default_domain(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_yp_get_default_domain=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_yp_get_default_domain=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then - echo "$ac_t""yes" 1>&6 + 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" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:15544: checking for __yp_get_default_domain" >&5 -if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __yp_get_default_domain(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___yp_get_default_domain) || defined (__stub_____yp_get_default_domain) -choke me -#else -__yp_get_default_domain(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___yp_get_default_domain=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___yp_get_default_domain=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__yp_get_default_domain`\" = yes"; then - echo "$ac_t""yes" 1>&6 + 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" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_YP_GET_DEFAULT_DOMAIN 1 -EOF + yes) + +$as_echo "#define HAVE_YP_GET_DEFAULT_DOMAIN 1" >>confdefs.h ac_cv_func_yp_get_default_domain=yes ;; - - *) - + + *) + unset ac_cv_lib_nsl_yp_get_default_domain unset ac_cv_lib_nsl___yp_get_default_domain unset found - echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:15610: checking for yp_get_default_domain in -lnsl" >&5 -ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_nsl_yp_get_default_domain+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char yp_get_default_domain (); +int +main () +{ +return yp_get_default_domain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_yp_get_default_domain=yes +else + ac_cv_lib_nsl_yp_get_default_domain=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:15649: checking for __yp_get_default_domain in -lnsl" >&5 -ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_nsl___yp_get_default_domain+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __yp_get_default_domain (); +int +main () +{ +return __yp_get_default_domain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl___yp_get_default_domain=yes +else + ac_cv_lib_nsl___yp_get_default_domain=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lnsl" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:15704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case nsl in c|c_r|pthread*) ;; - *) - LIBS="-lnsl $LIBS" + *) + LIBS="-lnsl $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_YP_GET_DEFAULT_DOMAIN 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBNSL 1 -EOF +$as_echo "#define HAVE_YP_GET_DEFAULT_DOMAIN 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h ac_cv_func_yp_get_default_domain=yes else - + : fi - + ;; - + esac @@ -15750,310 +17144,218 @@ unset ac_cv_func_dlopen unset ac_cv_func___dlopen unset found - - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:15756: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -dlopen(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 -echo "configure:15802: checking for __dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __dlopen(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___dlopen) || defined (__stub_____dlopen) -choke me -#else -__dlopen(); -#endif - -; return 0; } -EOF -if { (eval echo configure:15830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen" +if test "x$ac_cv_func___dlopen" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_DLOPEN 1 -EOF + yes) + +$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h ac_cv_func_dlopen=yes ;; - - *) - + + *) + unset ac_cv_lib_dl_dlopen unset ac_cv_lib_dl___dlopen unset found - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15868: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15907: checking for __dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5 +$as_echo_n "checking for __dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl___dlopen+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dlopen (); +int +main () +{ +return __dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl___dlopen=yes +else + ac_cv_lib_dl___dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5 +$as_echo "$ac_cv_lib_dl___dlopen" >&6; } +if test "x$ac_cv_lib_dl___dlopen" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -ldl" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:15962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case dl in c|c_r|pthread*) ;; - *) - LIBS="-ldl $LIBS" + *) + LIBS="-ldl $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DLOPEN 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBDL 1 -EOF +$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBDL 1" >>confdefs.h ac_cv_func_dlopen=yes else - + : fi - + ;; - + esac if test "$ac_cv_func_dlopen" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBDL 1 -EOF + +$as_echo "#define HAVE_LIBDL 1" >>confdefs.h fi -echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:16014: checking for sin in -lm" >&5 -ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 +$as_echo_n "checking for sin in -lm... " >&6; } +if ${ac_cv_lib_m_sin+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 +$as_echo "$ac_cv_lib_m_sin" >&6; } +if test "x$ac_cv_lib_m_sin" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF LIBS="-lm $LIBS" -else - echo "$ac_t""no" 1>&6 fi @@ -16061,440 +17363,345 @@ unset ac_cv_func_inet_aton unset ac_cv_func___inet_aton unset found - - echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:16067: checking for inet_aton" >&5 -if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_aton(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_inet_aton) || defined (__stub___inet_aton) -choke me -#else -inet_aton(); -#endif - -; return 0; } -EOF -if { (eval echo configure:16095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_inet_aton=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_inet_aton=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" +if test "x$ac_cv_func_inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 -echo "configure:16113: checking for __inet_aton" >&5 -if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __inet_aton(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___inet_aton) || defined (__stub_____inet_aton) -choke me -#else -__inet_aton(); -#endif - -; return 0; } -EOF -if { (eval echo configure:16141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___inet_aton=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___inet_aton=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__inet_aton`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton" +if test "x$ac_cv_func___inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -EOF + yes) + +$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h ac_cv_func_inet_aton=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_inet_aton unset ac_cv_lib_resolv___inet_aton unset found - echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:16179: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_inet_aton+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -inet_aton() -; return 0; } -EOF -if { (eval echo configure:16198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inet_aton (); +int +main () +{ +return inet_aton (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_inet_aton=yes +else + ac_cv_lib_resolv_inet_aton=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 +$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } +if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:16218: checking for __inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___inet_aton+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -__inet_aton() -; return 0; } -EOF -if { (eval echo configure:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __inet_aton (); +int +main () +{ +return __inet_aton (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___inet_aton=yes +else + ac_cv_lib_resolv___inet_aton=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5 +$as_echo "$ac_cv_lib_resolv___inet_aton" >&6; } +if test "x$ac_cv_lib_resolv___inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:16273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_inet_aton=yes else - - + + unset ac_cv_lib_bind_inet_aton unset ac_cv_lib_bind___inet_aton unset found - echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:16315: checking for inet_aton in -lbind" >&5 -ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_inet_aton+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char inet_aton (); +int +main () +{ +return inet_aton (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_inet_aton=yes +else + ac_cv_lib_bind_inet_aton=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5 +$as_echo "$ac_cv_lib_bind_inet_aton" >&6; } +if test "x$ac_cv_lib_bind_inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:16354: checking for __inet_aton in -lbind" >&5 -ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___inet_aton+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __inet_aton (); +int +main () +{ +return __inet_aton (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___inet_aton=yes +else + ac_cv_lib_bind___inet_aton=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5 +$as_echo "$ac_cv_lib_bind___inet_aton" >&6; } +if test "x$ac_cv_lib_bind___inet_aton" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:16409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_inet_aton=yes else - + : fi - + fi - + ;; - + esac -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:16460: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -16503,16 +17710,15 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -16521,171 +17727,215 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -EOF -if { (eval echo configure:16540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:16568: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +if eval \${$as_ac_Header+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include <$ac_hdr> -int main() { -DIR *dirp = 0; -; return 0; } -EOF -if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" +else + eval "$as_ac_Header=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF + +ac_header_dirent=$ac_hdr; break fi + done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then -echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:16606: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldir $LIBS" -cat > conftest.$ac_ext <&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if ${ac_cv_search_opendir+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_opendir+:} false; then : + break +fi +done +if ${ac_cv_search_opendir+:} false; then : -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:16625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_search_opendir=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -ldir" -else - echo "$ac_t""no" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + fi else -echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:16647: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if ${ac_cv_search_opendir+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" -LIBS="-lx $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_opendir+:} false; then : + break fi -rm -f conftest* -LIBS="$ac_save_LIBS" +done +if ${ac_cv_search_opendir+:} false; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lx" else - echo "$ac_t""no" 1>&6 + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + fi fi -for ac_hdr in \ +for ac_header in \ inttypes.h \ stdint.h \ dirent.h \ @@ -16741,129 +17991,74 @@ dlfcn.h \ assert.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16748: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - - echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 -echo "configure:16787: checking for fopencookie" >&5 -if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char fopencookie(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_fopencookie) || defined (__stub___fopencookie) -choke me -#else -fopencookie(); +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" " +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include #endif -; return 0; } -EOF -if { (eval echo configure:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_fopencookie=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_fopencookie=no" -fi -rm -f conftest* +" +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 + fi -if eval "test \"`echo '$ac_cv_func_'fopencookie`\" = yes"; then - echo "$ac_t""yes" 1>&6 +done + + + + ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie" +if test "x$ac_cv_func_fopencookie" = xyes; then : have_glibc_fopencookie=yes -else - echo "$ac_t""no" 1>&6 fi if test "$have_glibc_fopencookie" = "yes"; then -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _GNU_SOURCE #include -int main() { +int +main () +{ cookie_io_functions_t cookie; -; return 0; } -EOF -if { (eval echo configure:16847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : have_cookie_io_functions_t=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$have_cookie_io_functions_t" = "yes"; then cookie_io_functions_t=cookie_io_functions_t have_fopen_cookie=yes -if test "$cross_compiling" = yes; then - +if test "$cross_compiling" = yes; then : + cookie_io_functions_use_off64_t=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _GNU_SOURCE #include @@ -16893,45 +18088,41 @@ } -EOF -if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + cookie_io_functions_use_off64_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + cookie_io_functions_use_off64_t=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + else -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _GNU_SOURCE #include -int main() { - _IO_cookie_io_functions_t cookie; -; return 0; } -EOF -if { (eval echo configure:16928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +int +main () +{ + _IO_cookie_io_functions_t cookie; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : have_IO_cookie_io_functions_t=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$have_cookie_io_functions_t" = "yes" ; then cookie_io_functions_t=_IO_cookie_io_functions_t have_fopen_cookie=yes @@ -16939,75 +18130,73 @@ fi if test "$have_fopen_cookie" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_FOPENCOOKIE 1 -EOF - cat >> confdefs.h <>confdefs.h + + +cat >>confdefs.h <<_ACEOF #define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t -EOF +_ACEOF if test "$cookie_io_functions_use_off64_t" = "yes" ; then - cat >> confdefs.h <<\EOF -#define COOKIE_SEEKER_USES_OFF64_T 1 -EOF + +$as_echo "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h fi fi fi - echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 -echo "configure:16962: checking for broken getcwd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5 +$as_echo_n "checking for broken getcwd... " >&6; } os=`uname -sr 2>/dev/null` case $os in SunOS*) - cat >> confdefs.h <<\EOF -#define HAVE_BROKEN_GETCWD 1 -EOF - echo "$ac_t""yes" 1>&6;; +$as_echo "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; };; *) - echo "$ac_t""no" 1>&6;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; };; esac - echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 -echo "configure:16977: checking for broken libc stdio" >&5 - if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libc stdio" >&5 +$as_echo_n "checking for broken libc stdio... " >&6; } + if ${_cv_have_broken_glibc_fopen_append+:} false; then : + $as_echo_n "(cached) " >&6 else - - if test "$cross_compiling" = yes; then - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ #if !__GLIBC_PREREQ(2,2) choke me #endif -; return 0; } -EOF -if { (eval echo configure:16997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : _cv_have_broken_glibc_fopen_append=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - _cv_have_broken_glibc_fopen_append=no + _cv_have_broken_glibc_fopen_append=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include int main(int argc, char *argv[]) @@ -17015,7 +18204,7 @@ FILE *fp; long position; char *filename = "/tmp/phpglibccheck"; - + fp = fopen(filename, "w"); if (fp == NULL) { perror("fopen"); @@ -17033,643 +18222,592 @@ return 0; } -EOF -if { (eval echo configure:17038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : _cv_have_broken_glibc_fopen_append=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - _cv_have_broken_glibc_fopen_append=yes + _cv_have_broken_glibc_fopen_append=yes fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1 -EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1" >>confdefs.h else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:17066: checking whether struct tm is in sys/time.h or time.h" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if ${ac_cv_struct_tm+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { -struct tm *tp; tp->tm_sec; -; return 0; } -EOF -if { (eval echo configure:17079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +struct tm tm; + int *p = &tm.tm_sec; + return !p; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm=time.h else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_struct_tm=sys/time.h fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_struct_tm" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then - cat >> confdefs.h <<\EOF -#define TM_IN_SYS_TIME 1 -EOF + +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi -echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:17100: checking for tm_zone in struct tm" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < +ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include #include <$ac_cv_struct_tm> -int main() { -struct tm tm; tm.tm_zone; -; return 0; } -EOF -if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm_zone=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_struct_tm_zone=no -fi -rm -f conftest* + +" +if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TM_TM_ZONE 1 +_ACEOF + + fi -echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6 -if test "$ac_cv_struct_tm_zone" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_TM_ZONE 1 -EOF +if test "$ac_cv_member_struct_tm_tm_zone" = yes; then + +$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h else - echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:17133: checking for tzname" >&5 -if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include +" +if test "x$ac_cv_have_decl_tzname" = xyes; then : + ac_have_decl=1 else - cat > conftest.$ac_ext <>confdefs.h <<_ACEOF +#define HAVE_DECL_TZNAME $ac_have_decl +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 +$as_echo_n "checking for tzname... " >&6; } +if ${ac_cv_var_tzname+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -#ifndef tzname /* For SGI. */ -extern char *tzname[]; /* RS6000 and others reject char **tzname. */ +#if !HAVE_DECL_TZNAME +extern char *tzname[]; #endif -int main() { -atoi(*tzname); -; return 0; } -EOF -if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + +int +main () +{ +return tzname[0][0]; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_var_tzname=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_var_tzname=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_var_tzname" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 +$as_echo "$ac_cv_var_tzname" >&6; } if test $ac_cv_var_tzname = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_TZNAME 1 -EOF + +$as_echo "#define HAVE_TZNAME 1" >>confdefs.h fi fi - echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 -echo "configure:17172: checking for missing declarations of reentrant functions" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for missing declarations of reentrant functions... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ struct tm *(*func)() = localtime_r -; return 0; } -EOF -if { (eval echo configure:17181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + : - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_LOCALTIME_R_DECL 1 -EOF - + +$as_echo "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h + + fi -rm -f conftest* - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ struct tm *(*func)() = gmtime_r -; return 0; } -EOF -if { (eval echo configure:17206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + : - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_GMTIME_R_DECL 1 -EOF - + +$as_echo "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h + + fi -rm -f conftest* - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ char *(*func)() = asctime_r -; return 0; } -EOF -if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + : - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_ASCTIME_R_DECL 1 -EOF - + +$as_echo "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h + + fi -rm -f conftest* - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ char *(*func)() = ctime_r -; return 0; } -EOF -if { (eval echo configure:17256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + : - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_CTIME_R_DECL 1 -EOF - + +$as_echo "#define MISSING_CTIME_R_DECL 1" >>confdefs.h + + fi -rm -f conftest* - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ char *(*func)() = strtok_r -; return 0; } -EOF -if { (eval echo configure:17281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + : - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_STRTOK_R_DECL 1 -EOF - + +$as_echo "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h + + fi -rm -f conftest* - echo "$ac_t""done" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } - echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 -echo "configure:17302: checking for fclose declaration" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for fclose declaration... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ int (*func)() = fclose -; return 0; } -EOF -if { (eval echo configure:17311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_FCLOSE_DECL 0 -EOF + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + +$as_echo "#define MISSING_FCLOSE_DECL 0" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } - echo "$ac_t""ok" 1>&6 - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define MISSING_FCLOSE_DECL 1 -EOF - echo "$ac_t""missing" 1>&6 - + +$as_echo "#define MISSING_FCLOSE_DECL 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5 +$as_echo "missing" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:17337: checking for tm_gmtoff in struct tm" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_struct_tm_gmtoff+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include <$ac_cv_struct_tm> -int main() { +int +main () +{ struct tm tm; tm.tm_gmtoff; -; return 0; } -EOF -if { (eval echo configure:17350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm_gmtoff=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_struct_tm_gmtoff=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_struct_tm_gmtoff" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_gmtoff" >&5 +$as_echo "$ac_cv_struct_tm_gmtoff" >&6; } if test "$ac_cv_struct_tm_gmtoff" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_TM_GMTOFF 1 -EOF + +$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h fi -echo $ac_n "checking for struct flock""... $ac_c" 1>&6 -echo "configure:17373: checking for struct flock" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5 +$as_echo_n "checking for struct flock... " >&6; } +if ${ac_cv_struct_flock+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include - -int main() { + +int +main () +{ struct flock x; -; return 0; } -EOF -if { (eval echo configure:17388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_flock=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_struct_flock=no - -fi -rm -f conftest* fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_struct_flock" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5 +$as_echo "$ac_cv_struct_flock" >&6; } if test "$ac_cv_struct_flock" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_STRUCT_FLOCK 1 -EOF + +$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h fi -echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:17415: checking for socklen_t" >&5 -if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 +$as_echo_n "checking for socklen_t... " >&6; } +if ${ac_cv_socklen_t+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ socklen_t x; -; return 0; } -EOF -if { (eval echo configure:17432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_socklen_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_socklen_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_socklen_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_socklen_t" >&5 +$as_echo "$ac_cv_socklen_t" >&6; } if test "$ac_cv_socklen_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_SOCKLEN_T 1 -EOF + +$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h fi -echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:17458: checking size of size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_size_t=8 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${ac_cv_sizeof_size_t+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(size_t)); - return(0); -} -EOF -if { (eval echo configure:17477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_size_t=`cat conftestval` + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_size_t=0 -fi -rm -fr conftest* + 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_error 77 "cannot compute sizeof (size_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_size_t=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_size_t" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_size_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -EOF +_ACEOF -echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:17497: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long long)); - return(0); -} -EOF -if { (eval echo configure:17516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if ${ac_cv_sizeof_long_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long -EOF +_ACEOF -echo $ac_n "checking size of long long int""... $ac_c" 1>&6 -echo "configure:17536: checking size of long long int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long_int=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long long int)); - return(0); -} -EOF -if { (eval echo configure:17555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long_int=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${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 : + +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_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 fi fi -echo "$ac_t""$ac_cv_sizeof_long_long_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int -EOF +_ACEOF -echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:17575: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); -} -EOF -if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF +_ACEOF -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:17614: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); -} -EOF -if { (eval echo configure:17633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $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 : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF - echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 -echo "configure:17655: checking size of intmax_t" >&5 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5 +$as_echo_n "checking size of intmax_t... " >&6; } + php_cache_value=php_cv_sizeof_intmax_t - if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if ${php_cv_sizeof_intmax_t+:} false; then : + $as_echo_n "(cached) " >&6 else - + old_LIBS=$LIBS LIBS= old_LDFLAGS=$LDFLAGS LDFLAGS= - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + eval $php_cache_value=0 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #if STDC_HEADERS #include @@ -17690,22 +18828,19 @@ fprintf(fp, "%d\n", sizeof(intmax_t)); return(0); } - -EOF -if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + eval $php_cache_value=`cat conftestval` - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + eval $php_cache_value=0 - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LDFLAGS=$old_LDFLAGS @@ -17715,41 +18850,43 @@ if eval test "\$$php_cache_value" != "0"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t -EOF +_ACEOF - cat >> confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INTMAX_T 1 -EOF +_ACEOF + - fi - echo "$ac_t""$php_cv_sizeof_intmax_t" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5 +$as_echo "$php_cv_sizeof_intmax_t" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 +$as_echo_n "checking size of ssize_t... " >&6; } - echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 -echo "configure:17735: checking size of ssize_t" >&5 - php_cache_value=php_cv_sizeof_ssize_t - if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if ${php_cv_sizeof_ssize_t+:} false; then : + $as_echo_n "(cached) " >&6 else - + old_LIBS=$LIBS LIBS= old_LDFLAGS=$LDFLAGS LDFLAGS= - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + eval $php_cache_value=8 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #if STDC_HEADERS #include @@ -17770,22 +18907,19 @@ fprintf(fp, "%d\n", sizeof(ssize_t)); return(0); } - -EOF -if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + eval $php_cache_value=`cat conftestval` - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + eval $php_cache_value=0 - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LDFLAGS=$old_LDFLAGS @@ -17795,41 +18929,43 @@ if eval test "\$$php_cache_value" != "0"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t -EOF +_ACEOF + - cat >> confdefs.h <>confdefs.h <<_ACEOF #define HAVE_SSIZE_T 1 -EOF +_ACEOF + - fi - echo "$ac_t""$php_cv_sizeof_ssize_t" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5 +$as_echo "$php_cv_sizeof_ssize_t" >&6; } - echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 -echo "configure:17815: checking size of ptrdiff_t" >&5 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5 +$as_echo_n "checking size of ptrdiff_t... " >&6; } + php_cache_value=php_cv_sizeof_ptrdiff_t - if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if ${php_cv_sizeof_ptrdiff_t+:} false; then : + $as_echo_n "(cached) " >&6 else - + old_LIBS=$LIBS LIBS= old_LDFLAGS=$LDFLAGS LDFLAGS= - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + eval $php_cache_value=8 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #if STDC_HEADERS #include @@ -17850,22 +18986,19 @@ fprintf(fp, "%d\n", sizeof(ptrdiff_t)); return(0); } - -EOF -if { (eval echo configure:17856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + eval $php_cache_value=`cat conftestval` - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + eval $php_cache_value=0 - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LDFLAGS=$old_LDFLAGS @@ -17875,405 +19008,235 @@ if eval test "\$$php_cache_value" != "0"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t -EOF +_ACEOF - cat >> confdefs.h <>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 -EOF +_ACEOF + - fi - echo "$ac_t""$php_cv_sizeof_ptrdiff_t" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5 +$as_echo "$php_cv_sizeof_ptrdiff_t" >&6; } -echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:17895: checking for st_blksize in struct stat" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -int main() { -struct stat s; s.st_blksize; -; return 0; } -EOF -if { (eval echo configure:17908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_struct_st_blksize=no -fi -rm -f conftest* -fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : -echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6 -if test $ac_cv_struct_st_blksize = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ST_BLKSIZE 1 -EOF +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +_ACEOF + + +$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h fi + if test "`uname -s 2>/dev/null`" != "QNX"; then - echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:17930: checking for st_blocks in struct stat" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -int main() { -struct stat s; s.st_blocks; -; return 0; } -EOF -if { (eval echo configure:17943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blocks=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_struct_st_blocks=no -fi -rm -f conftest* -fi + 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" = xyes; then : -echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6 -if test $ac_cv_struct_st_blocks = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ST_BLOCKS 1 -EOF +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BLOCKS 1 +_ACEOF + + +$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h else - LIBOBJS="$LIBOBJS fileblocks.${ac_objext}" + case " $LIBOBJS " in + *" fileblocks.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" + ;; +esac + fi + else - echo "configure: warning: warnings level for cc set to 0" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: warnings level for cc set to 0" >&5 +$as_echo "$as_me: WARNING: warnings level for cc set to 0" >&2;} WARNING_LEVEL=0 fi -echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:17970: checking for st_rdev in struct stat" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -int main() { -struct stat s; s.st_rdev; -; return 0; } -EOF -if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_rdev=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_struct_st_rdev=no -fi -rm -f conftest* -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" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_RDEV 1 +_ACEOF -echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6 -if test $ac_cv_struct_st_rdev = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ST_RDEV 1 -EOF + +$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h fi -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:18005: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes + +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned -EOF +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:18038: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if ${ac_cv_type_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "uid_t" >/dev/null 2>&1; then : ac_cv_type_uid_t=yes else - rm -rf conftest* ac_cv_type_uid_t=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF -#define uid_t int -EOF - cat >> confdefs.h <<\EOF -#define gid_t int -EOF +$as_echo "#define uid_t int" >>confdefs.h + + +$as_echo "#define gid_t int" >>confdefs.h fi - echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 -echo "configure:18074: checking for struct sockaddr_storage" >&5 -if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 +$as_echo_n "checking for struct sockaddr_storage... " >&6; } +if ${ac_cv_sockaddr_storage+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ struct sockaddr_storage s; s -; return 0; } -EOF -if { (eval echo configure:18087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sockaddr_storage=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_sockaddr_storage=no fi -rm -f conftest* - -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_sockaddr_storage" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5 +$as_echo "$ac_cv_sockaddr_storage" >&6; } if test "$ac_cv_sockaddr_storage" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_SOCKADDR_STORAGE 1 -EOF + +$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h fi - echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:18108: checking for field sa_len in struct sockaddr" >&5 -if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_sockaddr_sa_len+:} false; then : + $as_echo_n "(cached) " >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ static struct sockaddr sa; int n = (int) sa.sa_len; return n; -; return 0; } -EOF -if { (eval echo configure:18122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sockaddr_sa_len=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_sockaddr_sa_len=no fi -rm -f conftest* - -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_sockaddr_sa_len" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5 +$as_echo "$ac_cv_sockaddr_sa_len" >&6; } if test "$ac_cv_sockaddr_sa_len" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_SOCKADDR_SA_LEN 1 -EOF + +$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h fi -echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 -echo "configure:18145: checking for IPv6 support" >&5 -if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 +$as_echo_n "checking for IPv6 support... " >&6; } +if ${ac_cv_ipv6_support+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include -int main() { +int +main () +{ struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; -; return 0; } -EOF -if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_ipv6_support=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_ipv6_support=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5 +$as_echo "$ac_cv_ipv6_support" >&6; } -echo "$ac_t""$ac_cv_ipv6_support" 1>&6 - - -echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:18175: checking for vprintf" >&5 -if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char vprintf(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_vprintf) || defined (__stub___vprintf) -choke me -#else -vprintf(); -#endif - -; return 0; } -EOF -if { (eval echo configure:18203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vprintf=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_vprintf=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +for ac_func in vprintf +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF #define HAVE_VPRINTF 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - -if test "$ac_cv_func_vprintf" != yes; then -echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:18227: checking for _doprnt" >&5 -if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _doprnt(); +_ACEOF -int main() { +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = xyes; then : -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub__doprnt) || defined (__stub____doprnt) -choke me -#else -_doprnt(); -#endif +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -; return 0; } -EOF -if { (eval echo configure:18255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func__doprnt=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func__doprnt=no" fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DOPRNT 1 -EOF -else - echo "$ac_t""no" 1>&6 fi +done -fi for ac_func in alphasort \ asctime_r \ @@ -18357,438 +19320,312 @@ vasprintf \ asprintf \ -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18363: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:18391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + unset ac_cv_lib_rt_nanosleep unset ac_cv_lib_rt___nanosleep unset found - echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:18422: checking for nanosleep in -lrt" >&5 -ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 +$as_echo_n "checking for nanosleep in -lrt... " >&6; } +if ${ac_cv_lib_rt_nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nanosleep (); +int +main () +{ +return nanosleep (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_nanosleep=yes +else + ac_cv_lib_rt_nanosleep=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 +$as_echo "$ac_cv_lib_rt_nanosleep" >&6; } +if test "x$ac_cv_lib_rt_nanosleep" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:18461: checking for __nanosleep in -lrt" >&5 -ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5 +$as_echo_n "checking for __nanosleep in -lrt... " >&6; } +if ${ac_cv_lib_rt___nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __nanosleep (); +int +main () +{ +return __nanosleep (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt___nanosleep=yes +else + ac_cv_lib_rt___nanosleep=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5 +$as_echo "$ac_cv_lib_rt___nanosleep" >&6; } +if test "x$ac_cv_lib_rt___nanosleep" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lrt" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:18516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case rt in c|c_r|pthread*) ;; - *) - LIBS="-lrt $LIBS" + *) + LIBS="-lrt $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRT 1 -EOF +$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRT 1" >>confdefs.h ac_cv_func_nanosleep=yes else - + : fi - -echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:18560: checking for getaddrinfo" >&5 -if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -int main() { -struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g); -; return 0; } -EOF -if { (eval echo configure:18572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - if test "$cross_compiling" = yes; then - ac_cv_func_getaddrinfo=no -else - cat > conftest.$ac_ext < -#include -#ifndef AF_INET -# include -#endif -int main(void) { - struct addrinfo *ai, *pai, hints; - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_NUMERICHOST; +$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h - if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) { - exit(1); - } - if (ai == 0) { - exit(1); - } +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 - pai = ai; - - while (pai) { - if (pai->ai_family != AF_INET) { - /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ - exit(1); - } - if (pai->ai_addr->sa_family != AF_INET) { - /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ - exit(1); - } - pai = pai->ai_next; - } - freeaddrinfo(ai); - exit(0); -} - -EOF -if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_getaddrinfo=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_getaddrinfo=no -fi -rm -fr conftest* + case " $LIBOBJS " in + *" 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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_getaddrinfo=no -fi -rm -f conftest* + case " $LIBOBJS " in + *" strlcpy.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext" + ;; +esac + fi -echo "$ac_t""$ac_cv_func_getaddrinfo" 1>&6 -if test "$ac_cv_func_getaddrinfo" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_GETADDRINFO 1 -EOF +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 -for ac_func in strlcat strlcpy getopt -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18650: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif -; return 0; } -EOF -if { (eval echo configure:18678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:18705: checking whether utime accepts a null argument" >&5 -if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + +{ $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 ${ac_cv_func_utime_null+:} false; then : + $as_echo_n "(cached) " >&6 else - rm -f conftestdata; > conftestdata + rm -f conftest.data; >conftest.data # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. -if test "$cross_compiling" = yes; then - ac_cv_func_utime_null=no +if test "$cross_compiling" = yes; then : + ac_cv_func_utime_null='guessing yes' else - cat > conftest.$ac_ext < -#include -main() { + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + #ifdef HAVE_UTIME_H + # include + #endif +int +main () +{ struct stat s, t; -exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 -&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime -&& t.st_mtime - s.st_mtime < 120)); + return ! (stat ("conftest.data", &s) == 0 + && utime ("conftest.data", 0) == 0 + && stat ("conftest.data", &t) == 0 + && t.st_mtime >= s.st_mtime + && t.st_mtime - s.st_mtime < 120); + ; + return 0; } -EOF -if { (eval echo configure:18726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_utime_null=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_func_utime_null=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core core.* *.core fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5 +$as_echo "$ac_cv_func_utime_null" >&6; } +if test "x$ac_cv_func_utime_null" != xno; then + ac_cv_func_utime_null=yes -echo "$ac_t""$ac_cv_func_utime_null" 1>&6 -if test $ac_cv_func_utime_null = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_UTIME_NULL 1 -EOF +$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h fi +rm -f conftest.data # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:18752: checking for working alloca.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if ${ac_cv_working_alloca_h+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:18764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_working_alloca_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no + ac_cv_working_alloca_h=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18785: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if ${ac_cv_func_alloca_works+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -18796,151 +19633,108 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:18818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ +char *p = (char *) alloca (1); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF -fi +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext +$as_echo "#define C_ALLOCA 1" >>confdefs.h -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18850: checking whether alloca needs Cray hooks" >&5 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $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 ${ac_cv_os_cray+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18880: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + 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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF - break -else - echo "$ac_t""no" 1>&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:18935: checking stack direction for C alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_c_stack_direction+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int find_stack_direction () { static char *addr = 0; @@ -18953,42 +19747,41 @@ else return (&dummy > addr) ? 1 : -1; } + +int main () { - exit (find_stack_direction() < 0); + return find_stack_direction () < 0; } -EOF -if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi - echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 -echo "configure:18985: checking for declared timezone" >&5 -if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for declared timezone... " >&6; } +if ${ac_cv_declared_timezone+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -18996,51 +19789,49 @@ #include #endif -int main() { +int +main () +{ time_t foo = (time_t) timezone; -; return 0; } -EOF -if { (eval echo configure:19006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_declared_timezone=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_declared_timezone=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_declared_timezone" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_declared_timezone" >&5 +$as_echo "$ac_cv_declared_timezone" >&6; } if test "$ac_cv_declared_timezone" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_DECLARED_TIMEZONE 1 -EOF + +$as_echo "#define HAVE_DECLARED_TIMEZONE 1" >>confdefs.h fi -echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 -echo "configure:19032: checking for type of reentrant time-related functions" >&5 -if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_time_r_type+:} false; then : + $as_echo_n "(cached) " >&6 else - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + ac_cv_time_r_type=POSIX else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include @@ -19056,140 +19847,88 @@ return (1); } -EOF -if { (eval echo configure:19061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_time_r_type=hpux else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + ac_cv_time_r_type=POSIX - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include main() { struct tm t, *s; time_t old = 0; char buf[27], *p; - + s = gmtime_r(&old, &t); p = asctime_r(&t, buf, 26); if (p == buf && s == &t) return (0); return (1); } - -EOF -if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_time_r_type=irix - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_time_r_type=POSIX - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_time_r_type" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5 +$as_echo "$ac_cv_time_r_type" >&6; } case $ac_cv_time_r_type in - hpux) cat >> confdefs.h <<\EOF -#define PHP_HPUX_TIME_R 1 -EOF + hpux) +$as_echo "#define PHP_HPUX_TIME_R 1" >>confdefs.h ;; - irix) cat >> confdefs.h <<\EOF -#define PHP_IRIX_TIME_R 1 -EOF + irix) +$as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h ;; esac - echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 -echo "configure:19131: checking for readdir_r" >&5 -if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char readdir_r(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_readdir_r) || defined (__stub___readdir_r) -choke me -#else -readdir_r(); -#endif - -; return 0; } -EOF -if { (eval echo configure:19159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_readdir_r=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_readdir_r=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'readdir_r`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r" +if test "x$ac_cv_func_readdir_r" = xyes; then : ac_cv_func_readdir_r=yes else - echo "$ac_t""no" 1>&6 -ac_cv_func_readdir=no + ac_cv_func_readdir=no fi if test "$ac_cv_func_readdir_r" = "yes"; then - echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6 -echo "configure:19181: checking for type of readdir_r" >&5 -if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - if test "$cross_compiling" = 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 ${ac_cv_what_readdir_r+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test "$cross_compiling" = yes; then : + ac_cv_what_readdir_r=none - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _REENTRANT #include @@ -19205,84 +19944,69 @@ struct dirent *pentry = (struct dirent *) &entry; dir = opendir("/"); - if (!dir) + if (!dir) exit(1); if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) exit(0); exit(1); } - -EOF -if { (eval echo configure:19217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_what_readdir_r=POSIX - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #define _REENTRANT #include #include int readdir_r(DIR *, struct dirent *); - -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - + +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_cv_what_readdir_r=old-style - + else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_what_readdir_r=none - + fi -rm -f conftest* - +rm -f conftest.err conftest.i conftest.$ac_ext + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$ac_cv_what_readdir_r" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_what_readdir_r" >&5 +$as_echo "$ac_cv_what_readdir_r" >&6; } case $ac_cv_what_readdir_r in POSIX) - cat >> confdefs.h <<\EOF -#define HAVE_POSIX_READDIR_R 1 -EOF + +$as_echo "#define HAVE_POSIX_READDIR_R 1" >>confdefs.h ;; old-style) - cat >> confdefs.h <<\EOF -#define HAVE_OLD_READDIR_R 1 -EOF + +$as_echo "#define HAVE_OLD_READDIR_R 1" >>confdefs.h ;; esac fi -echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:19280: checking for in_addr_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5 +$as_echo_n "checking for in_addr_t... " >&6; } +if ${ac_cv_type_in_addr_t+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #if STDC_HEADERS #include @@ -19291,191 +20015,21 @@ #ifdef HAVE_NETINET_IN_H #include #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : ac_cv_type_in_addr_t=yes else - rm -rf conftest* ac_cv_type_in_addr_t=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5 +$as_echo "$ac_cv_type_in_addr_t" >&6; } if test $ac_cv_type_in_addr_t = no; then - cat >> confdefs.h <<\EOF -#define in_addr_t u_int -EOF - -fi - - -for ac_func in crypt_r -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19319: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:19347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -php_crypt_r="0" -fi -done - -if test "x$php_crypt_r" = "x1"; then - - echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6 -echo "configure:19375: checking which data struct is used by crypt_r" >&5 -if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - php_cv_crypt_r_style=none - cat > conftest.$ac_ext < - -int main() { - -CRYPTD buffer; -crypt_r("passwd", "hash", &buffer); - -; return 0; } -EOF -if { (eval echo configure:19395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - php_cv_crypt_r_style=cryptd -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - - if test "$php_cv_crypt_r_style" = "none"; then - cat > conftest.$ac_ext < - -int main() { - -struct crypt_data buffer; -crypt_r("passwd", "hash", &buffer); - -; return 0; } -EOF -if { (eval echo configure:19419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - php_cv_crypt_r_style=struct_crypt_data -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - fi - - if test "$php_cv_crypt_r_style" = "none"; then - cat > conftest.$ac_ext < - -int main() { - -struct crypt_data buffer; -crypt_r("passwd", "hash", &buffer); - -; return 0; } -EOF -if { (eval echo configure:19445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - php_cv_crypt_r_style=struct_crypt_data_gnu_source -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - fi - -fi - -echo "$ac_t""$php_cv_crypt_r_style" 1>&6 - - if test "$php_cv_crypt_r_style" = "cryptd"; then - cat >> confdefs.h <<\EOF -#define CRYPT_R_CRYPTD 1 -EOF - - fi - if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then - cat >> confdefs.h <<\EOF -#define CRYPT_R_STRUCT_CRYPT_DATA 1 -EOF - - fi - if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then - cat >> confdefs.h <<\EOF -#define CRYPT_R_GNU_SOURCE 1 -EOF - fi - if test "$php_cv_crypt_r_style" = "none"; then - { echo "configure: error: Unable to detect data struct used by crypt_r" 1>&2; exit 1; } - fi +$as_echo "#define in_addr_t u_int" >>confdefs.h fi @@ -19483,15 +20037,16 @@ - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}General settings${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5 +$as_echo "${T_MD}General settings${T_ME}" >&6; } -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi @@ -19499,22 +20054,22 @@ php_enable_gcov=no -echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 -echo "configure:19504: checking whether to include gcov symbols" >&5 -# Check whether --enable-gcov or --disable-gcov was given. -if test "${enable_gcov+set}" = set; then - enableval="$enable_gcov" - PHP_GCOV=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5 +$as_echo_n "checking whether to include gcov symbols... " >&6; } +# Check whether --enable-gcov was given. +if test "${enable_gcov+set}" = set; then : + enableval=$enable_gcov; PHP_GCOV=$enableval else - + PHP_GCOV=no - + fi ext_output=$PHP_GCOV -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -19522,92 +20077,108 @@ if test "$PHP_GCOV" = "yes"; then if test "$GCC" != "yes"; then - { echo "configure: error: GCC is required for --enable-gcov" 1>&2; exit 1; } + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 fi - + case `$php_shtool path $CC` in *ccache*) gcc_ccache=yes;; *) gcc_ccache=no;; esac if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then - { echo "configure: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." 1>&2; exit 1; } + 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" # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19543: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LTP+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$LTP"; then ac_cv_prog_LTP="$LTP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LTP="lcov" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LTP="lcov" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi fi -LTP="$ac_cv_prog_LTP" +LTP=$ac_cv_prog_LTP if test -n "$LTP"; then - echo "$ac_t""$LTP" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP" >&5 +$as_echo "$LTP" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + # Extract the first word of "genhtml", so it can be a program name with args. set dummy genhtml; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19572: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LTP_GENHTML+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$LTP_GENHTML"; then ac_cv_prog_LTP_GENHTML="$LTP_GENHTML" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LTP_GENHTML="genhtml" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LTP_GENHTML="genhtml" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + fi fi -LTP_GENHTML="$ac_cv_prog_LTP_GENHTML" +LTP_GENHTML=$ac_cv_prog_LTP_GENHTML if test -n "$LTP_GENHTML"; then - echo "$ac_t""$LTP_GENHTML" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP_GENHTML" >&5 +$as_echo "$LTP_GENHTML" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - + + PHP_VAR_SUBST="$PHP_VAR_SUBST LTP" - + PHP_VAR_SUBST="$PHP_VAR_SUBST LTP_GENHTML" if test "$LTP"; then - echo $ac_n "checking for ltp version""... $ac_c" 1>&6 -echo "configure:19607: checking for ltp version" >&5 -if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltp version" >&5 +$as_echo_n "checking for ltp version... " >&6; } +if ${php_cv_ltp_version+:} false; then : + $as_echo_n "(cached) " >&6 else - + php_cv_ltp_version=invalid ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'` for ltp_check_version in $ltp_version_list; do @@ -19615,42 +20186,41 @@ php_cv_ltp_version="$ltp_check_version (ok)" fi done - -fi -echo "$ac_t""$php_cv_ltp_version" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_ltp_version" >&5 +$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" - { echo "configure: error: $ltp_msg" 1>&2; exit 1; } + 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 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)." - { echo "configure: error: $ltp_msg" 1>&2; exit 1; } + as_fn_error $? "$ltp_msg" "$LINENO" 5 LTP="exit 0;" ;; esac if test -z "$LTP_GENHTML"; then - { echo "configure: error: Could not find genhtml from the LTP package" 1>&2; exit 1; } + as_fn_error $? "Could not find genhtml from the LTP package" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_GCOV 1 -EOF - +$as_echo "#define HAVE_GCOV 1" >>confdefs.h + + src=$abs_srcdir/Makefile.gcov ac_srcdir=$abs_srcdir ac_builddir=$ext_builddir test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` - + CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage" @@ -19659,22 +20229,22 @@ php_enable_debug=no -echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 -echo "configure:19664: checking whether to include debugging symbols" >&5 -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - PHP_DEBUG=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5 +$as_echo_n "checking whether to include debugging symbols... " >&6; } +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; PHP_DEBUG=$enableval else - + PHP_DEBUG=no - + fi ext_output=$PHP_DEBUG -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -19682,10 +20252,10 @@ if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 ZEND_DEBUG=yes - + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` - + if test "$GCC" = "yes" || test "$ICC" = "yes"; then CFLAGS="$CFLAGS -O0" CXXFLAGS="$CXXFLAGS -g -O0" @@ -19707,22 +20277,23 @@ php_with_layout=PHP -echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 -echo "configure:19712: checking layout of installed files" >&5 -# Check whether --with-layout or --without-layout was given. -if test "${with_layout+set}" = set; then - withval="$with_layout" - PHP_LAYOUT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5 +$as_echo_n "checking layout of installed files... " >&6; } + +# Check whether --with-layout was given. +if test "${with_layout+set}" = set; then : + withval=$with_layout; PHP_LAYOUT=$withval else - + PHP_LAYOUT=PHP - + fi ext_output=$PHP_LAYOUT -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -19739,22 +20310,23 @@ php_with_config_file_path=DEFAULT -echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 -echo "configure:19744: checking path to configuration file" >&5 -# Check whether --with-config-file-path or --without-config-file-path was given. -if test "${with_config_file_path+set}" = set; then - withval="$with_config_file_path" - PHP_CONFIG_FILE_PATH=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5 +$as_echo_n "checking path to configuration file... " >&6; } + +# Check whether --with-config-file-path was given. +if test "${with_config_file_path+set}" = set; then : + withval=$with_config_file_path; PHP_CONFIG_FILE_PATH=$withval else - + PHP_CONFIG_FILE_PATH=DEFAULT - + fi ext_output=$PHP_CONFIG_FILE_PATH -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -19770,20 +20342,20 @@ esac fi -echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 -echo "configure:19775: checking where to scan for configuration files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5 +$as_echo_n "checking where to scan for configuration files... " >&6; } php_with_config_file_scan_dir=DEFAULT -# Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given. -if test "${with_config_file_scan_dir+set}" = set; then - withval="$with_config_file_scan_dir" - PHP_CONFIG_FILE_SCAN_DIR=$withval + +# Check whether --with-config-file-scan-dir was given. +if test "${with_config_file_scan_dir+set}" = set; then : + withval=$with_config_file_scan_dir; PHP_CONFIG_FILE_SCAN_DIR=$withval else - + PHP_CONFIG_FILE_SCAN_DIR=DEFAULT - + fi @@ -19792,63 +20364,62 @@ - + if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi -echo "$ac_t""$PHP_CONFIG_FILE_SCAN_DIR" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5 +$as_echo "$PHP_CONFIG_FILE_SCAN_DIR" >&6; } test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" php_enable_safe_mode=no -echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 -echo "configure:19808: checking whether to enable safe mode by default" >&5 -# Check whether --enable-safe-mode or --disable-safe-mode was given. -if test "${enable_safe_mode+set}" = set; then - enableval="$enable_safe_mode" - PHP_SAFE_MODE=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable safe mode by default" >&5 +$as_echo_n "checking whether to enable safe mode by default... " >&6; } +# Check whether --enable-safe-mode was given. +if test "${enable_safe_mode+set}" = set; then : + enableval=$enable_safe_mode; PHP_SAFE_MODE=$enableval else - + PHP_SAFE_MODE=no - + fi ext_output=$PHP_SAFE_MODE -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SAFE_MODE" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_SAFE_MODE 1 -EOF + +$as_echo "#define PHP_SAFE_MODE 1" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define PHP_SAFE_MODE 0 -EOF + +$as_echo "#define PHP_SAFE_MODE 0" >>confdefs.h fi -echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 -echo "configure:19840: checking for safe mode exec dir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for safe mode exec dir" >&5 +$as_echo_n "checking for safe mode exec dir... " >&6; } php_with_exec_dir=no -# Check whether --with-exec-dir or --without-exec-dir was given. -if test "${with_exec_dir+set}" = set; then - withval="$with_exec_dir" - PHP_EXEC_DIR=$withval + +# Check whether --with-exec-dir was given. +if test "${with_exec_dir+set}" = set; then : + withval=$with_exec_dir; PHP_EXEC_DIR=$withval else - + PHP_EXEC_DIR=no - + fi @@ -19860,160 +20431,158 @@ if test "$PHP_EXEC_DIR" != "no" && test "$PHP_EXEC_DIR" != "yes" ; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_SAFE_MODE_EXEC_DIR "$PHP_EXEC_DIR" -EOF +_ACEOF - echo "$ac_t""$PHP_EXEC_DIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EXEC_DIR" >&5 +$as_echo "$PHP_EXEC_DIR" >&6; } else - cat >> confdefs.h <<\EOF -#define PHP_SAFE_MODE_EXEC_DIR "/usr/local/php/bin" -EOF - echo "$ac_t""/usr/local/php/bin" 1>&6 +$as_echo "#define PHP_SAFE_MODE_EXEC_DIR \"/usr/local/php/bin\"" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /usr/local/php/bin" >&5 +$as_echo "/usr/local/php/bin" >&6; } fi php_enable_sigchild=no -echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 -echo "configure:19881: checking whether to enable PHP's own SIGCHLD handler" >&5 -# Check whether --enable-sigchild or --disable-sigchild was given. -if test "${enable_sigchild+set}" = set; then - enableval="$enable_sigchild" - PHP_SIGCHILD=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5 +$as_echo_n "checking whether to enable PHP's own SIGCHLD handler... " >&6; } +# Check whether --enable-sigchild was given. +if test "${enable_sigchild+set}" = set; then : + enableval=$enable_sigchild; PHP_SIGCHILD=$enableval else - + PHP_SIGCHILD=no - + fi ext_output=$PHP_SIGCHILD -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SIGCHILD" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_SIGCHILD 1 -EOF + +$as_echo "#define PHP_SIGCHILD 1" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define PHP_SIGCHILD 0 -EOF + +$as_echo "#define PHP_SIGCHILD 0" >>confdefs.h fi php_enable_magic_quotes=no -echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 -echo "configure:19916: checking whether to enable magic quotes by default" >&5 -# Check whether --enable-magic-quotes or --disable-magic-quotes was given. -if test "${enable_magic_quotes+set}" = set; then - enableval="$enable_magic_quotes" - PHP_MAGIC_QUOTES=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable magic quotes by default" >&5 +$as_echo_n "checking whether to enable magic quotes by default... " >&6; } +# Check whether --enable-magic-quotes was given. +if test "${enable_magic_quotes+set}" = set; then : + enableval=$enable_magic_quotes; PHP_MAGIC_QUOTES=$enableval else - + PHP_MAGIC_QUOTES=no - + fi ext_output=$PHP_MAGIC_QUOTES -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_MAGIC_QUOTES" = "yes"; then - cat >> confdefs.h <<\EOF -#define MAGIC_QUOTES 1 -EOF + +$as_echo "#define MAGIC_QUOTES 1" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define MAGIC_QUOTES 0 -EOF + +$as_echo "#define MAGIC_QUOTES 0" >>confdefs.h fi php_enable_libgcc=no -echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 -echo "configure:19951: checking whether to explicitly link against libgcc" >&5 -# Check whether --enable-libgcc or --disable-libgcc was given. -if test "${enable_libgcc+set}" = set; then - enableval="$enable_libgcc" - PHP_LIBGCC=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5 +$as_echo_n "checking whether to explicitly link against libgcc... " >&6; } +# Check whether --enable-libgcc was given. +if test "${enable_libgcc+set}" = set; then : + enableval=$enable_libgcc; PHP_LIBGCC=$enableval else - + PHP_LIBGCC=no - + fi ext_output=$PHP_LIBGCC -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_LIBGCC" = "yes"; then - - + + libgcc_libpath=`gcc --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'` - + if test -z "$libgcc_libpath"; then - { echo "configure: error: Cannot locate libgcc. Make sure that gcc is in your path" 1>&2; exit 1; } + 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 - + if test -z "$libgcc_libpath" || echo "$libgcc_libpath" | grep '^/' >/dev/null ; then ai_p=$libgcc_libpath else - + ep_dir="`echo $libgcc_libpath|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$libgcc_libpath\"`" 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 - - + + case gcc in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lgcc" + *) + LIBS="$LIBS -lgcc" ;; esac @@ -20023,119 +20592,117 @@ php_enable_short_tags=yes -echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 -echo "configure:20028: checking whether to enable short tags by default" >&5 -# Check whether --enable-short-tags or --disable-short-tags was given. -if test "${enable_short_tags+set}" = set; then - enableval="$enable_short_tags" - PHP_SHORT_TAGS=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5 +$as_echo_n "checking whether to enable short tags by default... " >&6; } +# Check whether --enable-short-tags was given. +if test "${enable_short_tags+set}" = set; then : + enableval=$enable_short_tags; PHP_SHORT_TAGS=$enableval else - + PHP_SHORT_TAGS=yes - + fi ext_output=$PHP_SHORT_TAGS -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SHORT_TAGS" = "yes"; then - cat >> confdefs.h <<\EOF -#define DEFAULT_SHORT_OPEN_TAG "1" -EOF + +$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define DEFAULT_SHORT_OPEN_TAG "0" -EOF + +$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h fi php_enable_dmalloc=no -echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 -echo "configure:20063: checking whether to enable dmalloc" >&5 -# Check whether --enable-dmalloc or --disable-dmalloc was given. -if test "${enable_dmalloc+set}" = set; then - enableval="$enable_dmalloc" - PHP_DMALLOC=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5 +$as_echo_n "checking whether to enable dmalloc... " >&6; } +# Check whether --enable-dmalloc was given. +if test "${enable_dmalloc+set}" = set; then : + enableval=$enable_dmalloc; PHP_DMALLOC=$enableval else - + PHP_DMALLOC=no - + fi ext_output=$PHP_DMALLOC -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_DMALLOC" = "yes"; then - echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6 -echo "configure:20084: checking for dmalloc_error in -ldmalloc" >&5 -ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_dmalloc_dmalloc_error+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dmalloc_error (); +int +main () +{ +return dmalloc_error (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dmalloc_dmalloc_error=yes +else + ac_cv_lib_dmalloc_dmalloc_error=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5 +$as_echo "$ac_cv_lib_dmalloc_dmalloc_error" >&6; } +if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes; then : + -int main() { -dmalloc_error() -; return 0; } -EOF -if { (eval echo configure:20103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - - case dmalloc in c|c_r|pthread*) ;; - *) - LIBS="-ldmalloc $LIBS" + *) + LIBS="-ldmalloc $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DMALLOC 1 -EOF + +$as_echo "#define HAVE_DMALLOC 1" >>confdefs.h CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" - + else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Problem with enabling dmalloc. Please check config.log for details." 1>&2; exit 1; } - + as_fn_error $? "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5 + fi fi @@ -20143,47 +20710,45 @@ php_enable_ipv6=yes -echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 -echo "configure:20148: checking whether to enable IPv6 support" >&5 -# Check whether --enable-ipv6 or --disable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then - enableval="$enable_ipv6" - PHP_IPV6=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5 +$as_echo_n "checking whether to enable IPv6 support... " >&6; } +# Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; PHP_IPV6=$enableval else - + PHP_IPV6=yes - + fi ext_output=$PHP_IPV6 -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_IPV6 1 -EOF + +$as_echo "#define HAVE_IPV6 1" >>confdefs.h fi -echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 -echo "configure:20175: checking how big to make fd sets" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5 +$as_echo_n "checking how big to make fd sets... " >&6; } php_enable_fd_setsize=no -# Check whether --enable-fd-setsize or --disable-fd-setsize was given. -if test "${enable_fd_setsize+set}" = set; then - enableval="$enable_fd_setsize" - PHP_FD_SETSIZE=$enableval +# Check whether --enable-fd-setsize was given. +if test "${enable_fd_setsize+set}" = set; then : + enableval=$enable_fd_setsize; PHP_FD_SETSIZE=$enableval else - + PHP_FD_SETSIZE=no - + fi @@ -20197,37 +20762,38 @@ if test "$PHP_FD_SETSIZE" != "no"; then if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE" - echo "$ac_t""using $PHP_FD_SETSIZE" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5 +$as_echo "using $PHP_FD_SETSIZE" >&6; } else - { echo "configure: error: Invalid value passed to --enable-fd-setsize!" 1>&2; exit 1; } + as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5 fi else - echo "$ac_t""using system default" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5 +$as_echo "using system default" >&6; } fi - -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring extensions${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5 +$as_echo "${T_MD}Configuring extensions${T_ME}" >&6; } -# Check whether --enable-all or --disable-all was given. -if test "${enable_all+set}" = set; then - enableval="$enable_all" - +# Check whether --enable-all was given. +if test "${enable_all+set}" = set; then : + enableval=$enable_all; PHP_ENABLE_ALL=$enableval fi @@ -20238,288 +20804,241 @@ -echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:20243: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); -} -EOF -if { (eval echo configure:20262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF +_ACEOF -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:20282: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); -} -EOF -if { (eval echo configure:20301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $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 : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF -echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:20322: checking for int32_t" >&5 -if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext <&5 +$as_echo_n "checking for int32_t... " >&6; } +if ${ac_cv_int_type_int32_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_SYS_TYPES_H # include #endif #if HAVE_INTTYPES_H # include -#elif HAVE_STDINT_H -# include +#elif HAVE_STDINT_H +# include #endif -int main() { +int +main () +{ if ((int32_t *) 0) - return 0; + return 0; if (sizeof (int32_t)) return 0; -; return 0; } -EOF -if { (eval echo configure:20347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_int_type_int32_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_int_type_int32_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_int_type_int32_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_int_type_int32_t" >&5 +$as_echo "$ac_cv_int_type_int32_t" >&6; } if test "$ac_cv_int_type_int32_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_INT32_T 1 -EOF + +$as_echo "#define HAVE_INT32_T 1" >>confdefs.h fi -echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:20370: checking for uint32_t" >&5 -if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext <&5 +$as_echo_n "checking for uint32_t... " >&6; } +if ${ac_cv_int_type_uint32_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_SYS_TYPES_H # include #endif #if HAVE_INTTYPES_H # include -#elif HAVE_STDINT_H -# include +#elif HAVE_STDINT_H +# include #endif -int main() { +int +main () +{ if ((uint32_t *) 0) - return 0; + return 0; if (sizeof (uint32_t)) return 0; -; return 0; } -EOF -if { (eval echo configure:20395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_int_type_uint32_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_int_type_uint32_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_int_type_uint32_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_int_type_uint32_t" >&5 +$as_echo "$ac_cv_int_type_uint32_t" >&6; } if test "$ac_cv_int_type_uint32_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_UINT32_T 1 -EOF + +$as_echo "#define HAVE_UINT32_T 1" >>confdefs.h fi -for ac_hdr in \ +for ac_header in \ sys/types.h \ inttypes.h \ stdint.h \ string.h \ stdlib.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20427: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done for ac_func in strtoll atoll strftime -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20467: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -int main() { +fi +done -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif -; return 0; } -EOF -if { (eval echo configure:20495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + +php_with_system_tzdata=no + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use of system timezone data" >&5 +$as_echo_n "checking for use of system timezone data... " >&6; } + +# Check whether --with-system-tzdata was given. +if test "${with_system_tzdata+set}" = set; then : + withval=$with_system_tzdata; PHP_SYSTEM_TZDATA=$withval else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* + + PHP_SYSTEM_TZDATA=no + + fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 + +ext_output=$PHP_SYSTEM_TZDATA +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + + + + +if test "$PHP_SYSTEM_TZDATA" != "no"; then + +$as_echo "#define HAVE_SYSTEM_TZDATA 1" >>confdefs.h + + + if test "$PHP_SYSTEM_TZDATA" != "yes"; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_SYSTEM_TZDATA_PREFIX "$PHP_SYSTEM_TZDATA" +_ACEOF + + fi fi -done PHP_DATE_CFLAGS="-I@ext_builddir@/lib" -timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c +timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" @@ -20530,15 +21049,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_DATE_SHARED=no - - + + case ext/date in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -20551,12 +21070,12 @@ old_IFS=$IFS for ac_src in php_date.c $timelib_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -20580,14 +21099,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_DATE_SHARED=yes - + case ext/date in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -20600,12 +21119,12 @@ old_IFS=$IFS for ac_src in php_date.c $timelib_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_date="$shared_objects_date $ac_bdir$ac_obj.lo" case $ac_src in @@ -20623,7 +21142,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -20633,7 +21152,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDATE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(DATE_SHARED_LIBADD)' ;; *) suffix=la @@ -20646,7 +21165,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdate.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_DATE 1 -EOF +_ACEOF fi fi @@ -20708,15 +21228,15 @@ PHP_DATE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/date in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -20729,12 +21249,12 @@ old_IFS=$IFS for ac_src in php_date.c $timelib_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -20754,15 +21274,15 @@ EXT_STATIC="$EXT_STATIC date" ;; *) - - + + case ext/date in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -20775,12 +21295,12 @@ old_IFS=$IFS for ac_src in php_date.c $timelib_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -20801,107 +21321,107 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC date" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=date - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + $php_shtool mkdir -p $ext_builddir/lib - + if test "$ext_builddir/lib" != "/usr/include"; then - + if test -z "$ext_builddir/lib" || echo "$ext_builddir/lib" | grep '^/' >/dev/null ; then ai_p=$ext_builddir/lib else - + ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`" 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 if test "$ext_srcdir/lib" != "/usr/include"; then - + if test -z "$ext_srcdir/lib" || echo "$ext_srcdir/lib" | grep '^/' >/dev/null ; then ai_p=$ext_srcdir/lib else - + ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`" 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 - + header_path=ext/date for header_file in php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + cat > $ext_builddir/lib/timelib_config.h <&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid regex library type selected. Using default value: php" >&5 +$as_echo "$as_me: WARNING: Invalid regex library type selected. Using default value: php" >&2;} ;; esac -echo $ac_n "checking which regex library to use""... $ac_c" 1>&6 -echo "configure:20957: checking which regex library to use" >&5 -echo "$ac_t""$REGEX_TYPE" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which regex library to use" >&5 +$as_echo_n "checking which regex library to use... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $REGEX_TYPE" >&5 +$as_echo "$REGEX_TYPE" >&6; } if test "$REGEX_TYPE" = "php"; then ereg_regex_sources="regex/regcomp.c regex/regexec.c regex/regerror.c regex/regfree.c" @@ -20970,15 +21492,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_EREG_SHARED=no - - + + case ext/ereg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -20991,12 +21513,12 @@ old_IFS=$IFS for ac_src in ereg.c $ereg_regex_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21020,14 +21542,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_EREG_SHARED=yes - + case ext/ereg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -21040,12 +21562,12 @@ old_IFS=$IFS for ac_src in ereg.c $ereg_regex_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_ereg="$shared_objects_ereg $ac_bdir$ac_obj.lo" case $ac_src in @@ -21063,7 +21585,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -21073,7 +21595,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEREG, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(EREG_SHARED_LIBADD)' ;; *) suffix=la @@ -21086,7 +21608,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpereg.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ereg" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_EREG 1 -EOF +_ACEOF fi fi @@ -21148,15 +21671,15 @@ PHP_EREG_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/ereg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -21169,12 +21692,12 @@ old_IFS=$IFS for ac_src in ereg.c $ereg_regex_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21194,15 +21717,15 @@ EXT_STATIC="$EXT_STATIC ereg" ;; *) - - + + case ext/ereg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -21215,12 +21738,12 @@ old_IFS=$IFS for ac_src in ereg.c $ereg_regex_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21241,142 +21764,135 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC ereg" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=ereg - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + header_path=ext/ereg for header_file in php_ereg.h php_regex.h $ereg_regex_headers; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + if test "$REGEX_TYPE" = "php"; then - cat >> confdefs.h <<\EOF -#define HAVE_REGEX_T_RE_MAGIC 1 -EOF - cat >> confdefs.h <<\EOF -#define HSREGEX 1 -EOF +$as_echo "#define HAVE_REGEX_T_RE_MAGIC 1" >>confdefs.h + + +$as_echo "#define HSREGEX 1" >>confdefs.h + + +$as_echo "#define REGEX 1" >>confdefs.h + + - cat >> confdefs.h <<\EOF -#define REGEX 1 -EOF - - - $php_shtool mkdir -p $ext_builddir/regex - - + + if test "$ext_srcdir/regex" != "/usr/include"; then - + if test -z "$ext_srcdir/regex" || echo "$ext_srcdir/regex" | grep '^/' >/dev/null ; then ai_p=$ext_srcdir/regex else - + ep_dir="`echo $ext_srcdir/regex|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ext_srcdir/regex\"`" 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 elif test "$REGEX_TYPE" = "system"; then - cat >> confdefs.h <<\EOF -#define REGEX 0 -EOF - echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 -echo "configure:21334: checking whether field re_magic exists in struct regex_t" >&5 -if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <>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 ${ac_cv_regex_t_re_magic+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ regex_t rt; rt.re_magic; -; return 0; } -EOF -if { (eval echo configure:21348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_regex_t_re_magic=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_regex_t_re_magic=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_regex_t_re_magic" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_regex_t_re_magic" >&5 +$as_echo "$ac_cv_regex_t_re_magic" >&6; } if test "$ac_cv_regex_t_re_magic" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_REGEX_T_RE_MAGIC -EOF - - fi -fi + +$as_echo "#define HAVE_REGEX_T_RE_MAGIC " >>confdefs.h + + fi +fi php_enable_libxml=yes -echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 -echo "configure:21374: checking whether to enable LIBXML support" >&5 -# Check whether --enable-libxml or --disable-libxml was given. -if test "${enable_libxml+set}" = set; then - enableval="$enable_libxml" - PHP_LIBXML=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable LIBXML support" >&5 +$as_echo_n "checking whether to enable LIBXML support... " >&6; } +# Check whether --enable-libxml was given. +if test "${enable_libxml+set}" = set; then : + enableval=$enable_libxml; PHP_LIBXML=$enableval else - + PHP_LIBXML=yes test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL @@ -21405,31 +21921,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:21419: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -21439,13 +21957,13 @@ ext_shared=no - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:21445: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -21454,8 +21972,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -21468,17 +21986,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -21489,20 +22007,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii" + LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -21515,80 +22033,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LIBXML_SHARED_LIBADD="-L$ai_p $LIBXML_SHARED_LIBADD" test -n "$ld_runpath_switch" && LIBXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBXML_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -21598,74 +22116,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:21603: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $LIBXML_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:21630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF - + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h + + ext_builddir=ext/libxml ext_srcdir=$abs_srcdir/ext/libxml @@ -21673,15 +22186,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_LIBXML_SHARED=no - - + + case ext/libxml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -21694,12 +22207,12 @@ old_IFS=$IFS for ac_src in libxml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21723,14 +22236,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_LIBXML_SHARED=yes - + case ext/libxml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -21743,12 +22256,12 @@ old_IFS=$IFS for ac_src in libxml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_libxml="$shared_objects_libxml $ac_bdir$ac_obj.lo" case $ac_src in @@ -21766,7 +22279,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -21776,7 +22289,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLIBXML, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(LIBXML_SHARED_LIBADD)' ;; *) suffix=la @@ -21789,7 +22302,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibxml.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libxml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_LIBXML 1 -EOF +_ACEOF fi fi @@ -21851,15 +22365,15 @@ PHP_LIBXML_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/libxml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -21872,12 +22386,12 @@ old_IFS=$IFS for ac_src in libxml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21897,15 +22411,15 @@ EXT_STATIC="$EXT_STATIC libxml" ;; *) - - + + case ext/libxml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -21918,12 +22432,12 @@ old_IFS=$IFS for ac_src in libxml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -21944,45 +22458,45 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC libxml" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=libxml - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + for header_file in ext/libxml/php_libxml.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - - fi +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + + fi fi @@ -21990,14 +22504,14 @@ php_with_openssl=no -echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 -echo "configure:21995: checking for OpenSSL support" >&5 -# Check whether --with-openssl or --without-openssl was given. -if test "${with_openssl+set}" = set; then - withval="$with_openssl" - PHP_OPENSSL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5 +$as_echo_n "checking for OpenSSL support... " >&6; } + +# Check whether --with-openssl was given. +if test "${with_openssl+set}" = set; then : + withval=$with_openssl; PHP_OPENSSL=$withval else - + PHP_OPENSSL=no test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL @@ -22026,7 +22540,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -22034,28 +22549,29 @@ php_with_kerberos=no -echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 -echo "configure:22039: checking for Kerberos support" >&5 -# Check whether --with-kerberos or --without-kerberos was given. -if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" - PHP_KERBEROS=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5 +$as_echo_n "checking for Kerberos support... " >&6; } + +# Check whether --with-kerberos was given. +if test "${with_kerberos+set}" = set; then : + withval=$with_kerberos; PHP_KERBEROS=$withval else - + PHP_KERBEROS=no - + fi ext_output=$PHP_KERBEROS -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_OPENSSL" != "no"; then - + ext_builddir=ext/openssl ext_srcdir=$abs_srcdir/ext/openssl @@ -22063,15 +22579,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_OPENSSL_SHARED=no - - + + case ext/openssl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -22084,12 +22600,12 @@ old_IFS=$IFS for ac_src in openssl.c xp_ssl.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -22113,14 +22629,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_OPENSSL_SHARED=yes - + case ext/openssl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -22133,12 +22649,12 @@ old_IFS=$IFS for ac_src in openssl.c xp_ssl.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_openssl="$shared_objects_openssl $ac_bdir$ac_obj.lo" case $ac_src in @@ -22156,7 +22672,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -22166,7 +22682,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOPENSSL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(OPENSSL_SHARED_LIBADD)' ;; *) suffix=la @@ -22179,7 +22695,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpopenssl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_openssl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_OPENSSL 1 -EOF +_ACEOF fi fi @@ -22241,15 +22758,15 @@ PHP_OPENSSL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/openssl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -22262,12 +22779,12 @@ old_IFS=$IFS for ac_src in openssl.c xp_ssl.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -22287,15 +22804,15 @@ EXT_STATIC="$EXT_STATIC openssl" ;; *) - - + + case ext/openssl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -22308,12 +22825,12 @@ old_IFS=$IFS for ac_src in openssl.c xp_ssl.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -22334,25 +22851,25 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC openssl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=openssl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST OPENSSL_SHARED_LIBADD" if test "$PHP_KERBEROS" != "no"; then - + found_kerberos=no unset KERBEROS_CFLAGS unset KERBEROS_LIBS @@ -22360,40 +22877,46 @@ if test -z "$KRB5_CONFIG"; then # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:22365: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_KRB5_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$KRB5_CONFIG" in - /*) + case $KRB5_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no" ;; esac fi -KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG" +KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG if test -n "$KRB5_CONFIG"; then - echo "$ac_t""$KRB5_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5 +$as_echo "$KRB5_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then @@ -22402,17 +22925,17 @@ if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then found_kerberos=yes - + for ac_i in $KERBEROS_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -22423,20 +22946,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -22449,80 +22972,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $KERBEROS_CFLAGS; 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 @@ -22541,7 +23064,7 @@ fi for i in $PHP_KERBEROS; do - if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libkrb5.a; then PHP_KERBEROS_DIR=$i break fi @@ -22549,58 +23072,58 @@ if test "$PHP_KERBEROS_DIR"; then found_kerberos=yes - + if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" else - - - + + + 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 gssapi_krb5 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5" else - - + + case gssapi_krb5 in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lgssapi_krb5" + *) + LIBS="$LIBS -lgssapi_krb5" ;; esac @@ -22610,20 +23133,20 @@ esac - - + + case krb5 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5" else - - + + case krb5 in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lkrb5" + *) + LIBS="$LIBS -lkrb5" ;; esac @@ -22633,20 +23156,20 @@ esac - - + + case k5crypto in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto" else - - + + case k5crypto in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lk5crypto" + *) + LIBS="$LIBS -lk5crypto" ;; esac @@ -22656,20 +23179,20 @@ esac - - + + case com_err in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err" else - - + + case com_err in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lcom_err" + *) + LIBS="$LIBS -lcom_err" ;; esac @@ -22679,33 +23202,33 @@ esac - + if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then - + if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then ai_p=$PHP_KERBEROS_DIR/include else - + ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`" 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 @@ -22720,51 +23243,92 @@ fi - echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 -echo "configure:22725: checking for DSA_get_default_method in -lssl" >&5 -ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ssl_DSA_get_default_method+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -DSA_get_default_method() -; return 0; } -EOF -if { (eval echo configure:22744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char DSA_get_default_method (); +int +main () +{ +return DSA_get_default_method (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_DSA_get_default_method=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_ssl_DSA_get_default_method=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_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" = xyes; then : + +$as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DSA_DEFAULT_METHOD 1 -EOF + { $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 ${ac_cv_lib_crypto_X509_free+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char X509_free (); +int +main () +{ +return X509_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_X509_free=yes else - echo "$ac_t""no" 1>&6 + ac_cv_lib_crypto_X509_free=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_free" >&5 +$as_echo "$ac_cv_lib_crypto_X509_free" >&6; } +if test "x$ac_cv_lib_crypto_X509_free" = xyes; then : + +$as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h + fi - + found_openssl=no unset OPENSSL_INCDIR unset OPENSSL_LIBDIR @@ -22781,40 +23345,45 @@ 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 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:22786: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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="$ac_save_ifs" +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" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then @@ -22824,21 +23393,21 @@ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then - + for ac_i in $OPENSSL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -22849,20 +23418,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" + OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -22875,80 +23444,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $OPENSSL_INCS; 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 @@ -22961,7 +23530,7 @@ fi if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -22977,94 +23546,92 @@ done if test -z "$OPENSSL_INCDIR"; then - { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's " "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:22991: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for OpenSSL version... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if OPENSSL_VERSION_NUMBER >= 0x0090600fL yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t"">= 0.9.6" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5 +$as_echo ">= 0.9.6" >&6; } + else - rm -rf conftest* - - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - + + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + if test "$OPENSSL_INCDIR" != "/usr/include"; then - + if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_INCDIR else - + ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 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 - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -23075,20 +23642,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -23101,146 +23668,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:23148: checking for CRYPTO_free in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -CRYPTO_free() -; return 0; } -EOF -if { (eval echo configure:23167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char CRYPTO_free (); +int +main () +{ +return CRYPTO_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_CRYPTO_free=yes +else + ac_cv_lib_crypto_CRYPTO_free=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 +$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - - case crypto in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" - else - - - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; - esac - - - fi - ;; - esac - + : - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libcrypto not found!" "$LINENO" 5 + + fi old_LIBS=$LIBS LIBS="$LIBS -lcrypto" - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -23251,20 +23795,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -23277,117 +23821,141 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:23324: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SSL_CTX_set_ssl_version() -; return 0; } -EOF -if { (eval echo configure:23343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_ssl_version (); +int +main () +{ +return SSL_CTX_set_ssl_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes +else + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_openssl=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - - { echo "configure: error: libssl not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libssl not found!" "$LINENO" 5 + + fi LIBS=$old_LIBS - - + + case ssl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD" + OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD" else - - + + case ssl in c|c_r|pthread*) ;; - *) - LIBS="-lssl $LIBS" + *) + LIBS="-lssl $LIBS" + ;; + esac + + + fi + ;; + esac + + + + + case crypto in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" + else + + + case crypto in + c|c_r|pthread*) ;; + *) + LIBS="-lcrypto $LIBS" ;; esac @@ -23398,59 +23966,58 @@ - + if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - + if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_LIBDIR else - + ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" else - - - + + + 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 fi if test "$found_openssl" = "yes"; then OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - - cat >> confdefs.h <<\EOF -#define HAVE_OPENSSL_EXT 1 -EOF - -else - { echo "configure: error: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } - + +$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 + fi fi @@ -23461,14 +24028,14 @@ php_with_pcre_regex=yes -# Check whether --with-pcre-regex or --without-pcre-regex was given. -if test "${with_pcre_regex+set}" = set; then - withval="$with_pcre_regex" - PHP_PCRE_REGEX=$withval + +# Check whether --with-pcre-regex was given. +if test "${with_pcre_regex+set}" = set; then : + withval=$with_pcre_regex; PHP_PCRE_REGEX=$withval else - + PHP_PCRE_REGEX=yes - + fi @@ -23480,127 +24047,128 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then - echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6 -echo "configure:23485: checking for PCRE headers location" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE headers location" >&5 +$as_echo_n "checking for PCRE headers location... " >&6; } for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done if test -z "$PCRE_INCDIR"; then - { echo "configure: error: Could not find pcre.h in $PHP_PCRE_REGEX" 1>&2; exit 1; } + as_fn_error $? "Could not find pcre.h in $PHP_PCRE_REGEX" "$LINENO" 5 fi - echo "$ac_t""$PCRE_INCDIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_INCDIR" >&5 +$as_echo "$PCRE_INCDIR" >&6; } - echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6 -echo "configure:23496: checking for PCRE library location" >&5 - for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library location" >&5 +$as_echo_n "checking for PCRE library location... " >&6; } + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done - + if test -z "$PCRE_LIBDIR" ; then - { echo "configure: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" 1>&2; exit 1; } + as_fn_error $? "Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" "$LINENO" 5 fi - echo "$ac_t""$PCRE_LIBDIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_LIBDIR" >&5 +$as_echo "$PCRE_LIBDIR" >&6; } + - pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` pcre_minor=`grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` - + pcre_minor_length=`echo "$pcre_minor" | wc -c | sed -e 's/^0-9//g'` if test "$pcre_minor_length" -eq 2 ; then pcre_minor="$pcre_minor"0 fi pcre_version=$pcre_major$pcre_minor if test "$pcre_version" -lt 660; then - { echo "configure: error: The PCRE extension requires PCRE library version >= 6.6" 1>&2; exit 1; } + as_fn_error $? "The PCRE extension requires PCRE library version >= 6.6" "$LINENO" 5 fi - + if test -n "$PCRE_LIBDIR"; then - + if test "$PCRE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PCRE_LIBDIR" != "/usr/lib"; then - + if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PCRE_LIBDIR else - + ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PCRE_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 pcre in c|c_r|pthread*) ;; - *) - LIBS="-lpcre $LIBS" + *) + LIBS="-lpcre $LIBS" ;; esac - - cat >> confdefs.h <<\EOF -#define HAVE_PCRE 1 -EOF - + +$as_echo "#define HAVE_PCRE 1" >>confdefs.h + + if test "$PCRE_INCDIR" != "/usr/include"; then - + if test -z "$PCRE_INCDIR" || echo "$PCRE_INCDIR" | grep '^/' >/dev/null ; then ai_p=$PCRE_INCDIR else - + ep_dir="`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PCRE_INCDIR\"`" 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 - + ext_builddir=ext/pcre ext_srcdir=$abs_srcdir/ext/pcre @@ -23608,15 +24176,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_PCRE_SHARED=no - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -23629,12 +24197,12 @@ old_IFS=$IFS for ac_src in php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -23658,14 +24226,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_PCRE_SHARED=yes - + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -23678,12 +24246,12 @@ old_IFS=$IFS for ac_src in php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo" case $ac_src in @@ -23701,7 +24269,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -23711,7 +24279,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_SHARED_LIBADD)' ;; *) suffix=la @@ -23724,7 +24292,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PCRE 1 -EOF +_ACEOF fi fi @@ -23786,15 +24355,15 @@ PHP_PCRE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -23807,12 +24376,12 @@ old_IFS=$IFS for ac_src in php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -23832,15 +24401,15 @@ EXT_STATIC="$EXT_STATIC pcre" ;; *) - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -23853,12 +24422,12 @@ old_IFS=$IFS for ac_src in php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -23879,43 +24448,44 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pcre" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pcre - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + header_path=ext/pcre for header_file in php_pcre.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + else - echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6 -echo "configure:23918: checking for PCRE library to use" >&5 - echo "$ac_t""bundled" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5 +$as_echo_n "checking for PCRE library to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5 +$as_echo "bundled" >&6; } pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \ pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c \ @@ -23923,7 +24493,7 @@ pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \ pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \ pcrelib/pcre_version.c pcrelib/pcre_xclass.c" - + ext_builddir=ext/pcre ext_srcdir=$abs_srcdir/ext/pcre @@ -23931,15 +24501,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_PCRE_SHARED=no - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -23952,12 +24522,12 @@ old_IFS=$IFS for ac_src in $pcrelib_sources php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -23981,14 +24551,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_PCRE_SHARED=yes - + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -24001,12 +24571,12 @@ old_IFS=$IFS for ac_src in $pcrelib_sources php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo" case $ac_src in @@ -24024,7 +24594,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -24034,7 +24604,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_SHARED_LIBADD)' ;; *) suffix=la @@ -24047,7 +24617,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PCRE 1 -EOF +_ACEOF fi fi @@ -24109,15 +24680,15 @@ PHP_PCRE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -24130,12 +24701,12 @@ old_IFS=$IFS for ac_src in $pcrelib_sources php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -24155,15 +24726,15 @@ EXT_STATIC="$EXT_STATIC pcre" ;; *) - - + + case ext/pcre in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -24176,12 +24747,12 @@ old_IFS=$IFS for ac_src in $pcrelib_sources php_pcre.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -24202,47 +24773,46 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pcre" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pcre - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/pcrelib" - - - + + + header_path=ext/pcre for header_file in php_pcre.h pcrelib/; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + - cat >> confdefs.h <<\EOF -#define HAVE_BUNDLED_PCRE 1 -EOF + +$as_echo "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h fi @@ -24250,14 +24820,14 @@ php_with_sqlite3=yes -echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6 -echo "configure:24255: checking whether to enable the SQLite3 extension" >&5 -# Check whether --with-sqlite3 or --without-sqlite3 was given. -if test "${with_sqlite3+set}" = set; then - withval="$with_sqlite3" - PHP_SQLITE3=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5 +$as_echo_n "checking whether to enable the SQLite3 extension... " >&6; } + +# Check whether --with-sqlite3 was given. +if test "${with_sqlite3+set}" = set; then : + withval=$with_sqlite3; PHP_SQLITE3=$withval else - + PHP_SQLITE3=yes test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL @@ -24286,7 +24856,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -24305,42 +24876,44 @@ fi if test $PHP_SQLITE3 != "yes"; then - echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 -echo "configure:24310: checking for sqlite3 files in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 files in default path" >&5 +$as_echo_n "checking for sqlite3 files in default path... " >&6; } for i in $PHP_SQLITE3 /usr/local /usr; do if test -r $i/include/sqlite3.h; then SQLITE3_DIR=$i - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } break fi done if test -z "$SQLITE3_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } + { $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 fi - echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6 -echo "configure:24325: checking for SQLite 3.3.9+" >&5 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite 3.3.9+" >&5 +$as_echo_n "checking for SQLite 3.3.9+... " >&6; } + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$SQLITE3_DIR/$PHP_LIBDIR -lm " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -24351,20 +24924,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -24377,176 +24950,179 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24424: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 -ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -sqlite3_prepare_v2() -; return 0; } -EOF -if { (eval echo configure:24443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_prepare_v2 (); +int +main () +{ +return sqlite3_prepare_v2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_sqlite3_sqlite3_prepare_v2=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - echo "$ac_t""found" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + if test "$ext_shared" = "yes"; then SQLITE3_SHARED_LIBADD="-lsqlite3 $SQLITE3_SHARED_LIBADD" if test -n "$SQLITE3_DIR/$PHP_LIBDIR"; then - + if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SQLITE3_DIR/$PHP_LIBDIR else - + ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SQLITE3_SHARED_LIBADD="-L$ai_p $SQLITE3_SHARED_LIBADD" test -n "$ld_runpath_switch" && SQLITE3_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE3_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$SQLITE3_DIR/$PHP_LIBDIR"; then - + if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SQLITE3_DIR/$PHP_LIBDIR else - + ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$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 sqlite3 in c|c_r|pthread*) ;; - *) - LIBS="-lsqlite3 $LIBS" + *) + LIBS="-lsqlite3 $LIBS" ;; esac @@ -24556,70 +25132,70 @@ fi - + if test "$SQLITE3_DIR/include" != "/usr/include"; then - + if test -z "$SQLITE3_DIR/include" || echo "$SQLITE3_DIR/include" | grep '^/' >/dev/null ; then ai_p=$SQLITE3_DIR/include else - + ep_dir="`echo $SQLITE3_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/include\"`" 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 - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_prepare_v2 - - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" 1>&2; exit 1; } - - + + { $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 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -24630,20 +25206,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -24656,121 +25232,121 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24703: checking for sqlite3_key in -lsqlite3" >&5 -ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -sqlite3_key() -; return 0; } -EOF -if { (eval echo configure:24722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_key (); +int +main () +{ +return sqlite3_key (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite3_sqlite3_key=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_sqlite3_sqlite3_key=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_SQLITE3_KEY 1 -EOF - - + +$as_echo "#define HAVE_SQLITE3_KEY 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_key - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -24781,20 +25357,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -24807,107 +25383,108 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6 -echo "configure:24854: checking for sqlite3_load_extension in -lsqlite3" >&5 -ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -sqlite3_load_extension() -; return 0; } -EOF -if { (eval echo configure:24873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_load_extension (); +int +main () +{ +return sqlite3_load_extension (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite3_sqlite3_load_extension=yes +else + ac_cv_lib_sqlite3_sqlite3_load_extension=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_load_extension - cat >> confdefs.h <<\EOF -#define SQLITE_OMIT_LOAD_EXTENSION 1 -EOF - - +$as_echo "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h + + + fi else - echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6 -echo "configure:24910: checking bundled sqlite3 library" >&5 - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking bundled sqlite3 library" >&5 +$as_echo_n "checking bundled sqlite3 library... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } sqlite3_extra_sources="libsqlite/sqlite3.c" @@ -24928,34 +25505,33 @@ fi PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" - - + + for header_file in ext/sqlite3/libsqlite/sqlite3.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + fi - cat >> confdefs.h <<\EOF -#define HAVE_SQLITE3 1 -EOF + +$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h sqlite3_sources="sqlite3.c $sqlite3_extra_sources" - + ext_builddir=ext/sqlite3 ext_srcdir=$abs_srcdir/ext/sqlite3 @@ -24963,15 +25539,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SQLITE3_SHARED=no - - + + case ext/sqlite3 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -24984,12 +25560,12 @@ old_IFS=$IFS for ac_src in $sqlite3_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25013,14 +25589,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SQLITE3_SHARED=yes - + case ext/sqlite3 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -25033,12 +25609,12 @@ old_IFS=$IFS for ac_src in $sqlite3_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sqlite3="$shared_objects_sqlite3 $ac_bdir$ac_obj.lo" case $ac_src in @@ -25056,7 +25632,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -25066,7 +25642,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE3, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(SQLITE3_SHARED_LIBADD)' ;; *) suffix=la @@ -25079,7 +25655,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite3.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite3" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SQLITE3 1 -EOF +_ACEOF fi fi @@ -25141,15 +25718,15 @@ PHP_SQLITE3_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sqlite3 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25162,12 +25739,12 @@ old_IFS=$IFS for ac_src in $sqlite3_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25187,15 +25764,15 @@ EXT_STATIC="$EXT_STATIC sqlite3" ;; *) - - + + case ext/sqlite3 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25208,12 +25785,12 @@ old_IFS=$IFS for ac_src in $sqlite3_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25234,25 +25811,25 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite3" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sqlite3 - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE3_SHARED_LIBADD" fi @@ -25261,14 +25838,14 @@ php_with_zlib=no -echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 -echo "configure:25266: checking for ZLIB support" >&5 -# Check whether --with-zlib or --without-zlib was given. -if test "${with_zlib+set}" = set; then - withval="$with_zlib" - PHP_ZLIB=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5 +$as_echo_n "checking for ZLIB support... " >&6; } + +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; PHP_ZLIB=$withval else - + PHP_ZLIB=no test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL @@ -25297,7 +25874,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -25305,28 +25883,29 @@ php_with_zlib_dir=no -echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 -echo "configure:25310: checking if the location of ZLIB install directory is defined" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the location of ZLIB install directory is defined" >&5 +$as_echo_n "checking if the location of ZLIB install directory is defined... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then - + ext_builddir=ext/zlib ext_srcdir=$abs_srcdir/ext/zlib @@ -25334,15 +25913,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_ZLIB_SHARED=no - - + + case ext/zlib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25355,12 +25934,12 @@ old_IFS=$IFS for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25384,14 +25963,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_ZLIB_SHARED=yes - + case ext/zlib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -25404,12 +25983,12 @@ old_IFS=$IFS for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_zlib="$shared_objects_zlib $ac_bdir$ac_obj.lo" case $ac_src in @@ -25427,7 +26006,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -25437,7 +26016,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZLIB, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(ZLIB_SHARED_LIBADD)' ;; *) suffix=la @@ -25450,7 +26029,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzlib.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zlib" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_ZLIB 1 -EOF +_ACEOF fi fi @@ -25512,15 +26092,15 @@ PHP_ZLIB_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/zlib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25533,12 +26113,12 @@ old_IFS=$IFS for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25558,15 +26138,15 @@ EXT_STATIC="$EXT_STATIC zlib" ;; *) - - + + case ext/zlib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25579,12 +26159,12 @@ old_IFS=$IFS for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -25605,24 +26185,24 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC zlib" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=zlib - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST ZLIB_SHARED_LIBADD" - - if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then + + if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then if test -f $PHP_ZLIB/include/zlib/zlib.h; then ZLIB_DIR=$PHP_ZLIB ZLIB_INCDIR=$ZLIB_DIR/include/zlib @@ -25630,7 +26210,7 @@ ZLIB_DIR=$PHP_ZLIB ZLIB_INCDIR=$ZLIB_DIR/include fi - else + else for i in /usr/local /usr $PHP_ZLIB_DIR; do if test -f $i/include/zlib/zlib.h; then ZLIB_DIR=$i @@ -25641,35 +26221,35 @@ fi done fi - + if test -z "$ZLIB_DIR"; then - { echo "configure: error: Cannot find libz" 1>&2; exit 1; } + as_fn_error $? "Cannot find libz" "$LINENO" 5 fi case $ZLIB_DIR in - /usr) ac_extra= ;; + /usr) ac_extra= ;; *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; esac - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $ac_extra " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -25680,20 +26260,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -25706,160 +26286,160 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 -echo "configure:25753: checking for gzgets in -lz" >&5 -ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 +$as_echo_n "checking for gzgets in -lz... " >&6; } +if ${ac_cv_lib_z_gzgets+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gzgets() -; return 0; } -EOF -if { (eval echo configure:25772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gzgets (); +int +main () +{ +return gzgets (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_gzgets=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_z_gzgets=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_ZLIB 1 -EOF - - - + + +$as_echo "#define HAVE_ZLIB 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_z_gzgets - - { echo "configure: error: ZLIB extension requires zlib >= 1.0.9" 1>&2; exit 1; } - - + + as_fn_error $? "ZLIB extension requires zlib >= 1.0.9" "$LINENO" 5 + + fi - + if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then ZLIB_SHARED_LIBADD="-L$ai_p $ZLIB_SHARED_LIBADD" test -n "$ld_runpath_switch" && ZLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZLIB_SHARED_LIBADD" else - - - + + + 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 PHP_ZLIB_DIR=$ZLIB_DIR - - + + case z in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD" + ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD" else - - + + case z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -25869,33 +26449,33 @@ esac - + if test "$ZLIB_INCDIR" != "/usr/include"; then - + if test -z "$ZLIB_INCDIR" || echo "$ZLIB_INCDIR" | grep '^/' >/dev/null ; then ai_p=$ZLIB_INCDIR else - + ep_dir="`echo $ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ZLIB_INCDIR\"`" 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 @@ -25907,14 +26487,13 @@ php_enable_bcmath=no -echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 -echo "configure:25912: checking whether to enable bc style precision math functions" >&5 -# Check whether --enable-bcmath or --disable-bcmath was given. -if test "${enable_bcmath+set}" = set; then - enableval="$enable_bcmath" - PHP_BCMATH=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5 +$as_echo_n "checking whether to enable bc style precision math functions... " >&6; } +# Check whether --enable-bcmath was given. +if test "${enable_bcmath+set}" = set; then : + enableval=$enable_bcmath; PHP_BCMATH=$enableval else - + PHP_BCMATH=no test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL @@ -25943,13 +26522,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_BCMATH" != "no"; then - + ext_builddir=ext/bcmath ext_srcdir=$abs_srcdir/ext/bcmath @@ -25957,15 +26537,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_BCMATH_SHARED=no - - + + case ext/bcmath in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -25982,12 +26562,12 @@ libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26011,14 +26591,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_BCMATH_SHARED=yes - + case ext/bcmath in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -26035,12 +26615,12 @@ libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo" case $ac_src in @@ -26058,7 +26638,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -26068,7 +26648,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(BCMATH_SHARED_LIBADD)' ;; *) suffix=la @@ -26081,7 +26661,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_BCMATH 1 -EOF +_ACEOF fi fi @@ -26143,15 +26724,15 @@ PHP_BCMATH_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/bcmath in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26168,12 +26749,12 @@ libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26193,15 +26774,15 @@ EXT_STATIC="$EXT_STATIC bcmath" ;; *) - - + + case ext/bcmath in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26218,12 +26799,12 @@ libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26244,27 +26825,26 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=bcmath - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" - - cat >> confdefs.h <<\EOF -#define HAVE_BCMATH 1 -EOF + + +$as_echo "#define HAVE_BCMATH 1" >>confdefs.h fi @@ -26272,14 +26852,14 @@ php_with_bz2=no -echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 -echo "configure:26277: checking for BZip2 support" >&5 -# Check whether --with-bz2 or --without-bz2 was given. -if test "${with_bz2+set}" = set; then - withval="$with_bz2" - PHP_BZ2=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5 +$as_echo_n "checking for BZip2 support... " >&6; } + +# Check whether --with-bz2 was given. +if test "${with_bz2+set}" = set; then : + withval=$with_bz2; PHP_BZ2=$withval else - + PHP_BZ2=no test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL @@ -26308,7 +26888,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -26317,41 +26898,43 @@ if test -r $PHP_BZ2/include/bzlib.h; then BZIP_DIR=$PHP_BZ2 else - echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -echo "configure:26322: checking for BZip2 in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5 +$as_echo_n "checking for BZip2 in default path... " >&6; } for i in /usr/local /usr; do if test -r $i/include/bzlib.h; then BZIP_DIR=$i - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } break fi done fi if test -z "$BZIP_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; } + { $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 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$BZIP_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -26362,20 +26945,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -26388,206 +26971,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -echo "configure:26435: checking for BZ2_bzerror in -lbz2" >&5 -ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_bz2_BZ2_bzerror+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbz2 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -BZ2_bzerror() -; return 0; } -EOF -if { (eval echo configure:26454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char BZ2_bzerror (); +int +main () +{ +return BZ2_bzerror (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bz2_BZ2_bzerror=yes +else + ac_cv_lib_bz2_BZ2_bzerror=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5 +$as_echo "$ac_cv_lib_bz2_BZ2_bzerror" >&6; } +if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$BZIP_DIR/include" != "/usr/include"; then - + if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then ai_p=$BZIP_DIR/include else - + ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD" if test -n "$BZIP_DIR/$PHP_LIBDIR"; then - + if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$BZIP_DIR/$PHP_LIBDIR else - + ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD" test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$BZIP_DIR/$PHP_LIBDIR"; then - + if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$BZIP_DIR/$PHP_LIBDIR else - + ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$BZIP_DIR/$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 bz2 in c|c_r|pthread*) ;; - *) - LIBS="-lbz2 $LIBS" + *) + LIBS="-lbz2 $LIBS" ;; esac @@ -26597,26 +27182,24 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_BZ2 1 -EOF - - +$as_echo "#define HAVE_BZ2 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_bz2_BZ2_bzerror - - { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; } - - + + as_fn_error $? "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5 + + fi - + ext_builddir=ext/bz2 ext_srcdir=$abs_srcdir/ext/bz2 @@ -26624,15 +27207,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_BZ2_SHARED=no - - + + case ext/bz2 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26645,12 +27228,12 @@ old_IFS=$IFS for ac_src in bz2.c bz2_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26674,14 +27257,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_BZ2_SHARED=yes - + case ext/bz2 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -26694,12 +27277,12 @@ old_IFS=$IFS for ac_src in bz2.c bz2_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo" case $ac_src in @@ -26717,7 +27300,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -26727,7 +27310,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBZ2, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(BZ2_SHARED_LIBADD)' ;; *) suffix=la @@ -26740,7 +27323,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_BZ2 1 -EOF +_ACEOF fi fi @@ -26802,15 +27386,15 @@ PHP_BZ2_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/bz2 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26823,12 +27407,12 @@ old_IFS=$IFS for ac_src in bz2.c bz2_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26848,15 +27432,15 @@ EXT_STATIC="$EXT_STATIC bz2" ;; *) - - + + case ext/bz2 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26869,12 +27453,12 @@ old_IFS=$IFS for ac_src in bz2.c bz2_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -26895,20 +27479,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC bz2" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=bz2 - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD" fi @@ -26917,14 +27501,13 @@ php_enable_calendar=no -echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 -echo "configure:26922: checking whether to enable calendar conversion support" >&5 -# Check whether --enable-calendar or --disable-calendar was given. -if test "${enable_calendar+set}" = set; then - enableval="$enable_calendar" - PHP_CALENDAR=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5 +$as_echo_n "checking whether to enable calendar conversion support... " >&6; } +# Check whether --enable-calendar was given. +if test "${enable_calendar+set}" = set; then : + enableval=$enable_calendar; PHP_CALENDAR=$enableval else - + PHP_CALENDAR=no test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL @@ -26953,17 +27536,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_CALENDAR" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_CALENDAR 1 -EOF - +$as_echo "#define HAVE_CALENDAR 1" >>confdefs.h + + ext_builddir=ext/calendar ext_srcdir=$abs_srcdir/ext/calendar @@ -26971,15 +27554,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_CALENDAR_SHARED=no - - + + case ext/calendar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -26992,12 +27575,12 @@ old_IFS=$IFS for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27021,14 +27604,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_CALENDAR_SHARED=yes - + case ext/calendar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -27041,12 +27624,12 @@ old_IFS=$IFS for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo" case $ac_src in @@ -27064,7 +27647,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -27074,7 +27657,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(CALENDAR_SHARED_LIBADD)' ;; *) suffix=la @@ -27087,7 +27670,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_CALENDAR 1 -EOF +_ACEOF fi fi @@ -27149,15 +27733,15 @@ PHP_CALENDAR_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/calendar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -27170,12 +27754,12 @@ old_IFS=$IFS for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27195,15 +27779,15 @@ EXT_STATIC="$EXT_STATIC calendar" ;; *) - - + + case ext/calendar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -27216,12 +27800,12 @@ old_IFS=$IFS for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27242,15 +27826,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=calendar - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -27261,14 +27845,13 @@ php_enable_ctype=yes -echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 -echo "configure:27266: checking whether to enable ctype functions" >&5 -# Check whether --enable-ctype or --disable-ctype was given. -if test "${enable_ctype+set}" = set; then - enableval="$enable_ctype" - PHP_CTYPE=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5 +$as_echo_n "checking whether to enable ctype functions... " >&6; } +# Check whether --enable-ctype was given. +if test "${enable_ctype+set}" = set; then : + enableval=$enable_ctype; PHP_CTYPE=$enableval else - + PHP_CTYPE=yes test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL @@ -27297,17 +27880,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_CTYPE" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_CTYPE 1 -EOF - +$as_echo "#define HAVE_CTYPE 1" >>confdefs.h + + ext_builddir=ext/ctype ext_srcdir=$abs_srcdir/ext/ctype @@ -27315,15 +27898,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_CTYPE_SHARED=no - - + + case ext/ctype in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -27336,12 +27919,12 @@ old_IFS=$IFS for ac_src in ctype.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27365,14 +27948,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_CTYPE_SHARED=yes - + case ext/ctype in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -27385,12 +27968,12 @@ old_IFS=$IFS for ac_src in ctype.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo" case $ac_src in @@ -27408,7 +27991,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -27418,7 +28001,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(CTYPE_SHARED_LIBADD)' ;; *) suffix=la @@ -27431,7 +28014,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_CTYPE 1 -EOF +_ACEOF fi fi @@ -27493,15 +28077,15 @@ PHP_CTYPE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/ctype in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -27514,12 +28098,12 @@ old_IFS=$IFS for ac_src in ctype.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27539,15 +28123,15 @@ EXT_STATIC="$EXT_STATIC ctype" ;; *) - - + + case ext/ctype in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -27560,12 +28144,12 @@ old_IFS=$IFS for ac_src in ctype.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -27586,15 +28170,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC ctype" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=ctype - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -27605,14 +28189,14 @@ php_with_curl=no -echo $ac_n "checking for cURL support""... $ac_c" 1>&6 -echo "configure:27610: checking for cURL support" >&5 -# Check whether --with-curl or --without-curl was given. -if test "${with_curl+set}" = set; then - withval="$with_curl" - PHP_CURL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5 +$as_echo_n "checking for cURL support... " >&6; } + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then : + withval=$with_curl; PHP_CURL=$withval else - + PHP_CURL=no test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL @@ -27641,7 +28225,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -27649,22 +28234,23 @@ php_with_curlwrappers=no -echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 -echo "configure:27654: checking if we should use cURL for url streams" >&5 -# Check whether --with-curlwrappers or --without-curlwrappers was given. -if test "${with_curlwrappers+set}" = set; then - withval="$with_curlwrappers" - PHP_CURLWRAPPERS=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use cURL for url streams" >&5 +$as_echo_n "checking if we should use cURL for url streams... " >&6; } + +# Check whether --with-curlwrappers was given. +if test "${with_curlwrappers+set}" = set; then : + withval=$with_curlwrappers; PHP_CURLWRAPPERS=$withval else - + PHP_CURLWRAPPERS=no - + fi ext_output=$PHP_CURLWRAPPERS -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -27673,26 +28259,28 @@ if test -r $PHP_CURL/include/curl/easy.h; then CURL_DIR=$PHP_CURL else - echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 -echo "configure:27678: checking for cURL in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL in default path" >&5 +$as_echo_n "checking for cURL in default path... " >&6; } for i in /usr/local /usr; do if test -r $i/include/curl/easy.h; then CURL_DIR=$i - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } break fi done fi if test -z "$CURL_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the libcurl distribution - - easy.h should be in /include/curl/" 1>&2; exit 1; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + as_fn_error $? "Please reinstall the libcurl distribution - + easy.h should be in /include/curl/" "$LINENO" 5 fi CURL_CONFIG="curl-config" - echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 -echo "configure:27696: checking for cURL 7.10.5 or greater" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL 7.10.5 or greater" >&5 +$as_echo_n "checking for cURL 7.10.5 or greater... " >&6; } if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then CURL_CONFIG=${CURL_DIR}/bin/curl-config @@ -27705,54 +28293,55 @@ curl_version_full=`$CURL_CONFIG --version` curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` if test "$curl_version" -ge 7010005; then - echo "$ac_t""$curl_version_full" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curl_version_full" >&5 +$as_echo "$curl_version_full" >&6; } CURL_LIBS=`$CURL_CONFIG --libs` else - { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; } + as_fn_error $? "cURL version 7.10.5 or later is required to compile php with cURL support" "$LINENO" 5 fi - + if test "$CURL_DIR/include" != "/usr/include"; then - + if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then ai_p=$CURL_DIR/include else - + ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" 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 - + for ac_i in $CURL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -27763,20 +28352,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" + CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -27789,136 +28378,136 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + if test "$ext_shared" = "yes"; then CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD" if test -n "$CURL_DIR/$PHP_LIBDIR"; then - + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$CURL_DIR/$PHP_LIBDIR else - + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$CURL_DIR/$PHP_LIBDIR"; then - + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$CURL_DIR/$PHP_LIBDIR else - + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$CURL_DIR/$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 curl in c|c_r|pthread*) ;; - *) - LIBS="-lcurl $LIBS" + *) + LIBS="-lcurl $LIBS" ;; esac @@ -27928,110 +28517,167 @@ fi - - echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -echo "configure:27934: checking for SSL support in libcurl" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5 +$as_echo_n "checking for SSL support in libcurl... " >&6; } CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` if test "$CURL_SSL" = "SSL"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_CURL_SSL 1 -EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_CURL_SSL 1" >>confdefs.h + - save_CFLAGS="$CFLAGS" CFLAGS="`$CURL_CONFIG --cflags`" - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:27947: checking how to run the C preprocessor" >&5 + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_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; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:27968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:27985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:28002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f conftest* +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break fi -rm -f conftest* + + done + ac_cv_prog_CPP=$CPP + fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP fi - CPP="$ac_cv_prog_CPP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - ac_cv_prog_CPP="$CPP" + # Passes both tests. +ac_preproc_ok=: +break fi -echo "$ac_t""$CPP" 1>&6 +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : - echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -echo "configure:28027: checking for openssl support in libcurl" >&5 - if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 - else - cat > conftest.$ac_ext <&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; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl support in libcurl" >&5 +$as_echo_n "checking for openssl support in libcurl... " >&6; } + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include @@ -28047,87 +28693,57 @@ } return 1; } - -EOF -if { (eval echo configure:28053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 - for ac_hdr in openssl/crypto.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:28061: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:28071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_CURL_OPENSSL 1 -EOF - -else - echo "$ac_t""no" 1>&6 +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_CRYPTO_H 1 +_ACEOF + + +$as_echo "#define HAVE_CURL_OPENSSL 1" >>confdefs.h + + fi + done - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - - echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -echo "configure:28116: checking for gnutls support in libcurl" >&5 - if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls support in libcurl" >&5 +$as_echo_n "checking for gnutls support in libcurl... " >&6; } + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include int main(int argc, char *argv[]) { curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); - + if (data && data->ssl_version && *data->ssl_version) { const char *ptr = data->ssl_version; @@ -28137,86 +28753,58 @@ return 1; } -EOF -if { (eval echo configure:28142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -echo "configure:28148: checking for gcrypt.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:28158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_CURL_GNUTLS 1 -EOF +_ACEOF +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" = xyes; then : + + +$as_echo "#define HAVE_CURL_GNUTLS 1" >>confdefs.h + - -else - echo "$ac_t""no" 1>&6 fi - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + CFLAGS="$save_CFLAGS" else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -28227,20 +28815,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -28253,125 +28841,125 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -echo "configure:28300: checking for curl_easy_perform in -lcurl" >&5 -ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_curl_curl_easy_perform+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -curl_easy_perform() -; return 0; } -EOF -if { (eval echo configure:28319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_perform (); +int +main () +{ +return curl_easy_perform (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_easy_perform=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_curl_curl_easy_perform=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_CURL 1 -EOF - - + +$as_echo "#define HAVE_CURL 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_easy_perform - - { echo "configure: error: There is something wrong. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "There is something wrong. Please check config.log for more information." "$LINENO" 5 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -28382,20 +28970,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -28408,123 +28996,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 -echo "configure:28455: checking for curl_version_info in -lcurl" >&5 -ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_version_info in -lcurl" >&5 +$as_echo_n "checking for curl_version_info in -lcurl... " >&6; } +if ${ac_cv_lib_curl_curl_version_info+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -curl_version_info() -; return 0; } -EOF -if { (eval echo configure:28474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_version_info (); +int +main () +{ +return curl_version_info (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_version_info=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_curl_curl_version_info=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_version_info" >&5 +$as_echo "$ac_cv_lib_curl_curl_version_info" >&6; } +if test "x$ac_cv_lib_curl_curl_version_info" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_CURL_VERSION_INFO 1 -EOF - - + +$as_echo "#define HAVE_CURL_VERSION_INFO 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_version_info - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -28535,20 +29123,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -28561,123 +29149,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:28608: checking for curl_easy_strerror in -lcurl" >&5 -ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_curl_curl_easy_strerror+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -curl_easy_strerror() -; return 0; } -EOF -if { (eval echo configure:28627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_strerror (); +int +main () +{ +return curl_easy_strerror (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_easy_strerror=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_curl_curl_easy_strerror=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_CURL_EASY_STRERROR 1 -EOF - - + +$as_echo "#define HAVE_CURL_EASY_STRERROR 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_easy_strerror - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -28688,20 +29276,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -28714,112 +29302,111 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:28761: checking for curl_multi_strerror in -lcurl" >&5 -ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_curl_curl_multi_strerror+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -curl_multi_strerror() -; return 0; } -EOF -if { (eval echo configure:28780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_multi_strerror (); +int +main () +{ +return curl_multi_strerror (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_multi_strerror=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_curl_curl_multi_strerror=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_CURL_MULTI_STRERROR 1 -EOF - - + +$as_echo "#define HAVE_CURL_MULTI_STRERROR 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_multi_strerror - - + + fi if test "$PHP_CURLWRAPPERS" != "no" ; then - cat >> confdefs.h <<\EOF -#define PHP_CURL_URL_WRAPPERS 1 -EOF + +$as_echo "#define PHP_CURL_URL_WRAPPERS 1" >>confdefs.h fi - + ext_builddir=ext/curl ext_srcdir=$abs_srcdir/ext/curl @@ -28827,15 +29414,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_CURL_SHARED=no - - + + case ext/curl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -28848,12 +29435,12 @@ old_IFS=$IFS for ac_src in interface.c multi.c streams.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -28877,14 +29464,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_CURL_SHARED=yes - + case ext/curl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -28897,12 +29484,12 @@ old_IFS=$IFS for ac_src in interface.c multi.c streams.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_curl="$shared_objects_curl $ac_bdir$ac_obj.lo" case $ac_src in @@ -28920,7 +29507,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -28930,7 +29517,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCURL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(CURL_SHARED_LIBADD)' ;; *) suffix=la @@ -28943,7 +29530,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcurl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_curl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_CURL 1 -EOF +_ACEOF fi fi @@ -29005,15 +29593,15 @@ PHP_CURL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/curl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -29026,12 +29614,12 @@ old_IFS=$IFS for ac_src in interface.c multi.c streams.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -29051,15 +29639,15 @@ EXT_STATIC="$EXT_STATIC curl" ;; *) - - + + case ext/curl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -29072,12 +29660,12 @@ old_IFS=$IFS for ac_src in interface.c multi.c streams.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -29098,20 +29686,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC curl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=curl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST CURL_SHARED_LIBADD" fi @@ -29135,12 +29723,11 @@ php_enable_dba=no -# Check whether --enable-dba or --disable-dba was given. -if test "${enable_dba+set}" = set; then - enableval="$enable_dba" - PHP_DBA=$enableval +# Check whether --enable-dba was given. +if test "${enable_dba+set}" = set; then : + enableval=$enable_dba; PHP_DBA=$enableval else - + PHP_DBA=no test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL @@ -29178,14 +29765,14 @@ php_with_qdbm=no -# Check whether --with-qdbm or --without-qdbm was given. -if test "${with_qdbm+set}" = set; then - withval="$with_qdbm" - PHP_QDBM=$withval + +# Check whether --with-qdbm was given. +if test "${with_qdbm+set}" = set; then : + withval=$with_qdbm; PHP_QDBM=$withval else - + PHP_QDBM=no - + fi @@ -29200,14 +29787,14 @@ php_with_gdbm=no -# Check whether --with-gdbm or --without-gdbm was given. -if test "${with_gdbm+set}" = set; then - withval="$with_gdbm" - PHP_GDBM=$withval + +# Check whether --with-gdbm was given. +if test "${with_gdbm+set}" = set; then : + withval=$with_gdbm; PHP_GDBM=$withval else - + PHP_GDBM=no - + fi @@ -29222,14 +29809,14 @@ php_with_ndbm=no -# Check whether --with-ndbm or --without-ndbm was given. -if test "${with_ndbm+set}" = set; then - withval="$with_ndbm" - PHP_NDBM=$withval + +# Check whether --with-ndbm was given. +if test "${with_ndbm+set}" = set; then : + withval=$with_ndbm; PHP_NDBM=$withval else - + PHP_NDBM=no - + fi @@ -29244,14 +29831,14 @@ php_with_db4=no -# Check whether --with-db4 or --without-db4 was given. -if test "${with_db4+set}" = set; then - withval="$with_db4" - PHP_DB4=$withval + +# Check whether --with-db4 was given. +if test "${with_db4+set}" = set; then : + withval=$with_db4; PHP_DB4=$withval else - + PHP_DB4=no - + fi @@ -29266,14 +29853,14 @@ php_with_db3=no -# Check whether --with-db3 or --without-db3 was given. -if test "${with_db3+set}" = set; then - withval="$with_db3" - PHP_DB3=$withval + +# Check whether --with-db3 was given. +if test "${with_db3+set}" = set; then : + withval=$with_db3; PHP_DB3=$withval else - + PHP_DB3=no - + fi @@ -29288,14 +29875,14 @@ php_with_db2=no -# Check whether --with-db2 or --without-db2 was given. -if test "${with_db2+set}" = set; then - withval="$with_db2" - PHP_DB2=$withval + +# Check whether --with-db2 was given. +if test "${with_db2+set}" = set; then : + withval=$with_db2; PHP_DB2=$withval else - + PHP_DB2=no - + fi @@ -29310,14 +29897,14 @@ php_with_db1=no -# Check whether --with-db1 or --without-db1 was given. -if test "${with_db1+set}" = set; then - withval="$with_db1" - PHP_DB1=$withval + +# Check whether --with-db1 was given. +if test "${with_db1+set}" = set; then : + withval=$with_db1; PHP_DB1=$withval else - + PHP_DB1=no - + fi @@ -29332,14 +29919,14 @@ php_with_dbm=no -# Check whether --with-dbm or --without-dbm was given. -if test "${with_dbm+set}" = set; then - withval="$with_dbm" - PHP_DBM=$withval + +# Check whether --with-dbm was given. +if test "${with_dbm+set}" = set; then : + withval=$with_dbm; PHP_DBM=$withval else - + PHP_DBM=no - + fi @@ -29353,7 +29940,7 @@ # QDBM if test "$PHP_QDBM" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT for i in $PHP_QDBM /usr/local /usr; do @@ -29361,28 +29948,32 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/include/depot.h break + elif test -f "$i/include/qdbm/depot.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/qdbm/depot.h + break fi done if test -n "$THIS_INCLUDE"; then for LIB in qdbm; do - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -29393,20 +29984,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -29419,106 +30010,109 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 -echo "configure:29466: checking for dpopen in -l$LIB" >&5 -ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dpopen() -; return 0; } -EOF -if { (eval echo configure:29485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dpopen (); +int +main () +{ +return dpopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define QDBM_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF - cat >> confdefs.h <<\EOF -#define DBA_QDBM 1 -EOF + +$as_echo "#define DBA_QDBM 1" >>confdefs.h THIS_LIBS=$LIB - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$LIB_dpopen - - + + fi if test -n "$THIS_LIBS"; then @@ -29527,109 +30121,109 @@ done fi - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -29649,45 +30243,49 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29654: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # GDBM if test "$PHP_GDBM" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT if test "$HAVE_QDBM" = "1"; then - + THIS_NAME=GDBM if test -n "gdbm"; then THIS_FULL_NAME="gdbm" else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29682: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } + 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 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -29701,23 +30299,23 @@ done if test -n "$THIS_INCLUDE"; then - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -29728,20 +30326,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -29754,213 +30352,214 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:29801: checking for gdbm_open in -lgdbm" >&5 -ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_gdbm_gdbm_open+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgdbm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdbm_open() -; return 0; } -EOF -if { (eval echo configure:29820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdbm_open (); +int +main () +{ +return gdbm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gdbm_gdbm_open=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gdbm_gdbm_open=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define GDBM_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF + + +$as_echo "#define DBA_GDBM 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define DBA_GDBM 1 -EOF - THIS_LIBS=gdbm - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gdbm_gdbm_open - - + + fi fi - - + + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -29980,24 +30579,26 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29985: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # NDBM if test "$PHP_NDBM" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT for i in $PHP_NDBM /usr/local /usr; do @@ -30011,26 +30612,26 @@ break fi done - + if test -n "$THIS_INCLUDE"; then for LIB in ndbm db1 c; do - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -30041,20 +30642,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -30067,106 +30668,109 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 -echo "configure:30114: checking for dbm_open in -l$LIB" >&5 -ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dbm_open() -; return 0; } -EOF -if { (eval echo configure:30133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dbm_open (); +int +main () +{ +return dbm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define NDBM_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF + + +$as_echo "#define DBA_NDBM 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define DBA_NDBM 1 -EOF - THIS_LIBS=$LIB - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$LIB_dbm_open - - + + fi if test -n "$THIS_LIBS"; then @@ -30175,109 +30779,109 @@ done fi - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -30297,17 +30901,19 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30302: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -30316,7 +30922,7 @@ # DB4 if test "$PHP_DB4" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT dbdp4="/usr/local/BerkeleyDB.4." @@ -30368,61 +30974,59 @@ break fi done - + if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi - for LIB in 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 + for LIB in db 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; do + if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/lib$LIB.$SHLIB_SUFFIX_NAME || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then lib_found=""; - + old_LDFLAGS=$LDFLAGS LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" old_LIBS=$LIBS LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" - -int main() { + +int +main () +{ (void)db_create((DB**)0, (DB_ENV*)0, 0); - -; return 0; } -EOF -if { (eval echo configure:30397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR == 5) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + THIS_LIBS=$LIB lib_found=1 - + fi rm -f conftest* - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS @@ -30433,178 +31037,174 @@ fi done if test -z "$THIS_LIBS"; then - echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6 -echo "configure:30438: checking for DB4 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } + { $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 fi if test "4" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:30443: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for DB4 minor version and patch level... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""ok" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else - rm -rf conftest* - - { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } - + + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 + fi rm -f conftest* fi if test "$ext_shared" = "yes"; then - echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:30471: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if dba can be used as shared extension... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - rm -rf conftest* - - { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } - + + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 + fi rm -f conftest* fi if test -n "$THIS_LIBS"; then - cat >> confdefs.h <<\EOF -#define DBA_DB4 1 -EOF - + +$as_echo "#define DBA_DB4 1" >>confdefs.h + if test -n "$THIS_INCLUDE"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB4_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF fi else - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB4_LIBS=$THIS_LIBS DB4_PREFIX=$THIS_PREFIX DB4_INCLUDE=$THIS_INCLUDE - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -30625,45 +31225,49 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30630: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # DB3 if test "$PHP_DB3" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT if test "$HAVE_DB4" = "1"; then - + THIS_NAME=DB3 if test -n "Berkeley DB3"; then THIS_FULL_NAME="Berkeley DB3" else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30658: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } + 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 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -30691,61 +31295,59 @@ break fi done - + if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + 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 + if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/lib$LIB.$SHLIB_SUFFIX_NAME || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then lib_found=""; - + old_LDFLAGS=$LDFLAGS LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" old_LIBS=$LIBS LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" - -int main() { + +int +main () +{ (void)db_create((DB**)0, (DB_ENV*)0, 0); - -; return 0; } -EOF -if { (eval echo configure:30720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR == 5) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + THIS_LIBS=$LIB lib_found=1 - + fi rm -f conftest* - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS @@ -30756,178 +31358,174 @@ fi done if test -z "$THIS_LIBS"; then - echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6 -echo "configure:30761: checking for DB3 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } + { $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 fi if test "3" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:30766: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for DB4 minor version and patch level... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""ok" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else - rm -rf conftest* - - { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } - + + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 + fi rm -f conftest* fi if test "$ext_shared" = "yes"; then - echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:30794: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if dba can be used as shared extension... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - rm -rf conftest* - - { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } - + + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 + fi rm -f conftest* fi if test -n "$THIS_LIBS"; then - cat >> confdefs.h <<\EOF -#define DBA_DB3 1 -EOF - + +$as_echo "#define DBA_DB3 1" >>confdefs.h + if test -n "$THIS_INCLUDE"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB3_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF fi else - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB3_LIBS=$THIS_LIBS DB3_PREFIX=$THIS_PREFIX DB3_INCLUDE=$THIS_INCLUDE - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -30948,45 +31546,49 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30953: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # DB2 if test "$PHP_DB2" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then - + THIS_NAME=DB2 if test -n "Berkeley DB2"; then THIS_FULL_NAME="Berkeley DB2" else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:30981: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } + 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 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -31014,61 +31616,59 @@ break fi done - + if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + 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 + if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/lib$LIB.$SHLIB_SUFFIX_NAME || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then lib_found=""; - + old_LDFLAGS=$LDFLAGS LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" old_LIBS=$LIBS LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" - -int main() { + +int +main () +{ (void)db_appinit("", NULL, (DB_ENV*)0, 0); - -; return 0; } -EOF -if { (eval echo configure:31043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR == 5) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + THIS_LIBS=$LIB lib_found=1 - + fi rm -f conftest* - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS @@ -31079,178 +31679,174 @@ fi done if test -z "$THIS_LIBS"; then - echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6 -echo "configure:31084: checking for DB2 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } + { $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 fi if test "2" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:31089: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for DB4 minor version and patch level... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""ok" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else - rm -rf conftest* - - { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } - + + as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 + fi rm -f conftest* fi if test "$ext_shared" = "yes"; then - echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:31117: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if dba can be used as shared extension... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - rm -rf conftest* - - { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } - + + as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 + fi rm -f conftest* fi if test -n "$THIS_LIBS"; then - cat >> confdefs.h <<\EOF -#define DBA_DB2 1 -EOF - + +$as_echo "#define DBA_DB2 1" >>confdefs.h + if test -n "$THIS_INCLUDE"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB2_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF fi else - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi THIS_RESULT=yes DB2_LIBS=$THIS_LIBS DB2_PREFIX=$THIS_PREFIX DB2_INCLUDE=$THIS_INCLUDE - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -31271,28 +31867,30 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31276: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # DB1 if test "$PHP_DB1" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT - echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 -echo "configure:31296: checking for DB1 in library" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5 +$as_echo_n "checking for DB1 in library... " >&6; } if test "$HAVE_DB4" = "1"; then THIS_VERSION=4 THIS_LIBS=$DB4_LIBS @@ -31306,9 +31904,10 @@ THIS_PREFIX=$DB2_PREFIX fi if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION" -EOF +_ACEOF for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do if test -f "$THIS_PREFIX/$i"; then @@ -31317,9 +31916,10 @@ fi done else - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB1_VERSION "Unknown DB1" -EOF +_ACEOF for i in $PHP_DB1 /usr/local /usr; do if test -f "$i/db1/db.h"; then @@ -31338,159 +31938,161 @@ done THIS_LIBS=db fi - echo "$ac_t""$THIS_LIBS" 1>&6 - echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 -echo "configure:31344: checking for DB1 in header" >&5 - echo "$ac_t""$THIS_INCLUDE" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5 +$as_echo "$THIS_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5 +$as_echo_n "checking for DB1 in header... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5 +$as_echo "$THIS_INCLUDE" >&6; } if test -n "$THIS_INCLUDE"; then - + old_LDFLAGS=$LDFLAGS LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" old_LIBS=$LIBS LIBS="-l$THIS_LIBS $LIBS" - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "$THIS_INCLUDE" - -int main() { + +int +main () +{ DB * dbp = dbopen("", 0, 0, DB_HASH, 0); - -; return 0; } -EOF -if { (eval echo configure:31365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DB1_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF - cat >> confdefs.h <<\EOF -#define DBA_DB1 1 -EOF + +$as_echo "#define DBA_DB1 1" >>confdefs.h THIS_RESULT=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + THIS_RESULT=no - + fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS fi - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -31510,45 +32112,49 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31515: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # DBM if test "$PHP_DBM" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT if test "$HAVE_QDBM" = "1"; then - + THIS_NAME=DBM if test -n "dbm"; then THIS_FULL_NAME="dbm" else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31543: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } + 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 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -31567,23 +32173,23 @@ if test -n "$THIS_INCLUDE"; then for LIB in dbm c gdbm; do - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -31594,20 +32200,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -31620,121 +32226,128 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 -echo "configure:31667: checking for dbminit in -l$LIB" >&5 -ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dbminit() -; return 0; } -EOF -if { (eval echo configure:31686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dbminit (); +int +main () +{ +return dbminit (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 -echo "configure:31706: checking for DBM using GDBM" >&5 - cat >> confdefs.h <&5 +$as_echo_n "checking for DBM using GDBM... " >&6; } + +cat >>confdefs.h <<_ACEOF #define DBM_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF if test "$LIB" = "gdbm"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DBM_VERSION "GDBM" -EOF +_ACEOF - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - cat >> confdefs.h <>confdefs.h <<_ACEOF #define DBM_VERSION "DBM" -EOF +_ACEOF - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - cat >> confdefs.h <<\EOF -#define DBA_DBM 1 -EOF - + +$as_echo "#define DBA_DBM 1" >>confdefs.h + THIS_LIBS=$LIB - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$LIB_dbminit - - + + fi if test -n "$THIS_LIBS"; then @@ -31742,110 +32355,110 @@ fi done fi - - + + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -31865,17 +32478,19 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:31870: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -31890,14 +32505,14 @@ php_with_cdb=$php_dba_enable -# Check whether --with-cdb or --without-cdb was given. -if test "${with_cdb+set}" = set; then - withval="$with_cdb" - PHP_CDB=$withval + +# Check whether --with-cdb was given. +if test "${with_cdb+set}" = set; then : + withval=$with_cdb; PHP_CDB=$withval else - + PHP_CDB=$php_dba_enable - + fi @@ -31912,14 +32527,13 @@ php_enable_inifile=$php_dba_enable -# Check whether --enable-inifile or --disable-inifile was given. -if test "${enable_inifile+set}" = set; then - enableval="$enable_inifile" - PHP_INIFILE=$enableval +# Check whether --enable-inifile was given. +if test "${enable_inifile+set}" = set; then : + enableval=$enable_inifile; PHP_INIFILE=$enableval else - + PHP_INIFILE=$php_dba_enable - + fi @@ -31934,14 +32548,13 @@ php_enable_flatfile=$php_dba_enable -# Check whether --enable-flatfile or --disable-flatfile was given. -if test "${enable_flatfile+set}" = set; then - enableval="$enable_flatfile" - PHP_FLATFILE=$enableval +# Check whether --enable-flatfile was given. +if test "${enable_flatfile+set}" = set; then : + enableval=$enable_flatfile; PHP_FLATFILE=$enableval else - + PHP_FLATFILE=$php_dba_enable - + fi @@ -31954,22 +32567,19 @@ # CDB if test "$PHP_CDB" = "yes"; then - cat >> confdefs.h <<\EOF -#define DBA_CDB_BUILTIN 1 -EOF - cat >> confdefs.h <<\EOF -#define DBA_CDB_MAKE 1 -EOF +$as_echo "#define DBA_CDB_BUILTIN 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define DBA_CDB 1 -EOF + +$as_echo "#define DBA_CDB_MAKE 1" >>confdefs.h + + +$as_echo "#define DBA_CDB 1" >>confdefs.h cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c" THIS_RESULT="builtin" elif test "$PHP_CDB" != "no"; then - + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT for i in $PHP_CDB /usr/local /usr; do @@ -31982,23 +32592,23 @@ if test -n "$THIS_INCLUDE"; then for LIB in cdb c; do - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -32009,20 +32619,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -32035,106 +32645,109 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 -echo "configure:32082: checking for cdb_read in -l$LIB" >&5 -ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -cdb_read() -; return 0; } -EOF -if { (eval echo configure:32101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cdb_read (); +int +main () +{ +return cdb_read (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define CDB_INCLUDE_FILE "$THIS_INCLUDE" -EOF +_ACEOF + + +$as_echo "#define DBA_CDB 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define DBA_CDB 1 -EOF - THIS_LIBS=$LIB - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$LIB_cdb_read - - + + fi if test -n "$THIS_LIBS"; then @@ -32143,109 +32756,109 @@ done fi - + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR fi - + THIS_RESULT=yes if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary header file(s)." "$LINENO" 5 fi if test -z "$THIS_LIBS"; then - { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } + as_fn_error $? "DBA: Could not find necessary library." "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" fi - + if test "$ext_shared" = "yes"; then DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$THIS_LFLAGS"; then - + if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then - + if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then ai_p=$THIS_LFLAGS else - + ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 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 $THIS_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$THIS_LIBS $LIBS" + *) + LIBS="-l$THIS_LIBS $LIBS" ;; esac @@ -32265,26 +32878,27 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32270: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # INIFILE if test "$PHP_INIFILE" != "no"; then - cat >> confdefs.h <<\EOF -#define DBA_INIFILE 1 -EOF + +$as_echo "#define DBA_INIFILE 1" >>confdefs.h ini_sources="libinifile/inifile.c" THIS_RESULT="builtin" @@ -32296,26 +32910,27 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32301: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME # FLATFILE if test "$PHP_FLATFILE" != "no"; then - cat >> confdefs.h <<\EOF -#define DBA_FLATFILE 1 -EOF + +$as_echo "#define DBA_FLATFILE 1" >>confdefs.h flat_sources="libflatfile/flatfile.c" THIS_RESULT="builtin" @@ -32327,34 +32942,37 @@ else THIS_FULL_NAME="$THIS_NAME" fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:32332: checking for $THIS_FULL_NAME support" >&5 + { $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 - { echo "configure: error: " 1>&2; exit 1; } + as_fn_error $? "" "$LINENO" 5 fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - echo "$ac_t""$THIS_RESULT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +$as_echo "$THIS_RESULT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME -echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 -echo "configure:32347: checking whether to enable DBA interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5 +$as_echo_n "checking whether to enable DBA interface... " >&6; } if test "$HAVE_DBA" = "1"; then if test "$ext_shared" = "yes"; then - echo "$ac_t""yes, shared" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5 +$as_echo "yes, shared" >&6; } else - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - cat >> confdefs.h <<\EOF -#define HAVE_DBA 1 -EOF - +$as_echo "#define HAVE_DBA 1" >>confdefs.h + + ext_builddir=ext/dba ext_srcdir=$abs_srcdir/ext/dba @@ -32362,15 +32980,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_DBA_SHARED=no - - + + case ext/dba in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -32383,12 +33001,12 @@ old_IFS=$IFS for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -32412,14 +33030,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_DBA_SHARED=yes - + case ext/dba in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -32432,12 +33050,12 @@ old_IFS=$IFS for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_dba="$shared_objects_dba $ac_bdir$ac_obj.lo" case $ac_src in @@ -32455,7 +33073,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -32465,7 +33083,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDBA, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(DBA_SHARED_LIBADD)' ;; *) suffix=la @@ -32478,7 +33096,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdba.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_DBA 1 -EOF +_ACEOF fi fi @@ -32540,15 +33159,15 @@ PHP_DBA_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/dba in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -32561,12 +33180,12 @@ old_IFS=$IFS for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -32586,15 +33205,15 @@ EXT_STATIC="$EXT_STATIC dba" ;; *) - - + + case ext/dba in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -32607,12 +33226,12 @@ old_IFS=$IFS for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -32633,53 +33252,53 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC dba" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=dba - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/libinifile" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/libcdb" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/libflatfile" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD" else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi php_enable_dom=yes -echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 -echo "configure:32677: checking whether to enable DOM support" >&5 -# Check whether --enable-dom or --disable-dom was given. -if test "${enable_dom+set}" = set; then - enableval="$enable_dom" - PHP_DOM=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5 +$as_echo_n "checking whether to enable DOM support... " >&6; } +# Check whether --enable-dom was given. +if test "${enable_dom+set}" = set; then : + enableval=$enable_dom; PHP_DOM=$enableval else - + PHP_DOM=yes test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL @@ -32708,31 +33327,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:32722: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -32740,17 +33361,17 @@ if test "$PHP_DOM" != "no"; then - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: DOM extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + if test "$PHP_LIBXML" = "no"; then + as_fn_error $? "DOM extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:32750: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -32759,8 +33380,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -32773,17 +33394,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -32794,20 +33415,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii" + DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -32820,80 +33441,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then DOM_SHARED_LIBADD="-L$ai_p $DOM_SHARED_LIBADD" test -n "$ld_runpath_switch" && DOM_SHARED_LIBADD="$ld_runpath_switch$ai_p $DOM_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -32903,74 +33524,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:32908: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $DOM_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:32935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_DOM 1 -EOF - + +$as_echo "#define HAVE_DOM 1" >>confdefs.h + + ext_builddir=ext/dom ext_srcdir=$abs_srcdir/ext/dom @@ -32978,15 +33594,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_DOM_SHARED=no - - + + case ext/dom in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33008,12 +33624,12 @@ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33037,14 +33653,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_DOM_SHARED=yes - + case ext/dom in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -33066,12 +33682,12 @@ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_dom="$shared_objects_dom $ac_bdir$ac_obj.lo" case $ac_src in @@ -33089,7 +33705,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -33099,7 +33715,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDOM, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(DOM_SHARED_LIBADD)' ;; *) suffix=la @@ -33112,7 +33728,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdom.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dom" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_DOM 1 -EOF +_ACEOF fi fi @@ -33174,15 +33791,15 @@ PHP_DOM_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/dom in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33204,12 +33821,12 @@ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33229,15 +33846,15 @@ EXT_STATIC="$EXT_STATIC dom" ;; *) - - + + case ext/dom in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33259,12 +33876,12 @@ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33285,66 +33902,66 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC dom" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=dom - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST DOM_SHARED_LIBADD" - - + + for header_file in ext/dom/xml_common.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - am_i_shared=$PHP_DOM_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + fi fi @@ -33353,14 +33970,14 @@ php_with_enchant=no -echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 -echo "configure:33358: checking for ENCHANT support" >&5 -# Check whether --with-enchant or --without-enchant was given. -if test "${with_enchant+set}" = set; then - withval="$with_enchant" - PHP_ENCHANT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT support" >&5 +$as_echo_n "checking for ENCHANT support... " >&6; } + +# Check whether --with-enchant was given. +if test "${with_enchant+set}" = set; then : + withval=$with_enchant; PHP_ENCHANT=$withval else - + PHP_ENCHANT=no test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL @@ -33389,13 +34006,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_ENCHANT" != "no"; then - + ext_builddir=ext/enchant ext_srcdir=$abs_srcdir/ext/enchant @@ -33403,15 +34021,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_ENCHANT_SHARED=no - - + + case ext/enchant in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33424,12 +34042,12 @@ old_IFS=$IFS for ac_src in enchant.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33453,14 +34071,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_ENCHANT_SHARED=yes - + case ext/enchant in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -33473,12 +34091,12 @@ old_IFS=$IFS for ac_src in enchant.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_enchant="$shared_objects_enchant $ac_bdir$ac_obj.lo" case $ac_src in @@ -33496,7 +34114,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -33506,7 +34124,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPENCHANT, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(ENCHANT_SHARED_LIBADD)' ;; *) suffix=la @@ -33519,7 +34137,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpenchant.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_enchant" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_ENCHANT 1 -EOF +_ACEOF fi fi @@ -33581,15 +34200,15 @@ PHP_ENCHANT_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/enchant in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33602,12 +34221,12 @@ old_IFS=$IFS for ac_src in enchant.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33627,15 +34246,15 @@ EXT_STATIC="$EXT_STATIC enchant" ;; *) - - + + case ext/enchant in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -33648,12 +34267,12 @@ old_IFS=$IFS for ac_src in enchant.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -33674,15 +34293,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC enchant" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=enchant - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -33703,106 +34322,105 @@ done if test -z "$ENCHANT_DIR"; then - { echo "configure: error: Cannot find enchant" 1>&2; exit 1; } + as_fn_error $? "Cannot find enchant" "$LINENO" 5 fi ENCHANT_LIBDIR=$ENCHANT_DIR/lib - cat >> confdefs.h <<\EOF -#define HAVE_ENCHANT 1 -EOF - +$as_echo "#define HAVE_ENCHANT 1" >>confdefs.h + + PHP_VAR_SUBST="$PHP_VAR_SUBST ENCHANT_SHARED_LIBADD" - + if test "$ext_shared" = "yes"; then ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD" if test -n "$ENCHANT_LIBDIR"; then - + if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then - + if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ENCHANT_LIBDIR else - + ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then ENCHANT_SHARED_LIBADD="-L$ai_p $ENCHANT_SHARED_LIBADD" test -n "$ld_runpath_switch" && ENCHANT_SHARED_LIBADD="$ld_runpath_switch$ai_p $ENCHANT_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$ENCHANT_LIBDIR"; then - + if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then - + if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ENCHANT_LIBDIR else - + ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ENCHANT_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 enchant in c|c_r|pthread*) ;; - *) - LIBS="-lenchant $LIBS" + *) + LIBS="-lenchant $LIBS" ;; esac @@ -33812,54 +34430,54 @@ fi - + if test "$ENCHANT_INCDIR" != "/usr/include"; then - + if test -z "$ENCHANT_INCDIR" || echo "$ENCHANT_INCDIR" | grep '^/' >/dev/null ; then ai_p=$ENCHANT_INCDIR else - + ep_dir="`echo $ENCHANT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ENCHANT_INCDIR\"`" 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 - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -33870,20 +34488,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -33896,105 +34514,104 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 -echo "configure:33943: checking for enchant_broker_set_param in -lenchant" >&5 -ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lenchant $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -enchant_broker_set_param() -; return 0; } -EOF -if { (eval echo configure:33962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char enchant_broker_set_param (); +int +main () +{ +return enchant_broker_set_param (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_enchant_enchant_broker_set_param=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_enchant_enchant_broker_set_param=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_ENCHANT_BROKER_SET_PARAM 1 -EOF - cat >> confdefs.h <<\EOF -#define ENCHANT_VERSION_STRING "1.5.x" -EOF - - +$as_echo "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h + + +$as_echo "#define ENCHANT_VERSION_STRING \"1.5.x\"" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_enchant_enchant_broker_set_param - - + + fi @@ -34004,14 +34621,13 @@ php_enable_exif=no -echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 -echo "configure:34009: checking whether to enable EXIF (metadata from images) support" >&5 -# Check whether --enable-exif or --disable-exif was given. -if test "${enable_exif+set}" = set; then - enableval="$enable_exif" - PHP_EXIF=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5 +$as_echo_n "checking whether to enable EXIF (metadata from images) support... " >&6; } +# Check whether --enable-exif was given. +if test "${enable_exif+set}" = set; then : + enableval=$enable_exif; PHP_EXIF=$enableval else - + PHP_EXIF=no test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL @@ -34040,17 +34656,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_EXIF" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_EXIF 1 -EOF - +$as_echo "#define HAVE_EXIF 1" >>confdefs.h + + ext_builddir=ext/exif ext_srcdir=$abs_srcdir/ext/exif @@ -34058,15 +34674,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_EXIF_SHARED=no - - + + case ext/exif in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34079,12 +34695,12 @@ old_IFS=$IFS for ac_src in exif.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34108,14 +34724,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_EXIF_SHARED=yes - + case ext/exif in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -34128,12 +34744,12 @@ old_IFS=$IFS for ac_src in exif.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_exif="$shared_objects_exif $ac_bdir$ac_obj.lo" case $ac_src in @@ -34151,7 +34767,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -34161,7 +34777,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEXIF, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(EXIF_SHARED_LIBADD)' ;; *) suffix=la @@ -34174,7 +34790,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpexif.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_exif" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_EXIF 1 -EOF +_ACEOF fi fi @@ -34236,15 +34853,15 @@ PHP_EXIF_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/exif in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34257,12 +34874,12 @@ old_IFS=$IFS for ac_src in exif.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34282,15 +34899,15 @@ EXT_STATIC="$EXT_STATIC exif" ;; *) - - + + case ext/exif in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34303,12 +34920,12 @@ old_IFS=$IFS for ac_src in exif.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34329,15 +34946,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC exif" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=exif - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -34348,14 +34965,13 @@ php_enable_fileinfo=yes -echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 -echo "configure:34353: checking for fileinfo support" >&5 -# Check whether --enable-fileinfo or --disable-fileinfo was given. -if test "${enable_fileinfo+set}" = set; then - enableval="$enable_fileinfo" - PHP_FILEINFO=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5 +$as_echo_n "checking for fileinfo support... " >&6; } +# Check whether --enable-fileinfo was given. +if test "${enable_fileinfo+set}" = set; then : + enableval=$enable_fileinfo; PHP_FILEINFO=$enableval else - + PHP_FILEINFO=yes test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL @@ -34384,7 +35000,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -34398,7 +35015,7 @@ libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" - + ext_builddir=ext/fileinfo ext_srcdir=$abs_srcdir/ext/fileinfo @@ -34406,15 +35023,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_FILEINFO_SHARED=no - - + + case ext/fileinfo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34427,12 +35044,12 @@ old_IFS=$IFS for ac_src in fileinfo.c $libmagic_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34456,14 +35073,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_FILEINFO_SHARED=yes - + case ext/fileinfo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -34476,12 +35093,12 @@ old_IFS=$IFS for ac_src in fileinfo.c $libmagic_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_fileinfo="$shared_objects_fileinfo $ac_bdir$ac_obj.lo" case $ac_src in @@ -34499,7 +35116,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -34509,7 +35126,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILEINFO, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(FILEINFO_SHARED_LIBADD)' ;; *) suffix=la @@ -34522,7 +35139,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfileinfo.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_fileinfo" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_FILEINFO 1 -EOF +_ACEOF fi fi @@ -34584,15 +35202,15 @@ PHP_FILEINFO_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/fileinfo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34605,12 +35223,12 @@ old_IFS=$IFS for ac_src in fileinfo.c $libmagic_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34630,15 +35248,15 @@ EXT_STATIC="$EXT_STATIC fileinfo" ;; *) - - + + case ext/fileinfo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34651,12 +35269,12 @@ old_IFS=$IFS for ac_src in fileinfo.c $libmagic_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34677,82 +35295,39 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC fileinfo" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=fileinfo - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - - BUILD_DIR="$BUILD_DIR $ext_builddir/libmagic" - - for ac_func in utimes strndup -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:34703: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + BUILD_DIR="$BUILD_DIR $ext_builddir/libmagic" -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif -; return 0; } -EOF -if { (eval echo configure:34731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + for ac_func in utimes strndup +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -34764,14 +35339,13 @@ php_enable_filter=yes -echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 -echo "configure:34769: checking whether to enable input filter support" >&5 -# Check whether --enable-filter or --disable-filter was given. -if test "${enable_filter+set}" = set; then - enableval="$enable_filter" - PHP_FILTER=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5 +$as_echo_n "checking whether to enable input filter support... " >&6; } +# Check whether --enable-filter was given. +if test "${enable_filter+set}" = set; then : + enableval=$enable_filter; PHP_FILTER=$enableval else - + PHP_FILTER=yes test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL @@ -34800,7 +35374,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -34808,22 +35383,23 @@ php_with_pcre_dir=no -echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -echo "configure:34813: checking pcre install prefix" >&5 -# Check whether --with-pcre-dir or --without-pcre-dir was given. -if test "${with_pcre_dir+set}" = set; then - withval="$with_pcre_dir" - PHP_PCRE_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre install prefix" >&5 +$as_echo_n "checking pcre install prefix... " >&6; } + +# Check whether --with-pcre-dir was given. +if test "${with_pcre_dir+set}" = set; then : + withval=$with_pcre_dir; PHP_PCRE_DIR=$withval else - + PHP_PCRE_DIR=no - + fi ext_output=$PHP_PCRE_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -34835,57 +35411,51 @@ else old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$INCLUDES - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include
#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + PHP_PCRE_REGEX=yes - + else - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include
#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + PHP_PCRE_REGEX=pecl - + else - rm -rf conftest* - + PHP_PCRE_REGEX=no - + fi rm -f conftest* - + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS fi - + ext_builddir=ext/filter ext_srcdir=$abs_srcdir/ext/filter @@ -34893,15 +35463,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_FILTER_SHARED=no - - + + case ext/filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -34914,12 +35484,12 @@ old_IFS=$IFS for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -34943,14 +35513,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_FILTER_SHARED=yes - + case ext/filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -34963,12 +35533,12 @@ old_IFS=$IFS for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_filter="$shared_objects_filter $ac_bdir$ac_obj.lo" case $ac_src in @@ -34986,7 +35556,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -34996,7 +35566,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILTER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(FILTER_SHARED_LIBADD)' ;; *) suffix=la @@ -35009,7 +35579,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfilter.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_filter" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_FILTER 1 -EOF +_ACEOF fi fi @@ -35071,15 +35642,15 @@ PHP_FILTER_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -35092,12 +35663,12 @@ old_IFS=$IFS for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -35117,15 +35688,15 @@ EXT_STATIC="$EXT_STATIC filter" ;; *) - - + + case ext/filter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -35138,12 +35709,12 @@ old_IFS=$IFS for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -35164,74 +35735,73 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC filter" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=filter - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST FILTER_SHARED_LIBADD" - - + + for header_file in ext/filter/php_filter.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - am_i_shared=$PHP_FILTER_SHARED is_it_shared=$PHP_PCRE_SHARED is_it_enabled=$PHP_PCRE if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + fi php_enable_ftp=no -echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 -echo "configure:35229: checking whether to enable FTP support" >&5 -# Check whether --enable-ftp or --disable-ftp was given. -if test "${enable_ftp+set}" = set; then - enableval="$enable_ftp" - PHP_FTP=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5 +$as_echo_n "checking whether to enable FTP support... " >&6; } +# Check whether --enable-ftp was given. +if test "${enable_ftp+set}" = set; then : + enableval=$enable_ftp; PHP_FTP=$enableval else - + PHP_FTP=no test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL @@ -35260,7 +35830,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -35268,32 +35839,32 @@ php_with_openssl_dir=no -echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 -echo "configure:35273: checking OpenSSL dir for FTP" >&5 -# Check whether --with-openssl-dir or --without-openssl-dir was given. -if test "${with_openssl_dir+set}" = set; then - withval="$with_openssl_dir" - PHP_OPENSSL_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL dir for FTP" >&5 +$as_echo_n "checking OpenSSL dir for FTP... " >&6; } + +# Check whether --with-openssl-dir was given. +if test "${with_openssl_dir+set}" = set; then : + withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval else - + PHP_OPENSSL_DIR=no - + fi ext_output=$PHP_OPENSSL_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_FTP" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_FTP 1 -EOF - +$as_echo "#define HAVE_FTP 1" >>confdefs.h + + ext_builddir=ext/ftp ext_srcdir=$abs_srcdir/ext/ftp @@ -35301,15 +35872,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_FTP_SHARED=no - - + + case ext/ftp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -35322,12 +35893,12 @@ old_IFS=$IFS for ac_src in php_ftp.c ftp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -35351,14 +35922,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_FTP_SHARED=yes - + case ext/ftp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -35371,12 +35942,12 @@ old_IFS=$IFS for ac_src in php_ftp.c ftp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_ftp="$shared_objects_ftp $ac_bdir$ac_obj.lo" case $ac_src in @@ -35394,7 +35965,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -35404,7 +35975,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFTP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(FTP_SHARED_LIBADD)' ;; *) suffix=la @@ -35417,7 +35988,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpftp.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ftp" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_FTP 1 -EOF +_ACEOF fi fi @@ -35479,15 +36051,15 @@ PHP_FTP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/ftp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -35500,12 +36072,12 @@ old_IFS=$IFS for ac_src in php_ftp.c ftp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -35525,15 +36097,15 @@ EXT_STATIC="$EXT_STATIC ftp" ;; *) - - + + case ext/ftp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -35546,12 +36118,12 @@ old_IFS=$IFS for ac_src in php_ftp.c ftp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -35572,15 +36144,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC ftp" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=ftp - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -35589,7 +36161,7 @@ test -z "$PHP_OPENSSL" && PHP_OPENSSL=no if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then - + found_openssl=no unset OPENSSL_INCDIR unset OPENSSL_LIBDIR @@ -35606,40 +36178,45 @@ 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 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:35611: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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="$ac_save_ifs" +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" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then @@ -35649,21 +36226,21 @@ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then - + for ac_i in $OPENSSL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -35674,20 +36251,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii" + FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -35700,80 +36277,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD" test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $OPENSSL_INCS; 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 @@ -35786,7 +36363,7 @@ fi if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -35802,94 +36379,92 @@ done if test -z "$OPENSSL_INCDIR"; then - { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's " "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:35816: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for OpenSSL version... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if OPENSSL_VERSION_NUMBER >= 0x0090600fL yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t"">= 0.9.6" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5 +$as_echo ">= 0.9.6" >&6; } + else - rm -rf conftest* - - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - + + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + if test "$OPENSSL_INCDIR" != "/usr/include"; then - + if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_INCDIR else - + ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 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 - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -35900,20 +36475,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -35926,146 +36501,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:35973: checking for CRYPTO_free in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -CRYPTO_free() -; return 0; } -EOF -if { (eval echo configure:35992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char CRYPTO_free (); +int +main () +{ +return CRYPTO_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_CRYPTO_free=yes +else + ac_cv_lib_crypto_CRYPTO_free=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 +$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - - case crypto in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" - else - - - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; - esac - - - fi - ;; - esac - + : - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libcrypto not found!" "$LINENO" 5 + + fi old_LIBS=$LIBS LIBS="$LIBS -lcrypto" - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -36076,20 +36628,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -36102,117 +36654,141 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:36149: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SSL_CTX_set_ssl_version() -; return 0; } -EOF -if { (eval echo configure:36168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_ssl_version (); +int +main () +{ +return SSL_CTX_set_ssl_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes +else + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_openssl=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - - { echo "configure: error: libssl not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libssl not found!" "$LINENO" 5 + + fi LIBS=$old_LIBS - - + + case ssl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD" + FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD" else - - + + case ssl in c|c_r|pthread*) ;; - *) - LIBS="-lssl $LIBS" + *) + LIBS="-lssl $LIBS" + ;; + esac + + + fi + ;; + esac + + + + + case crypto in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" + else + + + case crypto in + c|c_r|pthread*) ;; + *) + LIBS="-lcrypto $LIBS" ;; esac @@ -36223,55 +36799,55 @@ - + if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - + if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_LIBDIR else - + ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD" test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_SHARED_LIBADD" else - - - + + + 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 fi if test "$found_openssl" = "yes"; then OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - + : fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD" fi @@ -36282,14 +36858,14 @@ php_with_gd=no -echo $ac_n "checking for GD support""... $ac_c" 1>&6 -echo "configure:36287: checking for GD support" >&5 -# Check whether --with-gd or --without-gd was given. -if test "${with_gd+set}" = set; then - withval="$with_gd" - PHP_GD=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5 +$as_echo_n "checking for GD support... " >&6; } + +# Check whether --with-gd was given. +if test "${with_gd+set}" = set; then : + withval=$with_gd; PHP_GD=$withval else - + PHP_GD=no test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL @@ -36318,81 +36894,85 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_JPEG_DIR"; then - + php_with_jpeg_dir=no -echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 -echo "configure:36332: checking for the location of libjpeg" >&5 -# Check whether --with-jpeg-dir or --without-jpeg-dir was given. -if test "${with_jpeg_dir+set}" = set; then - withval="$with_jpeg_dir" - PHP_JPEG_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libjpeg" >&5 +$as_echo_n "checking for the location of libjpeg... " >&6; } + +# Check whether --with-jpeg-dir was given. +if test "${with_jpeg_dir+set}" = set; then : + withval=$with_jpeg_dir; PHP_JPEG_DIR=$withval else - + PHP_JPEG_DIR=no - + fi ext_output=$PHP_JPEG_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi if test -z "$PHP_PNG_DIR"; then - + php_with_png_dir=no -echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 -echo "configure:36357: checking for the location of libpng" >&5 -# Check whether --with-png-dir or --without-png-dir was given. -if test "${with_png_dir+set}" = set; then - withval="$with_png_dir" - PHP_PNG_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libpng" >&5 +$as_echo_n "checking for the location of libpng... " >&6; } + +# Check whether --with-png-dir was given. +if test "${with_png_dir+set}" = set; then : + withval=$with_png_dir; PHP_PNG_DIR=$withval else - + PHP_PNG_DIR=no - + fi ext_output=$PHP_PNG_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi if test -z "$PHP_ZLIB_DIR"; then - + php_with_zlib_dir=no -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:36382: checking for the location of libz" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5 +$as_echo_n "checking for the location of libz... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36401,22 +36981,23 @@ php_with_xpm_dir=no -echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 -echo "configure:36406: checking for the location of libXpm" >&5 -# Check whether --with-xpm-dir or --without-xpm-dir was given. -if test "${with_xpm_dir+set}" = set; then - withval="$with_xpm_dir" - PHP_XPM_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libXpm" >&5 +$as_echo_n "checking for the location of libXpm... " >&6; } + +# Check whether --with-xpm-dir was given. +if test "${with_xpm_dir+set}" = set; then : + withval=$with_xpm_dir; PHP_XPM_DIR=$withval else - + PHP_XPM_DIR=no - + fi ext_output=$PHP_XPM_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36424,22 +37005,23 @@ php_with_freetype_dir=no -echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 -echo "configure:36429: checking for FreeType 2" >&5 -# Check whether --with-freetype-dir or --without-freetype-dir was given. -if test "${with_freetype_dir+set}" = set; then - withval="$with_freetype_dir" - PHP_FREETYPE_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5 +$as_echo_n "checking for FreeType 2... " >&6; } + +# Check whether --with-freetype-dir was given. +if test "${with_freetype_dir+set}" = set; then : + withval=$with_freetype_dir; PHP_FREETYPE_DIR=$withval else - + PHP_FREETYPE_DIR=no - + fi ext_output=$PHP_FREETYPE_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36447,22 +37029,23 @@ php_with_t1lib=no -echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 -echo "configure:36452: checking for T1lib support" >&5 -# Check whether --with-t1lib or --without-t1lib was given. -if test "${with_t1lib+set}" = set; then - withval="$with_t1lib" - PHP_T1LIB=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1lib support" >&5 +$as_echo_n "checking for T1lib support... " >&6; } + +# Check whether --with-t1lib was given. +if test "${with_t1lib+set}" = set; then : + withval=$with_t1lib; PHP_T1LIB=$withval else - + PHP_T1LIB=no - + fi ext_output=$PHP_T1LIB -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36470,22 +37053,22 @@ php_enable_gd_native_ttf=no -echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 -echo "configure:36475: checking whether to enable truetype string function in GD" >&5 -# Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given. -if test "${enable_gd_native_ttf+set}" = set; then - enableval="$enable_gd_native_ttf" - PHP_GD_NATIVE_TTF=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable truetype string function in GD" >&5 +$as_echo_n "checking whether to enable truetype string function in GD... " >&6; } +# Check whether --enable-gd-native-ttf was given. +if test "${enable_gd_native_ttf+set}" = set; then : + enableval=$enable_gd_native_ttf; PHP_GD_NATIVE_TTF=$enableval else - + PHP_GD_NATIVE_TTF=no - + fi ext_output=$PHP_GD_NATIVE_TTF -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36493,22 +37076,22 @@ php_enable_gd_jis_conv=no -echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 -echo "configure:36498: checking whether to enable JIS-mapped Japanese font support in GD" >&5 -# Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. -if test "${enable_gd_jis_conv+set}" = set; then - enableval="$enable_gd_jis_conv" - PHP_GD_JIS_CONV=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5 +$as_echo_n "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; } +# Check whether --enable-gd-jis-conv was given. +if test "${enable_gd_jis_conv+set}" = set; then : + enableval=$enable_gd_jis_conv; PHP_GD_JIS_CONV=$enableval else - + PHP_GD_JIS_CONV=no - + fi ext_output=$PHP_GD_JIS_CONV -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -36544,64 +37127,21 @@ libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c" for ac_func in fabsf floorf -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:36550: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:36578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes - + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then PHP_ZLIB_DIR="$PHP_ZLIB_DIR" @@ -36610,7 +37150,7 @@ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } + as_fn_error $? "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -36624,49 +37164,49 @@ done fi - + if test "$PHP_GD_NATIVE_TTF" = "yes"; then - cat >> confdefs.h <<\EOF -#define USE_GD_IMGSTRTTF 1 -EOF + +$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h fi - + if test "$PHP_GD_JIS_CONV" = "yes"; then USE_GD_JIS_CONV=1 fi - + if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then - { echo "configure: error: libjpeg.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libjpeg.(a|so) not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_JPEG_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -36677,20 +37217,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -36703,206 +37243,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:36750: checking for jpeg_read_header in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -jpeg_read_header() -; return 0; } -EOF -if { (eval echo configure:36769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char jpeg_read_header (); +int +main () +{ +return jpeg_read_header (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_jpeg_jpeg_read_header=yes +else + ac_cv_lib_jpeg_jpeg_read_header=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_JPEG_DIR/include" != "/usr/include"; then - + if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/include else - + ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD" if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then - + if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then - + if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$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 jpeg in c|c_r|pthread*) ;; - *) - LIBS="-ljpeg $LIBS" + *) + LIBS="-ljpeg $LIBS" ;; esac @@ -36912,62 +37454,63 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - - { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-jpeg-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-jpeg-dir=" >&5 +$as_echo "If configure fails try --with-jpeg-dir=" >&6; } fi - + if test "$PHP_PNG_DIR" != "no"; then for i in $PHP_PNG_DIR /usr/local /usr; do + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then - { echo "configure: error: libpng.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libpng.(a|so) not found." "$LINENO" 5 fi if test "$PHP_ZLIB_DIR" = "no"; then - { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=" 1>&2; exit 1; } + as_fn_error $? "PNG support requires ZLIB. Use --with-zlib-dir=" "$LINENO" 5 fi if test ! -f $GD_PNG_DIR/include/png.h; then - { echo "configure: error: png.h not found." 1>&2; exit 1; } + as_fn_error $? "png.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -36978,20 +37521,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -37004,206 +37547,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:37051: checking for png_write_image in -lpng" >&5 -ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_png_png_write_image+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpng $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -png_write_image() -; return 0; } -EOF -if { (eval echo configure:37070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_write_image (); +int +main () +{ +return png_write_image (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_write_image=yes +else + ac_cv_lib_png_png_write_image=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_PNG_DIR/include" != "/usr/include"; then - + if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/include else - + ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -37213,94 +37758,94 @@ fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD" if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then - + if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then - + if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$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 png in c|c_r|pthread*) ;; - *) - LIBS="-lpng $LIBS" + *) + LIBS="-lpng $LIBS" ;; esac @@ -37310,34 +37855,35 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - - { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-png-dir= and --with-zlib-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-png-dir= and --with-zlib-dir=" >&5 +$as_echo "If configure fails try --with-png-dir= and --with-zlib-dir=" >&6; } fi - + if test "$PHP_XPM_DIR" != "no"; then for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break done if test -z "$GD_XPM_DIR"; then - { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libXpm.(a|so) not found." "$LINENO" 5 fi for i in include include/X11; do @@ -37345,28 +37891,28 @@ done if test -z "$GD_XPM_INC"; then - { echo "configure: error: xpm.h not found." 1>&2; exit 1; } + as_fn_error $? "xpm.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -37377,20 +37923,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -37403,206 +37949,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:37450: checking for XpmFreeXpmImage in -lXpm" >&5 -ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5 +$as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; } +if ${ac_cv_lib_Xpm_XpmFreeXpmImage+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -XpmFreeXpmImage() -; return 0; } -EOF -if { (eval echo configure:37469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XpmFreeXpmImage (); +int +main () +{ +return XpmFreeXpmImage (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xpm_XpmFreeXpmImage=yes +else + ac_cv_lib_Xpm_XpmFreeXpmImage=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 +$as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; } +if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_XPM_INC" != "/usr/include"; then - + if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_INC else - + ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD" if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$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 Xpm in c|c_r|pthread*) ;; - *) - LIBS="-lXpm $LIBS" + *) + LIBS="-lXpm $LIBS" ;; esac @@ -37612,94 +38160,94 @@ fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD" if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$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 X11 in c|c_r|pthread*) ;; - *) - LIBS="-lX11 $LIBS" + *) + LIBS="-lX11 $LIBS" ;; esac @@ -37709,25 +38257,25 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - - { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-xpm-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-xpm-dir=" >&5 +$as_echo "If configure fails try --with-xpm-dir=" >&6; } fi - + if test "$PHP_FREETYPE_DIR" != "no"; then for i in $PHP_FREETYPE_DIR /usr/local /usr; do @@ -37739,28 +38287,28 @@ done if test -z "$FREETYPE2_DIR"; then - { echo "configure: error: freetype.h not found." 1>&2; exit 1; } + as_fn_error $? "freetype.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$FREETYPE2_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -37771,20 +38319,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -37797,175 +38345,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 -echo "configure:37844: checking for FT_New_Face in -lfreetype" >&5 -ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_freetype_FT_New_Face+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -FT_New_Face() -; return 0; } -EOF -if { (eval echo configure:37863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char FT_New_Face (); +int +main () +{ +return FT_New_Face (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_freetype_FT_New_Face=yes +else + ac_cv_lib_freetype_FT_New_Face=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD" if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then - + if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then - + if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$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 freetype in c|c_r|pthread*) ;; - *) - LIBS="-lfreetype $LIBS" + *) + LIBS="-lfreetype $LIBS" ;; esac @@ -37975,99 +38525,96 @@ fi - + if test "$FREETYPE2_DIR/include" != "/usr/include"; then - + if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/include else - + ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`" 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 - + if test "$FREETYPE2_INC_DIR" != "/usr/include"; then - + if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_INC_DIR else - + ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`" 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 - cat >> confdefs.h <<\EOF -#define USE_GD_IMGSTRTTF 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBFREETYPE 1 -EOF +$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h + + +$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h + - cat >> confdefs.h <<\EOF -#define ENABLE_GD_TTF 1 -EOF - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_freetype_FT_New_Face - - { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-freetype-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-freetype-dir=" >&5 +$as_echo "If configure fails try --with-freetype-dir=" >&6; } fi - + if test "$PHP_T1LIB" != "no"; then for i in $PHP_T1LIB /usr/local /usr; do @@ -38075,28 +38622,28 @@ done if test -z "$GD_T1_DIR"; then - { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } + as_fn_error $? "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_T1_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -38107,20 +38654,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -38133,210 +38680,211 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:38180: checking for T1_StrError in -lt1" >&5 -ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_t1_T1_StrError+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lt1 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -T1_StrError() -; return 0; } -EOF -if { (eval echo configure:38199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char T1_StrError (); +int +main () +{ +return T1_StrError (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_t1_T1_StrError=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_t1_T1_StrError=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_LIBT1 1 -EOF - + +$as_echo "#define HAVE_LIBT1 1" >>confdefs.h + + if test "$GD_T1_DIR/include" != "/usr/include"; then - + if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/include else - + ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD" if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then - + if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then - + if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$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 t1 in c|c_r|pthread*) ;; - *) - LIBS="-lt1 $LIBS" + *) + LIBS="-lt1 $LIBS" ;; esac @@ -38346,147 +38894,119 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - - { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD13 1 -EOF +$as_echo "#define HAVE_LIBGD 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD15 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD20 1 -EOF +$as_echo "#define HAVE_LIBGD13 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD204 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGESETTILE 1 -EOF +$as_echo "#define HAVE_LIBGD15 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGESETBRUSH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GDIMAGECOLORRESOLVE 1 -EOF +$as_echo "#define HAVE_LIBGD20 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_COLORCLOSESTHWB 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_WBMP 1 -EOF +$as_echo "#define HAVE_LIBGD204 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_GD2 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_PNG 1 -EOF +$as_echo "#define HAVE_GD_IMAGESETTILE 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_XBM 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_BUNDLED 1 -EOF +$as_echo "#define HAVE_GD_IMAGESETBRUSH 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_READ 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_CREATE 1 -EOF +$as_echo "#define HAVE_GDIMAGECOLORRESOLVE 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGEELLIPSE 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_FONTCACHESHUTDOWN 1 -EOF +$as_echo "#define HAVE_COLORCLOSESTHWB 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_FONTMUTEX 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_DYNAMIC_CTX_EX 1 -EOF +$as_echo "#define HAVE_GD_WBMP 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_CTX 1 -EOF + +$as_echo "#define HAVE_GD_GD2 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_XBM 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_BUNDLED 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_GIF_READ 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_GIF_CREATE 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_IMAGEELLIPSE 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_FONTCACHESHUTDOWN 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_FONTMUTEX 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_DYNAMIC_CTX_EX 1" >>confdefs.h + + +$as_echo "#define HAVE_GD_GIF_CTX 1" >>confdefs.h GDLIB_CFLAGS="-DHAVE_LIBPNG" if test -n "$GD_JPEG_DIR"; then - cat >> confdefs.h <<\EOF -#define HAVE_GD_JPG 1 -EOF + +$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG" fi if test -n "$GD_XPM_DIR"; then - cat >> confdefs.h <<\EOF -#define HAVE_GD_XPM 1 -EOF + +$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" fi if test -n "$FREETYPE2_DIR"; then - cat >> confdefs.h <<\EOF -#define HAVE_GD_STRINGFT 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_GD_STRINGFTEX 1 -EOF +$as_echo "#define HAVE_GD_STRINGFT 1" >>confdefs.h - cat >> confdefs.h <<\EOF -#define ENABLE_GD_TTF 1 -EOF + +$as_echo "#define HAVE_GD_STRINGFTEX 1" >>confdefs.h + + +$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF" fi if test -n "$USE_GD_JIS_CONV"; then - cat >> confdefs.h <<\EOF -#define USE_GD_JISX0208 1 -EOF + +$as_echo "#define USE_GD_JISX0208 1" >>confdefs.h GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi @@ -38498,7 +39018,7 @@ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c \ libgd/gd_rotate.c libgd/gd_color.c" - + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then PHP_ZLIB_DIR="$PHP_ZLIB_DIR" @@ -38507,7 +39027,7 @@ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } + as_fn_error $? "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -38521,44 +39041,44 @@ done fi - + if test "$PHP_GD_NATIVE_TTF" = "yes"; then - cat >> confdefs.h <<\EOF -#define USE_GD_IMGSTRTTF 1 -EOF + +$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h fi - + if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then - { echo "configure: error: libjpeg.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libjpeg.(a|so) not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_JPEG_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -38569,20 +39089,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -38595,206 +39115,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:38642: checking for jpeg_read_header in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -jpeg_read_header() -; return 0; } -EOF -if { (eval echo configure:38661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char jpeg_read_header (); +int +main () +{ +return jpeg_read_header (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_jpeg_jpeg_read_header=yes +else + ac_cv_lib_jpeg_jpeg_read_header=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_JPEG_DIR/include" != "/usr/include"; then - + if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/include else - + ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD" if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then - + if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + + + + 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 fi else - + if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then - + if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_JPEG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$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 jpeg in c|c_r|pthread*) ;; - *) - LIBS="-ljpeg $LIBS" + *) + LIBS="-ljpeg $LIBS" ;; esac @@ -38804,62 +39326,63 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - - { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-jpeg-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-jpeg-dir=" >&5 +$as_echo "If configure fails try --with-jpeg-dir=" >&6; } fi - + if test "$PHP_PNG_DIR" != "no"; then for i in $PHP_PNG_DIR /usr/local /usr; do + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then - { echo "configure: error: libpng.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libpng.(a|so) not found." "$LINENO" 5 fi if test "$PHP_ZLIB_DIR" = "no"; then - { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=" 1>&2; exit 1; } + as_fn_error $? "PNG support requires ZLIB. Use --with-zlib-dir=" "$LINENO" 5 fi if test ! -f $GD_PNG_DIR/include/png.h; then - { echo "configure: error: png.h not found." 1>&2; exit 1; } + as_fn_error $? "png.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -38870,20 +39393,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -38896,206 +39419,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:38943: checking for png_write_image in -lpng" >&5 -ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_png_png_write_image+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpng $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -png_write_image() -; return 0; } -EOF -if { (eval echo configure:38962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_write_image (); +int +main () +{ +return png_write_image (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_write_image=yes +else + ac_cv_lib_png_png_write_image=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_PNG_DIR/include" != "/usr/include"; then - + if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/include else - + ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -39105,94 +39630,94 @@ fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD" if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then - + if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then - + if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_PNG_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$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 png in c|c_r|pthread*) ;; - *) - LIBS="-lpng $LIBS" + *) + LIBS="-lpng $LIBS" ;; esac @@ -39202,34 +39727,35 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - - { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-png-dir= and --with-zlib-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-png-dir= and --with-zlib-dir=" >&5 +$as_echo "If configure fails try --with-png-dir= and --with-zlib-dir=" >&6; } fi - + if test "$PHP_XPM_DIR" != "no"; then for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break done if test -z "$GD_XPM_DIR"; then - { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; } + as_fn_error $? "libXpm.(a|so) not found." "$LINENO" 5 fi for i in include include/X11; do @@ -39237,28 +39763,28 @@ done if test -z "$GD_XPM_INC"; then - { echo "configure: error: xpm.h not found." 1>&2; exit 1; } + as_fn_error $? "xpm.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -39269,20 +39795,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -39295,206 +39821,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:39342: checking for XpmFreeXpmImage in -lXpm" >&5 -ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5 +$as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; } +if ${ac_cv_lib_Xpm_XpmFreeXpmImage+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -XpmFreeXpmImage() -; return 0; } -EOF -if { (eval echo configure:39361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XpmFreeXpmImage (); +int +main () +{ +return XpmFreeXpmImage (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xpm_XpmFreeXpmImage=yes +else + ac_cv_lib_Xpm_XpmFreeXpmImage=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 +$as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; } +if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$GD_XPM_INC" != "/usr/include"; then - + if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_INC else - + ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD" if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$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 Xpm in c|c_r|pthread*) ;; - *) - LIBS="-lXpm $LIBS" + *) + LIBS="-lXpm $LIBS" ;; esac @@ -39504,94 +40032,94 @@ fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD" if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then - + if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_XPM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$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 X11 in c|c_r|pthread*) ;; - *) - LIBS="-lX11 $LIBS" + *) + LIBS="-lX11 $LIBS" ;; esac @@ -39601,25 +40129,25 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - - { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-xpm-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-xpm-dir=" >&5 +$as_echo "If configure fails try --with-xpm-dir=" >&6; } fi - + if test "$PHP_FREETYPE_DIR" != "no"; then for i in $PHP_FREETYPE_DIR /usr/local /usr; do @@ -39631,28 +40159,28 @@ done if test -z "$FREETYPE2_DIR"; then - { echo "configure: error: freetype.h not found." 1>&2; exit 1; } + as_fn_error $? "freetype.h not found." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$FREETYPE2_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -39663,20 +40191,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -39689,175 +40217,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 -echo "configure:39736: checking for FT_New_Face in -lfreetype" >&5 -ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_freetype_FT_New_Face+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -FT_New_Face() -; return 0; } -EOF -if { (eval echo configure:39755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char FT_New_Face (); +int +main () +{ +return FT_New_Face (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_freetype_FT_New_Face=yes +else + ac_cv_lib_freetype_FT_New_Face=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD" if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then - + if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then - + if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$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 freetype in c|c_r|pthread*) ;; - *) - LIBS="-lfreetype $LIBS" + *) + LIBS="-lfreetype $LIBS" ;; esac @@ -39867,99 +40397,96 @@ fi - + if test "$FREETYPE2_DIR/include" != "/usr/include"; then - + if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_DIR/include else - + ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`" 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 - + if test "$FREETYPE2_INC_DIR" != "/usr/include"; then - + if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then ai_p=$FREETYPE2_INC_DIR else - + ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`" 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 - cat >> confdefs.h <<\EOF -#define USE_GD_IMGSTRTTF 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBFREETYPE 1 -EOF +$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h + + +$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h + - cat >> confdefs.h <<\EOF -#define ENABLE_GD_TTF 1 -EOF - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_freetype_FT_New_Face - - { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi else - echo "$ac_t""If configure fails try --with-freetype-dir=" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-freetype-dir=" >&5 +$as_echo "If configure fails try --with-freetype-dir=" >&6; } fi - + if test "$PHP_T1LIB" != "no"; then for i in $PHP_T1LIB /usr/local /usr; do @@ -39967,28 +40494,28 @@ done if test -z "$GD_T1_DIR"; then - { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } + as_fn_error $? "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_T1_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -39999,20 +40526,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -40025,210 +40552,211 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:40072: checking for T1_StrError in -lt1" >&5 -ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_t1_T1_StrError+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lt1 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -T1_StrError() -; return 0; } -EOF -if { (eval echo configure:40091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char T1_StrError (); +int +main () +{ +return T1_StrError (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_t1_T1_StrError=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_t1_T1_StrError=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_LIBT1 1 -EOF - + +$as_echo "#define HAVE_LIBT1 1" >>confdefs.h + + if test "$GD_T1_DIR/include" != "/usr/include"; then - + if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/include else - + ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD" if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then - + if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then - + if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GD_T1_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$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 t1 in c|c_r|pthread*) ;; - *) - LIBS="-lt1 $LIBS" + *) + LIBS="-lt1 $LIBS" ;; esac @@ -40238,18 +40766,17 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - - { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5 + + fi fi @@ -40264,94 +40791,94 @@ done if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-lgd $GD_SHARED_LIBADD" if test -n "$GD_LIB"; then - + if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then - + if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then ai_p=$GD_LIB else - + ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_LIB\"`" fi - + if test "$ext_shared" = "yes"; then GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GD_LIB"; then - + if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then - + if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then ai_p=$GD_LIB else - + ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_LIB\"`" 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 gd in c|c_r|pthread*) ;; - *) - LIBS="-lgd $LIBS" + *) + LIBS="-lgd $LIBS" ;; esac @@ -40361,28 +40888,27 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD 1 -EOF - - +$as_echo "#define HAVE_LIBGD 1" >>confdefs.h + + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -40393,20 +40919,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -40419,118 +40945,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 -echo "configure:40466: checking for gdImageString16 in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageString16 in -lgd" >&5 +$as_echo_n "checking for gdImageString16 in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageString16+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageString16() -; return 0; } -EOF -if { (eval echo configure:40485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageString16 (); +int +main () +{ +return gdImageString16 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageString16=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageString16=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageString16" >&5 +$as_echo "$ac_cv_lib_gd_gdImageString16" >&6; } +if test "x$ac_cv_lib_gd_gdImageString16" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD13 1 -EOF - -else - echo "$ac_t""no" 1>&6 +$as_echo "#define HAVE_LIBGD13 1" >>confdefs.h + + +else LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageString16 - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -40541,20 +41067,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -40567,118 +41093,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 -echo "configure:40614: checking for gdImagePaletteCopy in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImagePaletteCopy in -lgd" >&5 +$as_echo_n "checking for gdImagePaletteCopy in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImagePaletteCopy+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImagePaletteCopy() -; return 0; } -EOF -if { (eval echo configure:40633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImagePaletteCopy (); +int +main () +{ +return gdImagePaletteCopy (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImagePaletteCopy=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImagePaletteCopy=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImagePaletteCopy" >&5 +$as_echo "$ac_cv_lib_gd_gdImagePaletteCopy" >&6; } +if test "x$ac_cv_lib_gd_gdImagePaletteCopy" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD15 1 -EOF - +$as_echo "#define HAVE_LIBGD15 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImagePaletteCopy - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -40689,20 +41215,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -40715,118 +41241,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:40762: checking for gdImageCreateFromPng in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromPng in -lgd" >&5 +$as_echo_n "checking for gdImageCreateFromPng in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateFromPng+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateFromPng() -; return 0; } -EOF -if { (eval echo configure:40781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateFromPng (); +int +main () +{ +return gdImageCreateFromPng (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateFromPng=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateFromPng=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_PNG 1 -EOF - +$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateFromPng - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -40837,20 +41363,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -40863,118 +41389,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 -echo "configure:40910: checking for gdImageCreateFromGif in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromGif in -lgd" >&5 +$as_echo_n "checking for gdImageCreateFromGif in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateFromGif+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateFromGif() -; return 0; } -EOF -if { (eval echo configure:40929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateFromGif (); +int +main () +{ +return gdImageCreateFromGif (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateFromGif=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateFromGif=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromGif" >&5 +$as_echo "$ac_cv_lib_gd_gdImageCreateFromGif" >&6; } +if test "x$ac_cv_lib_gd_gdImageCreateFromGif" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_READ 1 -EOF - +$as_echo "#define HAVE_GD_GIF_READ 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateFromGif - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -40985,20 +41511,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41011,118 +41537,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 -echo "configure:41058: checking for gdImageGif in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGif in -lgd" >&5 +$as_echo_n "checking for gdImageGif in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageGif+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageGif() -; return 0; } -EOF -if { (eval echo configure:41077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageGif (); +int +main () +{ +return gdImageGif (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageGif=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageGif=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGif" >&5 +$as_echo "$ac_cv_lib_gd_gdImageGif" >&6; } +if test "x$ac_cv_lib_gd_gdImageGif" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_CREATE 1 -EOF - +$as_echo "#define HAVE_GD_GIF_CREATE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageGif - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41133,20 +41659,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41159,118 +41685,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 -echo "configure:41206: checking for gdImageWBMP in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageWBMP in -lgd" >&5 +$as_echo_n "checking for gdImageWBMP in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageWBMP+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageWBMP() -; return 0; } -EOF -if { (eval echo configure:41225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageWBMP (); +int +main () +{ +return gdImageWBMP (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageWBMP=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageWBMP=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageWBMP" >&5 +$as_echo "$ac_cv_lib_gd_gdImageWBMP" >&6; } +if test "x$ac_cv_lib_gd_gdImageWBMP" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_WBMP 1 -EOF - +$as_echo "#define HAVE_GD_WBMP 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageWBMP - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41281,20 +41807,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41307,118 +41833,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 -echo "configure:41354: checking for gdImageCreateFromJpeg in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromJpeg in -lgd" >&5 +$as_echo_n "checking for gdImageCreateFromJpeg in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateFromJpeg+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateFromJpeg() -; return 0; } -EOF -if { (eval echo configure:41373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateFromJpeg (); +int +main () +{ +return gdImageCreateFromJpeg (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateFromJpeg=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateFromJpeg=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_JPG 1 -EOF - +$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateFromJpeg - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41429,20 +41955,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41455,118 +41981,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 -echo "configure:41502: checking for gdImageCreateFromXpm in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5 +$as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateFromXpm+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateFromXpm() -; return 0; } -EOF -if { (eval echo configure:41521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateFromXpm (); +int +main () +{ +return gdImageCreateFromXpm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateFromXpm=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateFromXpm=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_XPM 1 -EOF - +$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateFromXpm - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41577,20 +42103,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41603,118 +42129,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 -echo "configure:41650: checking for gdImageCreateFromGd2 in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromGd2 in -lgd" >&5 +$as_echo_n "checking for gdImageCreateFromGd2 in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateFromGd2+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateFromGd2() -; return 0; } -EOF -if { (eval echo configure:41669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateFromGd2 (); +int +main () +{ +return gdImageCreateFromGd2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateFromGd2=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateFromGd2=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromGd2" >&5 +$as_echo "$ac_cv_lib_gd_gdImageCreateFromGd2" >&6; } +if test "x$ac_cv_lib_gd_gdImageCreateFromGd2" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_GD2 1 -EOF - +$as_echo "#define HAVE_GD_GD2 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateFromGd2 - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41725,20 +42251,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41751,118 +42277,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 -echo "configure:41798: checking for gdImageCreateTrueColor in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateTrueColor in -lgd" >&5 +$as_echo_n "checking for gdImageCreateTrueColor in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreateTrueColor+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreateTrueColor() -; return 0; } -EOF -if { (eval echo configure:41817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreateTrueColor (); +int +main () +{ +return gdImageCreateTrueColor (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreateTrueColor=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageCreateTrueColor=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateTrueColor" >&5 +$as_echo "$ac_cv_lib_gd_gdImageCreateTrueColor" >&6; } +if test "x$ac_cv_lib_gd_gdImageCreateTrueColor" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD20 1 -EOF - +$as_echo "#define HAVE_LIBGD20 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreateTrueColor - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -41873,20 +42399,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -41899,118 +42425,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 -echo "configure:41946: checking for gdImageSetTile in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetTile in -lgd" >&5 +$as_echo_n "checking for gdImageSetTile in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageSetTile+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageSetTile() -; return 0; } -EOF -if { (eval echo configure:41965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageSetTile (); +int +main () +{ +return gdImageSetTile (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageSetTile=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageSetTile=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageSetTile" >&5 +$as_echo "$ac_cv_lib_gd_gdImageSetTile" >&6; } +if test "x$ac_cv_lib_gd_gdImageSetTile" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGESETTILE 1 -EOF - +$as_echo "#define HAVE_GD_IMAGESETTILE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageSetTile - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42021,20 +42547,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42047,118 +42573,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 -echo "configure:42094: checking for gdImageEllipse in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageEllipse in -lgd" >&5 +$as_echo_n "checking for gdImageEllipse in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageEllipse+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageEllipse() -; return 0; } -EOF -if { (eval echo configure:42113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageEllipse (); +int +main () +{ +return gdImageEllipse (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageEllipse=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageEllipse=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageEllipse" >&5 +$as_echo "$ac_cv_lib_gd_gdImageEllipse" >&6; } +if test "x$ac_cv_lib_gd_gdImageEllipse" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGEELLIPSE 1 -EOF - +$as_echo "#define HAVE_GD_IMAGEELLIPSE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageEllipse - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42169,20 +42695,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42195,118 +42721,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 -echo "configure:42242: checking for gdImageSetBrush in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetBrush in -lgd" >&5 +$as_echo_n "checking for gdImageSetBrush in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageSetBrush+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageSetBrush() -; return 0; } -EOF -if { (eval echo configure:42261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageSetBrush (); +int +main () +{ +return gdImageSetBrush (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageSetBrush=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageSetBrush=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageSetBrush" >&5 +$as_echo "$ac_cv_lib_gd_gdImageSetBrush" >&6; } +if test "x$ac_cv_lib_gd_gdImageSetBrush" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_IMAGESETBRUSH 1 -EOF - +$as_echo "#define HAVE_GD_IMAGESETBRUSH 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageSetBrush - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42317,20 +42843,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42343,118 +42869,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 -echo "configure:42390: checking for gdImageStringTTF in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringTTF in -lgd" >&5 +$as_echo_n "checking for gdImageStringTTF in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageStringTTF+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageStringTTF() -; return 0; } -EOF -if { (eval echo configure:42409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageStringTTF (); +int +main () +{ +return gdImageStringTTF (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageStringTTF=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageStringTTF=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringTTF" >&5 +$as_echo "$ac_cv_lib_gd_gdImageStringTTF" >&6; } +if test "x$ac_cv_lib_gd_gdImageStringTTF" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_STRINGTTF 1 -EOF - +$as_echo "#define HAVE_GD_STRINGTTF 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageStringTTF - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42465,20 +42991,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42491,118 +43017,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 -echo "configure:42538: checking for gdImageStringFT in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -lgd" >&5 +$as_echo_n "checking for gdImageStringFT in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageStringFT+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageStringFT() -; return 0; } -EOF -if { (eval echo configure:42557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageStringFT (); +int +main () +{ +return gdImageStringFT (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageStringFT=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageStringFT=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_STRINGFT 1 -EOF - +$as_echo "#define HAVE_GD_STRINGFT 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageStringFT - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42613,20 +43139,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42639,118 +43165,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 -echo "configure:42686: checking for gdImageStringFTEx in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFTEx in -lgd" >&5 +$as_echo_n "checking for gdImageStringFTEx in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageStringFTEx+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageStringFTEx() -; return 0; } -EOF -if { (eval echo configure:42705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageStringFTEx (); +int +main () +{ +return gdImageStringFTEx (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageStringFTEx=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageStringFTEx=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringFTEx" >&5 +$as_echo "$ac_cv_lib_gd_gdImageStringFTEx" >&6; } +if test "x$ac_cv_lib_gd_gdImageStringFTEx" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_STRINGFTEX 1 -EOF - +$as_echo "#define HAVE_GD_STRINGFTEX 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageStringFTEx - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42761,20 +43287,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42787,118 +43313,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 -echo "configure:42834: checking for gdImageColorClosestHWB in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageColorClosestHWB in -lgd" >&5 +$as_echo_n "checking for gdImageColorClosestHWB in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageColorClosestHWB+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageColorClosestHWB() -; return 0; } -EOF -if { (eval echo configure:42853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageColorClosestHWB (); +int +main () +{ +return gdImageColorClosestHWB (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageColorClosestHWB=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageColorClosestHWB=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageColorClosestHWB" >&5 +$as_echo "$ac_cv_lib_gd_gdImageColorClosestHWB" >&6; } +if test "x$ac_cv_lib_gd_gdImageColorClosestHWB" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_COLORCLOSESTHWB 1 -EOF - +$as_echo "#define HAVE_COLORCLOSESTHWB 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageColorClosestHWB - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -42909,20 +43435,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -42935,118 +43461,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 -echo "configure:42982: checking for gdImageColorResolve in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageColorResolve in -lgd" >&5 +$as_echo_n "checking for gdImageColorResolve in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageColorResolve+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageColorResolve() -; return 0; } -EOF -if { (eval echo configure:43001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageColorResolve (); +int +main () +{ +return gdImageColorResolve (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageColorResolve=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageColorResolve=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageColorResolve" >&5 +$as_echo "$ac_cv_lib_gd_gdImageColorResolve" >&6; } +if test "x$ac_cv_lib_gd_gdImageColorResolve" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GDIMAGECOLORRESOLVE 1 -EOF - +$as_echo "#define HAVE_GDIMAGECOLORRESOLVE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageColorResolve - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43057,20 +43583,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43083,118 +43609,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 -echo "configure:43130: checking for gdImageGifCtx in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGifCtx in -lgd" >&5 +$as_echo_n "checking for gdImageGifCtx in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageGifCtx+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageGifCtx() -; return 0; } -EOF -if { (eval echo configure:43149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageGifCtx (); +int +main () +{ +return gdImageGifCtx (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageGifCtx=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdImageGifCtx=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGifCtx" >&5 +$as_echo "$ac_cv_lib_gd_gdImageGifCtx" >&6; } +if test "x$ac_cv_lib_gd_gdImageGifCtx" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_GIF_CTX 1 -EOF - +$as_echo "#define HAVE_GD_GIF_CTX 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageGifCtx - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43205,20 +43731,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43231,118 +43757,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 -echo "configure:43278: checking for gdCacheCreate in -lgd" >&5 -ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdCacheCreate in -lgd" >&5 +$as_echo_n "checking for gdCacheCreate in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdCacheCreate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdCacheCreate() -; return 0; } -EOF -if { (eval echo configure:43297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdCacheCreate (); +int +main () +{ +return gdCacheCreate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdCacheCreate=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdCacheCreate=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdCacheCreate" >&5 +$as_echo "$ac_cv_lib_gd_gdCacheCreate" >&6; } +if test "x$ac_cv_lib_gd_gdCacheCreate" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_CACHE_CREATE 1 -EOF - +$as_echo "#define HAVE_GD_CACHE_CREATE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdCacheCreate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43353,20 +43879,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43379,118 +43905,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 -echo "configure:43426: checking for gdFontCacheShutdown in -lgd" >&5 -ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5 +$as_echo_n "checking for gdFontCacheShutdown in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdFontCacheShutdown+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdFontCacheShutdown() -; return 0; } -EOF -if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdFontCacheShutdown (); +int +main () +{ +return gdFontCacheShutdown (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdFontCacheShutdown=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdFontCacheShutdown=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5 +$as_echo "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; } +if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_FONTCACHESHUTDOWN 1 -EOF - +$as_echo "#define HAVE_GD_FONTCACHESHUTDOWN 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdFontCacheShutdown - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43501,20 +44027,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43527,118 +44053,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 -echo "configure:43574: checking for gdFreeFontCache in -lgd" >&5 -ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFreeFontCache in -lgd" >&5 +$as_echo_n "checking for gdFreeFontCache in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdFreeFontCache+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdFreeFontCache() -; return 0; } -EOF -if { (eval echo configure:43593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdFreeFontCache (); +int +main () +{ +return gdFreeFontCache (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdFreeFontCache=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdFreeFontCache=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFreeFontCache" >&5 +$as_echo "$ac_cv_lib_gd_gdFreeFontCache" >&6; } +if test "x$ac_cv_lib_gd_gdFreeFontCache" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_FREEFONTCACHE 1 -EOF - +$as_echo "#define HAVE_GD_FREEFONTCACHE 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdFreeFontCache - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43649,20 +44175,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43675,118 +44201,118 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 -echo "configure:43722: checking for gdFontCacheMutexSetup in -lgd" >&5 -ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheMutexSetup in -lgd" >&5 +$as_echo_n "checking for gdFontCacheMutexSetup in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdFontCacheMutexSetup+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdFontCacheMutexSetup() -; return 0; } -EOF -if { (eval echo configure:43741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdFontCacheMutexSetup (); +int +main () +{ +return gdFontCacheMutexSetup (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdFontCacheMutexSetup=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdFontCacheMutexSetup=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheMutexSetup" >&5 +$as_echo "$ac_cv_lib_gd_gdFontCacheMutexSetup" >&6; } +if test "x$ac_cv_lib_gd_gdFontCacheMutexSetup" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_FONTMUTEX 1 -EOF - +$as_echo "#define HAVE_GD_FONTMUTEX 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdFontCacheMutexSetup - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -43797,20 +44323,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -43823,115 +44349,115 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 -echo "configure:43870: checking for gdNewDynamicCtxEx in -lgd" >&5 -ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdNewDynamicCtxEx in -lgd" >&5 +$as_echo_n "checking for gdNewDynamicCtxEx in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdNewDynamicCtxEx+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdNewDynamicCtxEx() -; return 0; } -EOF -if { (eval echo configure:43889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdNewDynamicCtxEx (); +int +main () +{ +return gdNewDynamicCtxEx (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdNewDynamicCtxEx=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_gd_gdNewDynamicCtxEx=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdNewDynamicCtxEx" >&5 +$as_echo "$ac_cv_lib_gd_gdNewDynamicCtxEx" >&6; } +if test "x$ac_cv_lib_gd_gdNewDynamicCtxEx" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - cat >> confdefs.h <<\EOF -#define HAVE_GD_DYNAMIC_CTX_EX 1 -EOF - +$as_echo "#define HAVE_GD_DYNAMIC_CTX_EX 1" >>confdefs.h + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdNewDynamicCtxEx - - + + fi elif test -z "$GD_INCLUDE"; then - { echo "configure: error: Unable to find gd.h anywhere under $PHP_GD" 1>&2; exit 1; } + as_fn_error $? "Unable to find gd.h anywhere under $PHP_GD" "$LINENO" 5 else - { echo "configure: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" 1>&2; exit 1; } + as_fn_error $? "Unable to find libgd.(a|so) anywhere under $PHP_GD" "$LINENO" 5 fi - + if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then GD_INCLUDE=$GD_INCLUDE else - + ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" GD_INCLUDE="$ep_realdir/`basename \"$GD_INCLUDE\"`" fi @@ -43939,41 +44465,39 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$GD_INCLUDE - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include - -int main() { + +int +main () +{ gdIOCtx *ctx; ctx = malloc(sizeof(gdIOCtx)); ctx->gd_free = 1; - -; return 0; } -EOF -if { (eval echo configure:43958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HAVE_LIBGD204 1 -EOF - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + +$as_echo "#define HAVE_LIBGD204 1" >>confdefs.h + + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$old_CPPFLAGS fi fi if test "$PHP_GD" != "no"; then - + ext_builddir=ext/gd ext_srcdir=$abs_srcdir/ext/gd @@ -43981,15 +44505,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_GD_SHARED=no - - + + case ext/gd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44002,12 +44526,12 @@ old_IFS=$IFS for ac_src in gd.c $extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44031,14 +44555,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_GD_SHARED=yes - + case ext/gd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -44051,12 +44575,12 @@ old_IFS=$IFS for ac_src in gd.c $extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_gd="$shared_objects_gd $ac_bdir$ac_obj.lo" case $ac_src in @@ -44074,7 +44598,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -44084,7 +44608,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGD, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(GD_SHARED_LIBADD)' ;; *) suffix=la @@ -44097,7 +44621,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgd.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gd" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_GD 1 -EOF +_ACEOF fi fi @@ -44159,15 +44684,15 @@ PHP_GD_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/gd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44180,12 +44705,12 @@ old_IFS=$IFS for ac_src in gd.c $extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44205,15 +44730,15 @@ EXT_STATIC="$EXT_STATIC gd" ;; *) - - + + case ext/gd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44226,12 +44751,12 @@ old_IFS=$IFS for ac_src in gd.c $extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44252,41 +44777,40 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC gd" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=gd - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/libgd" - + if test "$GD_MODULE_TYPE" = "builtin"; then GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" - + old_LIBS=$LIBS LIBS=" $GD_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ char foobar () {} char foobar(); @@ -44294,80 +44818,77 @@ foobar(); return 0; } - -EOF -if { (eval echo configure:44300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi else GD_HEADER_DIRS="ext/gd/" GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" - + if test "$GD_INCLUDE" != "/usr/include"; then - + if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$GD_INCLUDE else - + ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GD_INCLUDE\"`" 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 - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -44378,20 +44899,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -44404,124 +44925,125 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 -echo "configure:44451: checking for gdImageCreate in -lgd" >&5 -ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5 +$as_echo_n "checking for gdImageCreate in -lgd... " >&6; } +if ${ac_cv_lib_gd_gdImageCreate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gdImageCreate() -; return 0; } -EOF -if { (eval echo configure:44470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gdImageCreate (); +int +main () +{ +return gdImageCreate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gd_gdImageCreate=yes +else + ac_cv_lib_gd_gdImageCreate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5 +$as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; } +if test "x$ac_cv_lib_gd_gdImageCreate" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreate - - { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5 + + fi fi - - + + for header_file in $GD_HEADER_DIRS; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - PHP_VAR_SUBST="$PHP_VAR_SUBST GDLIB_CFLAGS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST GD_SHARED_LIBADD" fi @@ -44530,14 +45052,14 @@ php_with_gettext=no -echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 -echo "configure:44535: checking for GNU gettext support" >&5 -# Check whether --with-gettext or --without-gettext was given. -if test "${with_gettext+set}" = set; then - withval="$with_gettext" - PHP_GETTEXT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5 +$as_echo_n "checking for GNU gettext support... " >&6; } + +# Check whether --with-gettext was given. +if test "${with_gettext+set}" = set; then : + withval=$with_gettext; PHP_GETTEXT=$withval else - + PHP_GETTEXT=no test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL @@ -44566,7 +45088,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -44577,111 +45100,112 @@ done if test -z "$GETTEXT_DIR"; then - { echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; } + as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5 fi GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_INCDIR=$GETTEXT_DIR/include - + O_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" - echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:44590: checking for bindtextdomain in -lintl" >&5 -ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bindtextdomain() -; return 0; } -EOF -if { (eval echo configure:44609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bindtextdomain (); +int +main () +{ +return bindtextdomain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes +else + ac_cv_lib_intl_bindtextdomain=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - GETTEXT_LIBS=intl GETTEXT_CHECK_IN_LIB=intl - + else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 -echo "configure:44631: checking for bindtextdomain in -lc" >&5 -ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5 +$as_echo_n "checking for bindtextdomain in -lc... " >&6; } +if ${ac_cv_lib_c_bindtextdomain+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bindtextdomain() -; return 0; } -EOF -if { (eval echo configure:44650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bindtextdomain (); +int +main () +{ +return bindtextdomain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_bindtextdomain=yes +else + ac_cv_lib_c_bindtextdomain=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_c_bindtextdomain" >&6; } +if test "x$ac_cv_lib_c_bindtextdomain" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - GETTEXT_LIBS= GETTEXT_CHECK_IN_LIB=c - + else - echo "$ac_t""no" 1>&6 - { echo "configure: error: Unable to find required gettext library" 1>&2; exit 1; } - + as_fn_error $? "Unable to find required gettext library" "$LINENO" 5 + fi - + fi LDFLAGS=$O_LDFLAGS - cat >> confdefs.h <<\EOF -#define HAVE_LIBINTL 1 -EOF - +$as_echo "#define HAVE_LIBINTL 1" >>confdefs.h + + ext_builddir=ext/gettext ext_srcdir=$abs_srcdir/ext/gettext @@ -44689,15 +45213,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_GETTEXT_SHARED=no - - + + case ext/gettext in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44710,12 +45234,12 @@ old_IFS=$IFS for ac_src in gettext.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44739,14 +45263,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_GETTEXT_SHARED=yes - + case ext/gettext in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -44759,12 +45283,12 @@ old_IFS=$IFS for ac_src in gettext.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_gettext="$shared_objects_gettext $ac_bdir$ac_obj.lo" case $ac_src in @@ -44782,7 +45306,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -44792,7 +45316,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGETTEXT, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(GETTEXT_SHARED_LIBADD)' ;; *) suffix=la @@ -44805,7 +45329,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgettext.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gettext" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_GETTEXT 1 -EOF +_ACEOF fi fi @@ -44867,15 +45392,15 @@ PHP_GETTEXT_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/gettext in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44888,12 +45413,12 @@ old_IFS=$IFS for ac_src in gettext.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44913,15 +45438,15 @@ EXT_STATIC="$EXT_STATIC gettext" ;; *) - - + + case ext/gettext in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -44934,12 +45459,12 @@ old_IFS=$IFS for ac_src in gettext.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -44960,112 +45485,112 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC gettext" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=gettext - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST GETTEXT_SHARED_LIBADD" if test -n "$GETTEXT_LIBS"; then - + if test "$ext_shared" = "yes"; then GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD" if test -n "$GETTEXT_LIBDIR"; then - + if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then - + if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GETTEXT_LIBDIR else - + ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GETTEXT_SHARED_LIBADD="-L$ai_p $GETTEXT_SHARED_LIBADD" test -n "$ld_runpath_switch" && GETTEXT_SHARED_LIBADD="$ld_runpath_switch$ai_p $GETTEXT_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GETTEXT_LIBDIR"; then - + if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then - + if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GETTEXT_LIBDIR else - + ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GETTEXT_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 $GETTEXT_LIBS in c|c_r|pthread*) ;; - *) - LIBS="-l$GETTEXT_LIBS $LIBS" + *) + LIBS="-l$GETTEXT_LIBS $LIBS" ;; esac @@ -45077,225 +45602,229 @@ fi - + if test "$GETTEXT_INCDIR" != "/usr/include"; then - + if test -z "$GETTEXT_INCDIR" || echo "$GETTEXT_INCDIR" | grep '^/' >/dev/null ; then ai_p=$GETTEXT_INCDIR else - + ep_dir="`echo $GETTEXT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GETTEXT_INCDIR\"`" 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 - echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45114: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -ngettext() -; return 0; } -EOF -if { (eval echo configure:45133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ngettext (); +int +main () +{ +return ngettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_NGETTEXT 1 -EOF +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +$as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45157: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dngettext() -; return 0; } -EOF -if { (eval echo configure:45176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dngettext (); +int +main () +{ +return dngettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DNGETTEXT 1 -EOF +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +$as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45200: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dcngettext() -; return 0; } -EOF -if { (eval echo configure:45219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dcngettext (); +int +main () +{ +return dcngettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DCNGETTEXT 1 -EOF +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +$as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:45243: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 -ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bind_textdomain_codeset() -; return 0; } -EOF -if { (eval echo configure:45262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bind_textdomain_codeset (); +int +main () +{ +return bind_textdomain_codeset (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -EOF +$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - + fi php_with_gmp=no -echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 -echo "configure:45293: checking for GNU MP support" >&5 -# Check whether --with-gmp or --without-gmp was given. -if test "${with_gmp+set}" = set; then - withval="$with_gmp" - PHP_GMP=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5 +$as_echo_n "checking for GNU MP support... " >&6; } + +# Check whether --with-gmp was given. +if test "${with_gmp+set}" = set; then : + withval=$with_gmp; PHP_GMP=$withval else - + PHP_GMP=no test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL @@ -45324,7 +45853,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -45336,28 +45866,28 @@ done if test -z "$GMP_DIR"; then - { echo "configure: error: Unable to locate gmp.h" 1>&2; exit 1; } + as_fn_error $? "Unable to locate gmp.h" "$LINENO" 5 fi - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GMP_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -45368,20 +45898,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -45394,114 +45924,115 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:45441: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 -ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgmp $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -__gmp_randinit_lc_2exp_size() -; return 0; } -EOF -if { (eval echo configure:45460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __gmp_randinit_lc_2exp_size (); +int +main () +{ +return __gmp_randinit_lc_2exp_size (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=yes +else + ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gmp___gmp_randinit_lc_2exp_size - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GMP_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -45512,20 +46043,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -45538,193 +46069,194 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:45585: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 -ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgmp $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -gmp_randinit_lc_2exp_size() -; return 0; } -EOF -if { (eval echo configure:45604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gmp_randinit_lc_2exp_size (); +int +main () +{ +return gmp_randinit_lc_2exp_size (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=yes +else + ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gmp_gmp_randinit_lc_2exp_size - - { echo "configure: error: GNU MP Library version 4.1.2 or greater required." 1>&2; exit 1; } - - + + as_fn_error $? "GNU MP Library version 4.1.2 or greater required." "$LINENO" 5 + + fi - - + + fi - + if test "$ext_shared" = "yes"; then GMP_SHARED_LIBADD="-lgmp $GMP_SHARED_LIBADD" if test -n "$GMP_DIR/$PHP_LIBDIR"; then - + if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GMP_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then GMP_SHARED_LIBADD="-L$ai_p $GMP_SHARED_LIBADD" test -n "$ld_runpath_switch" && GMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $GMP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$GMP_DIR/$PHP_LIBDIR"; then - + if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$GMP_DIR/$PHP_LIBDIR else - + ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GMP_DIR/$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 gmp in c|c_r|pthread*) ;; - *) - LIBS="-lgmp $LIBS" + *) + LIBS="-lgmp $LIBS" ;; esac @@ -45734,39 +46266,39 @@ fi - + if test "$GMP_DIR/include" != "/usr/include"; then - + if test -z "$GMP_DIR/include" || echo "$GMP_DIR/include" | grep '^/' >/dev/null ; then ai_p=$GMP_DIR/include else - + ep_dir="`echo $GMP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$GMP_DIR/include\"`" 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 - + ext_builddir=ext/gmp ext_srcdir=$abs_srcdir/ext/gmp @@ -45774,15 +46306,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_GMP_SHARED=no - - + + case ext/gmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -45795,12 +46327,12 @@ old_IFS=$IFS for ac_src in gmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -45824,14 +46356,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_GMP_SHARED=yes - + case ext/gmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -45844,12 +46376,12 @@ old_IFS=$IFS for ac_src in gmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_gmp="$shared_objects_gmp $ac_bdir$ac_obj.lo" case $ac_src in @@ -45867,7 +46399,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -45877,7 +46409,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGMP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(GMP_SHARED_LIBADD)' ;; *) suffix=la @@ -45890,7 +46422,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgmp.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gmp" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_GMP 1 -EOF +_ACEOF fi fi @@ -45952,15 +46485,15 @@ PHP_GMP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/gmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -45973,12 +46506,12 @@ old_IFS=$IFS for ac_src in gmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -45998,15 +46531,15 @@ EXT_STATIC="$EXT_STATIC gmp" ;; *) - - + + case ext/gmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -46019,12 +46552,12 @@ old_IFS=$IFS for ac_src in gmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -46045,25 +46578,24 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC gmp" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=gmp - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD" - cat >> confdefs.h <<\EOF -#define HAVE_GMP 1 -EOF + +$as_echo "#define HAVE_GMP 1" >>confdefs.h fi @@ -46071,14 +46603,14 @@ php_with_mhash=no -echo $ac_n "checking for mhash support""... $ac_c" 1>&6 -echo "configure:46076: checking for mhash support" >&5 -# Check whether --with-mhash or --without-mhash was given. -if test "${with_mhash+set}" = set; then - withval="$with_mhash" - PHP_MHASH=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5 +$as_echo_n "checking for mhash support... " >&6; } + +# Check whether --with-mhash was given. +if test "${with_mhash+set}" = set; then : + withval=$with_mhash; PHP_MHASH=$withval else - + PHP_MHASH=no test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL @@ -46107,7 +46639,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -46115,14 +46648,13 @@ php_enable_hash=yes -echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 -echo "configure:46120: checking whether to enable hash support" >&5 -# Check whether --enable-hash or --disable-hash was given. -if test "${enable_hash+set}" = set; then - enableval="$enable_hash" - PHP_HASH=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable hash support" >&5 +$as_echo_n "checking whether to enable hash support... " >&6; } +# Check whether --enable-hash was given. +if test "${enable_hash+set}" = set; then : + enableval=$enable_hash; PHP_HASH=$enableval else - + PHP_HASH=yes test "$PHP_ENABLE_ALL" && PHP_HASH=$PHP_ENABLE_ALL @@ -46151,7 +46683,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -46161,31 +46694,28 @@ PHP_HASH="yes" fi - cat >> confdefs.h <<\EOF -#define PHP_MHASH_BC 1 -EOF + +$as_echo "#define PHP_MHASH_BC 1" >>confdefs.h fi if test "$PHP_HASH" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_HASH_EXT 1 -EOF +$as_echo "#define HAVE_HASH_EXT 1" >>confdefs.h - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:46178: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian_php+:} false; then : + $as_echo_n "(cached) " >&6 else - + ac_cv_c_bigendian_php=unknown - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_bigendian_php=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ int main(void) { @@ -46198,189 +46728,161 @@ return(1); } } - -EOF -if { (eval echo configure:46204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian_php=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_c_bigendian_php=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5 +$as_echo "$ac_cv_c_bigendian_php" >&6; } if test $ac_cv_c_bigendian_php = yes; then - cat >> confdefs.h <<\EOF -#define WORDS_BIGENDIAN -EOF + +$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h fi - echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:46229: checking size of short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_short=2 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(short)); - return(0); -} -EOF -if { (eval echo configure:46248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_short=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_short=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if ${ac_cv_sizeof_short+:} false; then : + $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 : + +else + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_short=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short -EOF +_ACEOF - echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:46268: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); -} -EOF -if { (eval echo configure:46287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $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 : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF - echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:46307: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); -} -EOF -if { (eval echo configure:46326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF +_ACEOF - echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:46346: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long long)); - return(0); -} -EOF -if { (eval echo configure:46365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if ${ac_cv_sizeof_long_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long -EOF +_ACEOF + - EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ hash_crc32.c hash_salsa.c" @@ -46388,8 +46890,8 @@ php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \ php_hash_types.h" - - + + ext_builddir=ext/hash ext_srcdir=$abs_srcdir/ext/hash @@ -46397,15 +46899,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_HASH_SHARED=no - - + + case ext/hash in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -46418,12 +46920,12 @@ old_IFS=$IFS for ac_src in $EXT_HASH_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -46447,14 +46949,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_HASH_SHARED=yes - + case ext/hash in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -46467,12 +46969,12 @@ old_IFS=$IFS for ac_src in $EXT_HASH_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_hash="$shared_objects_hash $ac_bdir$ac_obj.lo" case $ac_src in @@ -46490,7 +46992,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -46500,7 +47002,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPHASH, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(HASH_SHARED_LIBADD)' ;; *) suffix=la @@ -46513,7 +47015,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphash.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_hash" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_HASH 1 -EOF +_ACEOF fi fi @@ -46575,15 +47078,15 @@ PHP_HASH_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/hash in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -46596,12 +47099,12 @@ old_IFS=$IFS for ac_src in $EXT_HASH_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -46621,15 +47124,15 @@ EXT_STATIC="$EXT_STATIC hash" ;; *) - - + + case ext/hash in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -46642,12 +47145,12 @@ old_IFS=$IFS for ac_src in $EXT_HASH_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -46668,55 +47171,55 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC hash" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=hash - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - - + + + header_path=ext/hash for header_file in $EXT_HASH_HEADERS; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + + - fi php_with_iconv=yes -echo $ac_n "checking for iconv support""... $ac_c" 1>&6 -echo "configure:46714: checking for iconv support" >&5 -# Check whether --with-iconv or --without-iconv was given. -if test "${with_iconv+set}" = set; then - withval="$with_iconv" - PHP_ICONV=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5 +$as_echo_n "checking for iconv support... " >&6; } + +# Check whether --with-iconv was given. +if test "${with_iconv+set}" = set; then : + withval=$with_iconv; PHP_ICONV=$withval else - + PHP_ICONV=yes test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL @@ -46745,14 +47248,15 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_ICONV" != "no"; then - + found_iconv=no unset ICONV_DIR @@ -46770,113 +47274,27 @@ echo > ext/iconv/php_iconv_supports_errno.h if test "$PHP_ICONV" = "yes"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:46775: checking for iconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char iconv(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_iconv) || defined (__stub___iconv) -choke me -#else -iconv(); -#endif - -; return 0; } -EOF -if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_iconv=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_iconv=no" -fi -rm -f conftest* -fi + ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" +if test "x$ac_cv_func_iconv" = xyes; then : -if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found_iconv=yes - -else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:46824: checking for libiconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char libiconv(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_libiconv) || defined (__stub___libiconv) -choke me -#else -libiconv(); -#endif + ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv" +if test "x$ac_cv_func_libiconv" = xyes; then : -; return 0; } -EOF -if { (eval echo configure:46852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_libiconv=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_libiconv=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF + +$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h found_iconv=yes - -else - echo "$ac_t""no" 1>&6 + fi - + fi fi @@ -46885,9 +47303,8 @@ for i in $PHP_ICONV /usr/local /usr; do if test -r $i/include/giconv.h; then - cat >> confdefs.h <<\EOF -#define HAVE_GICONV_H 1 -EOF + +$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h ICONV_DIR=$i iconv_lib_name=giconv @@ -46900,31 +47317,31 @@ done if test -z "$ICONV_DIR"; then - { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } + as_fn_error $? "Please specify the install prefix of iconv with --with-iconv=" "$LINENO" 5 fi - + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$ICONV_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -46935,20 +47352,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -46961,130 +47378,131 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:47008: checking for libiconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$iconv_lib_name $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -libiconv() -; return 0; } -EOF -if { (eval echo configure:47027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char libiconv (); +int +main () +{ +return libiconv (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_iconv=yes - + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF - +$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h + + echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h - cat >> confdefs.h <<\EOF -#define ICONV_ALIASED_LIBICONV 1 -EOF - - +$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$iconv_lib_name_libiconv - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$ICONV_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -47095,20 +47513,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -47121,204 +47539,206 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:47168: checking for iconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$iconv_lib_name $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -iconv() -; return 0; } -EOF -if { (eval echo configure:47187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iconv (); +int +main () +{ +return iconv (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_iconv=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$iconv_lib_name_iconv - - + + fi - - + + fi fi fi if test "$found_iconv" = "yes"; then - + echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h - cat >> confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h if test -n "$ICONV_DIR"; then - + if test "$ext_shared" = "yes"; then ICONV_SHARED_LIBADD="-l$iconv_lib_name $ICONV_SHARED_LIBADD" if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/$PHP_LIBDIR else - + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD" test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/$PHP_LIBDIR else - + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/$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 $iconv_lib_name in c|c_r|pthread*) ;; - *) - LIBS="-l$iconv_lib_name $LIBS" + *) + LIBS="-l$iconv_lib_name $LIBS" ;; esac @@ -47328,44 +47748,44 @@ fi - + if test "$ICONV_DIR/include" != "/usr/include"; then - + if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/include else - + ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" 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 fi - + iconv_avail="yes"; - -else + +else iconv_avail="no"; - + fi @@ -47391,133 +47811,138 @@ PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" else PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" - fi + fi - echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 -echo "configure:47398: checking if iconv is glibc's" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if iconv is glibc's... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ gnu_get_libc_version(); -; return 0; } -EOF -if { (eval echo configure:47407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } iconv_impl_name="glibc" - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$iconv_impl_name"; then - echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 -echo "configure:47425: checking if using GNU libiconv" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5 +$as_echo_n "checking if using GNU libiconv... " >&6; } php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" - if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } LDFLAGS="$php_iconv_old_ld" - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include <$PHP_ICONV_H_PATH> int main() { printf("%d", _libiconv_version); return 0; } - -EOF -if { (eval echo configure:47445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } iconv_impl_name="gnu_libiconv" - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } LDFLAGS="$php_iconv_old_ld" - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi if test -z "$iconv_impl_name"; then - echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 -echo "configure:47467: checking if iconv is Konstantin Chuguev's" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if iconv is Konstantin Chuguev's... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ iconv_ccs_init(NULL, NULL); -; return 0; } -EOF -if { (eval echo configure:47476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } iconv_impl_name="bsd" - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi if test -z "$iconv_impl_name"; then - echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 -echo "configure:47495: checking if using IBM iconv" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5 +$as_echo_n "checking if using IBM iconv... " >&6; } php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ cstoccsid(""); -; return 0; } -EOF -if { (eval echo configure:47506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } iconv_impl_name="ibm" - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } LDFLAGS="$php_iconv_old_ld" - + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo > ext/iconv/php_have_bsd_iconv.h @@ -47527,104 +47952,103 @@ case "$iconv_impl_name" in gnu_libiconv ) - + echo "#define PHP_ICONV_IMPL \"libiconv\"" > ext/iconv/php_php_iconv_impl.h - cat >> confdefs.h <<\EOF -#define PHP_ICONV_IMPL "libiconv" -EOF - +$as_echo "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h + + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - + if test "$ext_shared" = "yes"; then ICONV_SHARED_LIBADD="-liconv $ICONV_SHARED_LIBADD" if test -n ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then - + if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then - + if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR" else - + ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`" fi - + if test "$ext_shared" = "yes"; then ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD" test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then - + if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then - + if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR" else - + ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$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 iconv in c|c_r|pthread*) ;; - *) - LIBS="-liconv $LIBS" + *) + LIBS="-liconv $LIBS" ;; esac @@ -47637,73 +48061,66 @@ ;; bsd ) - + echo "#define HAVE_BSD_ICONV 1" > ext/iconv/php_have_bsd_iconv.h - cat >> confdefs.h <<\EOF -#define HAVE_BSD_ICONV 1 -EOF - +$as_echo "#define HAVE_BSD_ICONV 1" >>confdefs.h + + echo "#define PHP_ICONV_IMPL \"BSD iconv\"" > ext/iconv/php_php_iconv_impl.h - cat >> confdefs.h <<\EOF -#define PHP_ICONV_IMPL "BSD iconv" -EOF + +$as_echo "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h ;; glibc ) - + echo "#define HAVE_GLIBC_ICONV 1" > ext/iconv/php_have_glibc_iconv.h - cat >> confdefs.h <<\EOF -#define HAVE_GLIBC_ICONV 1 -EOF - +$as_echo "#define HAVE_GLIBC_ICONV 1" >>confdefs.h + + echo "#define PHP_ICONV_IMPL \"glibc\"" > ext/iconv/php_php_iconv_impl.h - cat >> confdefs.h <<\EOF -#define PHP_ICONV_IMPL "glibc" -EOF + +$as_echo "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h ;; ibm ) - + echo "#define HAVE_IBM_ICONV 1" > ext/iconv/php_have_ibm_iconv.h - cat >> confdefs.h <<\EOF -#define HAVE_IBM_ICONV 1 -EOF - +$as_echo "#define HAVE_IBM_ICONV 1" >>confdefs.h + + echo "#define PHP_ICONV_IMPL \"IBM iconv\"" > ext/iconv/php_php_iconv_impl.h - cat >> confdefs.h <<\EOF -#define PHP_ICONV_IMPL "IBM iconv" -EOF + +$as_echo "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h ;; esac - echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 -echo "configure:47692: checking if iconv supports errno" >&5 - if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5 +$as_echo_n "checking if iconv supports errno... " >&6; } + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h - cat >> confdefs.h <<\EOF -#define ICONV_SUPPORTS_ERRNO 0 -EOF - +$as_echo "#define ICONV_SUPPORTS_ERRNO 0" >>confdefs.h + + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include <$PHP_ICONV_H_PATH> #include @@ -47721,75 +48138,74 @@ iconv_close( cd ); return 2; } - -EOF -if { (eval echo configure:47727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + echo "#define ICONV_SUPPORTS_ERRNO 1" > ext/iconv/php_iconv_supports_errno.h - cat >> confdefs.h <<\EOF -#define ICONV_SUPPORTS_ERRNO 1 -EOF - +$as_echo "#define ICONV_SUPPORTS_ERRNO 1" >>confdefs.h + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h - cat >> confdefs.h <<\EOF -#define ICONV_SUPPORTS_ERRNO 0 -EOF - +$as_echo "#define ICONV_SUPPORTS_ERRNO 0" >>confdefs.h + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 -echo "configure:47759: checking if your cpp allows macro usage in include lines" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if your cpp allows macro usage in include lines... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #define FOO <$PHP_ICONV_H_PATH> #include FOO - -int main() { -; return 0; } -EOF -if { (eval echo configure:47771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + echo "#define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH>" > ext/iconv/php_php_iconv_h_path.h - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH> -EOF +_ACEOF + - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + - ext_builddir=ext/iconv ext_srcdir=$abs_srcdir/ext/iconv @@ -47797,15 +48213,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_ICONV_SHARED=no - - + + case ext/iconv in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -47818,12 +48234,12 @@ old_IFS=$IFS for ac_src in iconv.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -47847,14 +48263,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_ICONV_SHARED=yes - + case ext/iconv in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -47867,12 +48283,12 @@ old_IFS=$IFS for ac_src in iconv.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_iconv="$shared_objects_iconv $ac_bdir$ac_obj.lo" case $ac_src in @@ -47890,7 +48306,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -47900,7 +48316,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPICONV, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(ICONV_SHARED_LIBADD)' ;; *) suffix=la @@ -47913,7 +48329,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpiconv.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_iconv" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_ICONV 1 -EOF +_ACEOF fi fi @@ -47975,15 +48392,15 @@ PHP_ICONV_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/iconv in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -47996,12 +48413,12 @@ old_IFS=$IFS for ac_src in iconv.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -48021,15 +48438,15 @@ EXT_STATIC="$EXT_STATIC iconv" ;; *) - - + + case ext/iconv in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -48042,12 +48459,12 @@ old_IFS=$IFS for ac_src in iconv.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -48068,42 +48485,42 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC iconv" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=iconv - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST ICONV_SHARED_LIBADD" - - + + for header_file in ext/iconv/; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + else - { echo "configure: error: Please reinstall the iconv library." 1>&2; exit 1; } + as_fn_error $? "Please reinstall the iconv library." "$LINENO" 5 fi fi @@ -48122,14 +48539,14 @@ php_with_imap=no -echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 -echo "configure:48127: checking for IMAP support" >&5 -# Check whether --with-imap or --without-imap was given. -if test "${with_imap+set}" = set; then - withval="$with_imap" - PHP_IMAP=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5 +$as_echo_n "checking for IMAP support... " >&6; } + +# Check whether --with-imap was given. +if test "${with_imap+set}" = set; then : + withval=$with_imap; PHP_IMAP=$withval else - + PHP_IMAP=no test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL @@ -48158,7 +48575,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -48166,22 +48584,23 @@ php_with_kerberos=no -echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 -echo "configure:48171: checking for IMAP Kerberos support" >&5 -# Check whether --with-kerberos or --without-kerberos was given. -if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" - PHP_KERBEROS=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5 +$as_echo_n "checking for IMAP Kerberos support... " >&6; } + +# Check whether --with-kerberos was given. +if test "${with_kerberos+set}" = set; then : + withval=$with_kerberos; PHP_KERBEROS=$withval else - + PHP_KERBEROS=no - + fi ext_output=$PHP_KERBEROS -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -48189,32 +48608,33 @@ php_with_imap_ssl=no -echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 -echo "configure:48194: checking for IMAP SSL support" >&5 -# Check whether --with-imap-ssl or --without-imap-ssl was given. -if test "${with_imap_ssl+set}" = set; then - withval="$with_imap_ssl" - PHP_IMAP_SSL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5 +$as_echo_n "checking for IMAP SSL support... " >&6; } + +# Check whether --with-imap-ssl was given. +if test "${with_imap_ssl+set}" = set; then : + withval=$with_imap_ssl; PHP_IMAP_SSL=$withval else - + PHP_IMAP_SSL=no - + fi ext_output=$PHP_IMAP_SSL -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + +if test "$PHP_IMAP" != "no"; then -if test "$PHP_IMAP" != "no"; then - PHP_VAR_SUBST="$PHP_VAR_SUBST IMAP_SHARED_LIBADD" - + ext_builddir=ext/imap ext_srcdir=$abs_srcdir/ext/imap @@ -48222,15 +48642,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_IMAP_SHARED=no - - + + case ext/imap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -48243,12 +48663,12 @@ old_IFS=$IFS for ac_src in php_imap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -48272,14 +48692,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_IMAP_SHARED=yes - + case ext/imap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -48292,12 +48712,12 @@ old_IFS=$IFS for ac_src in php_imap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_imap="$shared_objects_imap $ac_bdir$ac_obj.lo" case $ac_src in @@ -48315,7 +48735,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -48325,7 +48745,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPIMAP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(IMAP_SHARED_LIBADD)' ;; *) suffix=la @@ -48338,7 +48758,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpimap.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_imap" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_IMAP 1 -EOF +_ACEOF fi fi @@ -48400,15 +48821,15 @@ PHP_IMAP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/imap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -48421,12 +48842,12 @@ old_IFS=$IFS for ac_src in php_imap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -48446,15 +48867,15 @@ EXT_STATIC="$EXT_STATIC imap" ;; *) - - + + case ext/imap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -48467,12 +48888,12 @@ old_IFS=$IFS for ac_src in php_imap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -48493,260 +48914,245 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC imap" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=imap - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - cat >> confdefs.h <<\EOF -#define HAVE_IMAP 1 -EOF + +$as_echo "#define HAVE_IMAP 1" >>confdefs.h for i in $PHP_IMAP /usr/local /usr; do if test -r "$i/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i break - elif test -r "$i/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i break elif test -r "$i/include/c-client/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i/include/c-client break - elif test -r "$i/include/c-client/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/include/c-client/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i/include/c-client break elif test -r "$i/include/imap/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i/include/imap break - elif test -r "$i/include/imap/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/include/imap/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i/include/imap break elif test -r "$i/include/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i/include break - elif test -r "$i/include/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/include/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i/include break elif test -r "$i/imap/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i/imap break - elif test -r "$i/imap/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/imap/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i/imap break elif test -r "$i/c-client/c-client.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2000 1 -EOF + +$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h IMAP_DIR=$i IMAP_INC_DIR=$i/c-client break - elif test -r "$i/c-client/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i/c-client/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i/c-client break fi done - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include <$IMAP_INC_DIR/mail.h> -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mail_fetch_overview_sequence" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2004 1 -EOF + $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then : + + +$as_echo "#define HAVE_IMAP2004 1" >>confdefs.h + - fi rm -f conftest* old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" - echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 -echo "configure:48618: checking for utf8_mime2text signature" >&5 -if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5 +$as_echo_n "checking for utf8_mime2text signature... " >&6; } +if ${ac_cv_utf8_mime2text+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include - -int main() { + +int +main () +{ SIZEDTEXT *src, *dst; utf8_mime2text(src, dst); - -; return 0; } -EOF -if { (eval echo configure:48636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_utf8_mime2text=old - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_utf8_mime2text=new - -fi -rm -f conftest* - + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_utf8_mime2text" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5 +$as_echo "$ac_cv_utf8_mime2text" >&6; } if test "$ac_cv_utf8_mime2text" = "new"; then - cat >> confdefs.h <<\EOF -#define HAVE_NEW_MIME2TEXT 1 -EOF + +$as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h fi CFLAGS=$old_CFLAGS old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" - echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 -echo "configure:48665: checking for U8T_DECOMPOSE" >&5 -if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5 +$as_echo_n "checking for U8T_DECOMPOSE... " >&6; } +if ${ac_cv_u8t_canonical+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ int i = U8T_CANONICAL; - -; return 0; } -EOF -if { (eval echo configure:48681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_u8t_decompose=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_u8t_decompose=no - -fi -rm -f conftest* - + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_canonical" >&5 +$as_echo "$ac_cv_u8t_canonical" >&6; } CFLAGS=$old_CFLAGS if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then - { echo "configure: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." 1>&2; exit 1; } + 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 - { echo "configure: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." 1>&2; exit 1; } + 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 CPPFLAGS=-I$IMAP_INC_DIR - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "imap4r1.h" #if defined(IMAPSSLPORT) this_is_true #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "this_is_true" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HAVE_IMAP2001 1 -EOF + $EGREP "this_is_true" >/dev/null 2>&1; then : + + +$as_echo "#define HAVE_IMAP2001 1" >>confdefs.h + - fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -48757,20 +49163,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -48783,101 +49189,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:48830: checking for pam_start in -lpam" >&5 -ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_pam_pam_start+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -pam_start() -; return 0; } -EOF -if { (eval echo configure:48849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_start (); +int +main () +{ +return pam_start (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_start=yes +else + ac_cv_lib_pam_pam_start=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case pam in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD" + IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD" else - - + + case pam in c|c_r|pthread*) ;; - *) - LIBS="-lpam $LIBS" + *) + LIBS="-lpam $LIBS" ;; esac @@ -48887,40 +49295,38 @@ esac - cat >> confdefs.h <<\EOF -#define HAVE_LIBPAM 1 -EOF - - +$as_echo "#define HAVE_LIBPAM 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_pam_pam_start - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -48931,20 +49337,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -48957,101 +49363,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:49004: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +$as_echo_n "checking for crypt in -lcrypt... " >&6; } +if ${ac_cv_lib_crypt_crypt+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -crypt() -; return 0; } -EOF -if { (eval echo configure:49023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (); +int +main () +{ +return crypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypt_crypt=yes +else + ac_cv_lib_crypt_crypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +$as_echo "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case crypt in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD" + IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD" else - - + + case crypt in c|c_r|pthread*) ;; - *) - LIBS="-lcrypt $LIBS" + *) + LIBS="-lcrypt $LIBS" ;; esac @@ -49061,37 +49469,35 @@ esac - cat >> confdefs.h <<\EOF -#define HAVE_LIBCRYPT 1 -EOF - - +$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_crypt_crypt - - + + fi - - + + if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then IMAP_DIR=$IMAP_DIR else - + ep_dir="`echo $IMAP_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" IMAP_DIR="$ep_realdir/`basename \"$IMAP_DIR\"`" fi if test -z "$IMAP_DIR"; then - { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; } + 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 @@ -49102,13 +49508,13 @@ for lib in c-client4 c-client imap; do IMAP_LIB=$lib - + str="$IMAP_DIR/$PHP_LIBDIR/lib$lib.*" for i in `echo $str`; do test -r $i && IMAP_LIBDIR=$IMAP_DIR/$PHP_LIBDIR && break 2 done - + str="$IMAP_DIR/c-client/lib$lib.*" for i in `echo $str`; do test -r $i && IMAP_LIBDIR=$IMAP_DIR/c-client && break 2 @@ -49117,54 +49523,54 @@ done if test -z "$IMAP_LIBDIR"; then - { echo "configure: error: Cannot find imap library (libc-client.a). Please check your c-client installation." 1>&2; exit 1; } + as_fn_error $? "Cannot find imap library (libc-client.a). Please check your c-client installation." "$LINENO" 5 fi - + if test "$IMAP_INC_DIR" != "/usr/include"; then - + if test -z "$IMAP_INC_DIR" || echo "$IMAP_INC_DIR" | grep '^/' >/dev/null ; then ai_p=$IMAP_INC_DIR else - + ep_dir="`echo $IMAP_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$IMAP_INC_DIR\"`" 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 - - + + case $IMAP_LIB in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD" + IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD" else - - + + case $IMAP_LIB in c|c_r|pthread*) ;; - *) - DLIBS="-l$IMAP_LIB $DLIBS" + *) + DLIBS="-l$IMAP_LIB $DLIBS" ;; esac @@ -49174,47 +49580,47 @@ esac - + if test "$IMAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IMAP_LIBDIR" != "/usr/lib"; then - + if test -z "$IMAP_LIBDIR" || echo "$IMAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$IMAP_LIBDIR else - + ep_dir="`echo $IMAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$IMAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" else - - - + + + 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 - + if test "$PHP_KERBEROS" != "no"; then - + found_kerberos=no unset KERBEROS_CFLAGS unset KERBEROS_LIBS @@ -49222,40 +49628,46 @@ if test -z "$KRB5_CONFIG"; then # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:49227: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_KRB5_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$KRB5_CONFIG" in - /*) + case $KRB5_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no" ;; esac fi -KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG" +KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG if test -n "$KRB5_CONFIG"; then - echo "$ac_t""$KRB5_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5 +$as_echo "$KRB5_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then @@ -49264,17 +49676,17 @@ if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then found_kerberos=yes - + for ac_i in $KERBEROS_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -49285,20 +49697,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -49311,80 +49723,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $KERBEROS_CFLAGS; 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 @@ -49403,7 +49815,7 @@ fi for i in $PHP_KERBEROS; do - if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then + if test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libkrb5.a; then PHP_KERBEROS_DIR=$i break fi @@ -49411,58 +49823,58 @@ if test "$PHP_KERBEROS_DIR"; then found_kerberos=yes - + if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" else - - - + + + 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 gssapi_krb5 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5" else - - + + case gssapi_krb5 in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lgssapi_krb5" + *) + LIBS="$LIBS -lgssapi_krb5" ;; esac @@ -49472,20 +49884,20 @@ esac - - + + case krb5 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5" else - - + + case krb5 in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lkrb5" + *) + LIBS="$LIBS -lkrb5" ;; esac @@ -49495,20 +49907,20 @@ esac - - + + case k5crypto in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto" else - - + + case k5crypto in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lk5crypto" + *) + LIBS="$LIBS -lk5crypto" ;; esac @@ -49518,20 +49930,20 @@ esac - - + + case com_err in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err" else - - + + case com_err in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lcom_err" + *) + LIBS="$LIBS -lcom_err" ;; esac @@ -49541,33 +49953,33 @@ esac - + if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then - + if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then ai_p=$PHP_KERBEROS_DIR/include else - + ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`" 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 @@ -49577,45 +49989,43 @@ if test "$found_kerberos" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_IMAP_KRB 1 -EOF - -else - { echo "configure: error: Kerberos libraries not found. - +$as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h + + +else + 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 ) - " 1>&2; exit 1; } - + " "$LINENO" 5 + fi else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include <$IMAP_INC_DIR/linkage.h> -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "auth_gss" >/dev/null 2>&1; then - rm -rf conftest* - - { echo "configure: error: This c-client library is built with Kerberos support. + $EGREP "auth_gss" >/dev/null 2>&1; then : + + as_fn_error $? "This c-client library is built with Kerberos support. Add --with-kerberos to your configure line. Check config.log for details. - " 1>&2; exit 1; } - + " "$LINENO" 5 + fi rm -f conftest* fi - + if test "$PHP_IMAP_SSL" != "no"; then if test "$PHP_OPENSSL" = ""; then PHP_OPENSSL='no' fi - + found_openssl=no unset OPENSSL_INCDIR unset OPENSSL_LIBDIR @@ -49632,40 +50042,45 @@ 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 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:49637: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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="$ac_save_ifs" +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" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then @@ -49675,21 +50090,21 @@ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then - + for ac_i in $OPENSSL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -49700,20 +50115,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" + IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -49726,80 +50141,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $OPENSSL_INCS; 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 @@ -49812,7 +50227,7 @@ fi if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -49828,94 +50243,92 @@ done if test -z "$OPENSSL_INCDIR"; then - { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's " "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:49842: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for OpenSSL version... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if OPENSSL_VERSION_NUMBER >= 0x0090600fL yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t"">= 0.9.6" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5 +$as_echo ">= 0.9.6" >&6; } + else - rm -rf conftest* - - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - + + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + if test "$OPENSSL_INCDIR" != "/usr/include"; then - + if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_INCDIR else - + ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 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 - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -49926,20 +50339,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -49952,146 +50365,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:49999: checking for CRYPTO_free in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -CRYPTO_free() -; return 0; } -EOF -if { (eval echo configure:50018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char CRYPTO_free (); +int +main () +{ +return CRYPTO_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_CRYPTO_free=yes +else + ac_cv_lib_crypto_CRYPTO_free=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 +$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - - case crypto in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" - else - - - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; - esac - - - fi - ;; - esac - + : - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libcrypto not found!" "$LINENO" 5 + + fi old_LIBS=$LIBS LIBS="$LIBS -lcrypto" - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -50102,20 +50492,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -50128,117 +50518,141 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:50175: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SSL_CTX_set_ssl_version() -; return 0; } -EOF -if { (eval echo configure:50194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_ssl_version (); +int +main () +{ +return SSL_CTX_set_ssl_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes +else + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_openssl=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - - { echo "configure: error: libssl not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libssl not found!" "$LINENO" 5 + + fi LIBS=$old_LIBS - - + + case ssl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD" + IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD" else - - + + case ssl in c|c_r|pthread*) ;; - *) - LIBS="-lssl $LIBS" + *) + LIBS="-lssl $LIBS" + ;; + esac + + + fi + ;; + esac + + + + + case crypto in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" + else + + + case crypto in + c|c_r|pthread*) ;; + *) + LIBS="-lcrypto $LIBS" ;; esac @@ -50249,79 +50663,77 @@ - + if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - + if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_LIBDIR else - + ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" else - - - + + + 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 fi if test "$found_openssl" = "yes"; then OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - - cat >> confdefs.h <<\EOF -#define HAVE_IMAP_SSL 1 -EOF - -else - { echo "configure: error: OpenSSL libraries not found. - + +$as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h + + +else + as_fn_error $? "OpenSSL libraries not found. + Check the path given to --with-openssl-dir and output in config.log) - " 1>&2; exit 1; } - + " "$LINENO" 5 + fi elif test -f "$IMAP_INC_DIR/linkage.c"; then - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include <$IMAP_INC_DIR/linkage.c> -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ssl_onceonlyinit" >/dev/null 2>&1; then - rm -rf conftest* - - { echo "configure: error: This c-client library is built with SSL support. + $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then : + + 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. - " 1>&2; exit 1; } - + " "$LINENO" 5 + fi rm -f conftest* @@ -50330,20 +50742,19 @@ TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD" - - + + old_LIBS=$LIBS LIBS="$TST_LIBS $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - #if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) #else @@ -50365,54 +50776,49 @@ PHP_IMAP_EXPORT void mm_exists(void){} PHP_IMAP_EXPORT void mm_searched(void){} PHP_IMAP_EXPORT void mm_expunged(void){} - + char auth_gssapi_valid(); int main() { auth_gssapi_valid(); return 0; } - -EOF -if { (eval echo configure:50377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - cat >> confdefs.h <<\EOF -#define HAVE_IMAP_AUTH_GSS 1 -EOF - - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +$as_echo "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h + + + +else + LIBS=$old_LIBS - - + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - - + + old_LIBS=$LIBS LIBS="$TST_LIBS $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - #if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) #else @@ -50434,57 +50840,52 @@ PHP_IMAP_EXPORT void mm_exists(void){} PHP_IMAP_EXPORT void mm_searched(void){} PHP_IMAP_EXPORT void mm_expunged(void){} - + char utf8_to_mutf7(); int main() { utf8_to_mutf7(); return 0; } - -EOF -if { (eval echo configure:50446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - cat >> confdefs.h <<\EOF -#define HAVE_IMAP_MUTF7 1 -EOF - - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +$as_echo "#define HAVE_IMAP_MUTF7 1" >>confdefs.h + + + +else + LIBS=$old_LIBS - - + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6 -echo "configure:50473: checking whether rfc822_output_address_list function present" >&5 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5 +$as_echo_n "checking whether rfc822_output_address_list function present... " >&6; } + old_LIBS=$LIBS LIBS=" $TST_LIBS $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - #if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) #else @@ -50509,58 +50910,55 @@ void rfc822_output_address_list(void); void (*f)(void); char foobar () {f = rfc822_output_address_list;} - + char foobar(); int main() { foobar(); return 0; } - -EOF -if { (eval echo configure:50521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1 -EOF - - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h + + + +else + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 -echo "configure:50550: checking whether build with IMAP works" >&5 - - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5 +$as_echo_n "checking whether build with IMAP works... " >&6; } + + old_LIBS=$LIBS LIBS="$TST_LIBS $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - #if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) #else @@ -50582,35 +50980,34 @@ PHP_IMAP_EXPORT void mm_exists(void){} PHP_IMAP_EXPORT void mm_searched(void){} PHP_IMAP_EXPORT void mm_expunged(void){} - + char mail_newbody(); int main() { mail_newbody(); return 0; } - -EOF -if { (eval echo configure:50594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - echo "$ac_t""yes" 1>&6 - - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + +else + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -50621,14 +51018,14 @@ php_with_interbase=no -echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 -echo "configure:50626: checking for InterBase support" >&5 -# Check whether --with-interbase or --without-interbase was given. -if test "${with_interbase+set}" = set; then - withval="$with_interbase" - PHP_INTERBASE=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for InterBase support" >&5 +$as_echo_n "checking for InterBase support... " >&6; } + +# Check whether --with-interbase was given. +if test "${with_interbase+set}" = set; then : + withval=$with_interbase; PHP_INTERBASE=$withval else - + PHP_INTERBASE=no test "$PHP_ENABLE_ALL" && PHP_INTERBASE=$PHP_ENABLE_ALL @@ -50657,7 +51054,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -50671,25 +51069,25 @@ IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$IBASE_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -50700,20 +51098,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -50726,116 +51124,117 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:50773: checking for isc_detach_database in -lfbclient" >&5 -ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_fbclient_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lfbclient $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:50792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fbclient_isc_detach_database=yes +else + ac_cv_lib_fbclient_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + IBASE_LIBNAME=fbclient - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_fbclient_isc_detach_database - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$IBASE_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -50846,20 +51245,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -50872,116 +51271,117 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:50919: checking for isc_detach_database in -lgds" >&5 -ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_gds_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgds $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:50938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gds_isc_detach_database=yes +else + ac_cv_lib_gds_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + IBASE_LIBNAME=gds - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gds_isc_detach_database - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$IBASE_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -50992,20 +51392,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -51018,199 +51418,200 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:51065: checking for isc_detach_database in -lib_util" >&5 -ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ib_util_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lib_util $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:51084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ib_util_isc_detach_database=yes +else + ac_cv_lib_ib_util_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + IBASE_LIBNAME=ib_util - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ib_util_isc_detach_database - - { echo "configure: error: libgds, libib_util or libfbclient not found! Check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "libgds, libib_util or libfbclient not found! Check config.log for more information." "$LINENO" 5 + + fi - - + + fi - - + + fi - - + + if test "$ext_shared" = "yes"; then INTERBASE_SHARED_LIBADD="-l$IBASE_LIBNAME $INTERBASE_SHARED_LIBADD" if test -n "$IBASE_LIBDIR"; then - + if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then - + if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$IBASE_LIBDIR else - + ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then INTERBASE_SHARED_LIBADD="-L$ai_p $INTERBASE_SHARED_LIBADD" test -n "$ld_runpath_switch" && INTERBASE_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTERBASE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$IBASE_LIBDIR"; then - + if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then - + if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$IBASE_LIBDIR else - + ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$IBASE_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 $IBASE_LIBNAME in c|c_r|pthread*) ;; - *) - LIBS="-l$IBASE_LIBNAME $LIBS" + *) + LIBS="-l$IBASE_LIBNAME $LIBS" ;; esac @@ -51220,42 +51621,41 @@ fi - + if test "$IBASE_INCDIR" != "/usr/include"; then - + if test -z "$IBASE_INCDIR" || echo "$IBASE_INCDIR" | grep '^/' >/dev/null ; then ai_p=$IBASE_INCDIR else - + ep_dir="`echo $IBASE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$IBASE_INCDIR\"`" 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 - cat >> confdefs.h <<\EOF -#define HAVE_IBASE 1 -EOF - +$as_echo "#define HAVE_IBASE 1" >>confdefs.h + + ext_builddir=ext/interbase ext_srcdir=$abs_srcdir/ext/interbase @@ -51263,15 +51663,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_INTERBASE_SHARED=no - - + + case ext/interbase in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -51284,12 +51684,12 @@ old_IFS=$IFS for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -51313,14 +51713,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_INTERBASE_SHARED=yes - + case ext/interbase in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -51333,12 +51733,12 @@ old_IFS=$IFS for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_interbase="$shared_objects_interbase $ac_bdir$ac_obj.lo" case $ac_src in @@ -51356,7 +51756,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -51366,7 +51766,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTERBASE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(INTERBASE_SHARED_LIBADD)' ;; *) suffix=la @@ -51379,7 +51779,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpinterbase.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_interbase" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_INTERBASE 1 -EOF +_ACEOF fi fi @@ -51441,15 +51842,15 @@ PHP_INTERBASE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/interbase in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -51462,12 +51863,12 @@ old_IFS=$IFS for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -51487,15 +51888,15 @@ EXT_STATIC="$EXT_STATIC interbase" ;; *) - - + + case ext/interbase in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -51508,12 +51909,12 @@ old_IFS=$IFS for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -51534,20 +51935,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC interbase" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=interbase - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST INTERBASE_SHARED_LIBADD" fi @@ -51556,14 +51957,13 @@ php_enable_intl=no -echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 -echo "configure:51561: checking whether to enable internationalization support" >&5 -# Check whether --enable-intl or --disable-intl was given. -if test "${enable_intl+set}" = set; then - enableval="$enable_intl" - PHP_INTL=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5 +$as_echo_n "checking whether to enable internationalization support... " >&6; } +# Check whether --enable-intl was given. +if test "${enable_intl+set}" = set; then : + enableval=$enable_intl; PHP_INTL=$enableval else - + PHP_INTL=no test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL @@ -51592,25 +51992,26 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_INTL" != "no"; then - - + + php_with_icu_dir=DEFAULT -# Check whether --with-icu-dir or --without-icu-dir was given. -if test "${with_icu_dir+set}" = set; then - withval="$with_icu_dir" - PHP_ICU_DIR=$withval + +# Check whether --with-icu-dir was given. +if test "${with_icu_dir+set}" = set; then : + withval=$with_icu_dir; PHP_ICU_DIR=$withval else - + PHP_ICU_DIR=DEFAULT - + fi @@ -51628,103 +52029,112 @@ if test "$PHP_ICU_DIR" = "DEFAULT"; then # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:51633: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ICU_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$ICU_CONFIG" in - /*) + case $ICU_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/local/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_ICU_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no" ;; esac fi -ICU_CONFIG="$ac_cv_path_ICU_CONFIG" +ICU_CONFIG=$ac_cv_path_ICU_CONFIG if test -n "$ICU_CONFIG"; then - echo "$ac_t""$ICU_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 +$as_echo "$ICU_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + else ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" fi - echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 -echo "configure:51671: checking for location of ICU headers and libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ICU headers and libraries" >&5 +$as_echo_n "checking for location of ICU headers and libraries... " >&6; } icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` if test "$?" != "0" || test -z "$icu_install_prefix"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." 1>&2; exit 1; } + { $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 else - echo "$ac_t""$icu_install_prefix" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icu_install_prefix" >&5 +$as_echo "$icu_install_prefix" >&6; } - echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 -echo "configure:51681: checking for ICU 3.4 or greater" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU 3.4 or greater" >&5 +$as_echo_n "checking for ICU 3.4 or greater... " >&6; } icu_version_full=`$ICU_CONFIG --version` ac_IFS=$IFS IFS="." set $icu_version_full IFS=$ac_IFS icu_version=`expr $1 \* 1000 + $2` - echo "$ac_t""found $icu_version_full" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $icu_version_full" >&5 +$as_echo "found $icu_version_full" >&6; } if test "$icu_version" -lt "3004"; then - { echo "configure: error: ICU version 3.4 or later is required" 1>&2; exit 1; } + as_fn_error $? "ICU version 3.4 or later is required" "$LINENO" 5 fi ICU_VERSION=$icu_version ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` - + for ac_i in $ICU_INCS; 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 @@ -51733,17 +52143,17 @@ esac done - + for ac_i in $ICU_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -51754,20 +52164,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii" + INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -51780,42 +52190,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then INTL_SHARED_LIBADD="-L$ai_p $INTL_SHARED_LIBADD" test -n "$ld_runpath_switch" && INTL_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTL_SHARED_LIBADD" else - - - + + + 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 ;; @@ -51824,140 +52234,249 @@ fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST INTL_SHARED_LIBADD" - + if test -z "$php_cxx_done"; then - for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:51838: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX="$ac_prog" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + fi fi -CXX="$ac_cv_prog_CXX" +CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$ac_t""$CXX" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -n "$CXX" && break -done -test -n "$CXX" || CXX="gcc" - -echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:51870: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $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 -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -cat > conftest.$ac_ext << EOF -#line 51881 "configure" -#include "confdefs.h" + test -n "$ac_ct_CXX" && break +done -int main(){return(0);} -EOF -if { (eval echo configure:51886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cxx_cross=no + if test "x$ac_ct_CXX" = x; then + CXX="g++" else - ac_cv_prog_cxx_cross=yes + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cxx_works=no fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -if test $ac_cv_prog_cxx_works = no; then - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:51912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -cross_compiling=$ac_cv_prog_cxx_cross - -echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:51917: checking whether we are using GNU C++" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.C <conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me #endif -EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes else - ac_cv_prog_gxx=no -fi + ac_compiler_gnu=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -echo "$ac_t""$ac_cv_prog_gxx" 1>&6 - -if test $ac_cv_prog_gxx = yes; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi +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 ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -ac_test_CXXFLAGS="${CXXFLAGS+set}" -ac_save_CXXFLAGS="$CXXFLAGS" -CXXFLAGS= -echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:51945: checking whether ${CXX-g++} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.cc -if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - ac_cv_prog_cxx_g=no -fi -rm -f conftest* + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : -echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" + CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then CXXFLAGS="-g -O2" @@ -51971,106 +52490,150 @@ CXXFLAGS= fi fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +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 ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes do - cat > conftest.$ac_ext < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:51994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ac_cv_prog_CXXCPP=$CXXCPP fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:52028: checking how to run the C++ preprocessor" >&5 -if test -z "$CXXCPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:52046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CXXCPP=/lib/cpp + { { $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; } fi -rm -f conftest* - ac_cv_prog_CXXCPP="$CXXCPP" + ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -fi -fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu php_cxx_done=yes fi - + ext_builddir=ext/intl ext_srcdir=$abs_srcdir/ext/intl @@ -52078,15 +52641,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_INTL_SHARED=no - - + + case ext/intl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -52144,12 +52707,12 @@ resourcebundle/resourcebundle_class.c \ resourcebundle/resourcebundle_iterator.c \ idn/idn.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -52173,14 +52736,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_INTL_SHARED=yes - + case ext/intl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -52238,12 +52801,12 @@ resourcebundle/resourcebundle_class.c \ resourcebundle/resourcebundle_iterator.c \ idn/idn.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_intl="$shared_objects_intl $ac_bdir$ac_obj.lo" case $ac_src in @@ -52261,7 +52824,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -52271,7 +52834,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(INTL_SHARED_LIBADD)' ;; *) suffix=la @@ -52284,7 +52847,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpintl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_intl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_INTL 1 -EOF +_ACEOF fi fi @@ -52346,15 +52910,15 @@ PHP_INTL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - - case ext/intl in + + + case ext/intl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -52412,12 +52976,12 @@ resourcebundle/resourcebundle_class.c \ resourcebundle/resourcebundle_iterator.c \ idn/idn.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -52437,15 +53001,15 @@ EXT_STATIC="$EXT_STATIC intl" ;; *) - - + + case ext/intl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -52503,12 +53067,12 @@ resourcebundle/resourcebundle_class.c \ resourcebundle/resourcebundle_iterator.c \ idn/idn.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -52529,69 +53093,69 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC intl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=intl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/collator" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/common" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/formatter" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/normalizer" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/dateformat" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/locale" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/msgformat" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/grapheme" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/resourcebundle" - - - + + + BUILD_DIR="$BUILD_DIR $ext_builddir/idn" - + fi @@ -52599,14 +53163,13 @@ php_enable_json=yes -echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 -echo "configure:52604: checking whether to enable JavaScript Object Serialization support" >&5 -# Check whether --enable-json or --disable-json was given. -if test "${enable_json+set}" = set; then - enableval="$enable_json" - PHP_JSON=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JavaScript Object Serialization support" >&5 +$as_echo_n "checking whether to enable JavaScript Object Serialization support... " >&6; } +# Check whether --enable-json was given. +if test "${enable_json+set}" = set; then : + enableval=$enable_json; PHP_JSON=$enableval else - + PHP_JSON=yes test "$PHP_ENABLE_ALL" && PHP_JSON=$PHP_ENABLE_ALL @@ -52635,56 +53198,54 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_JSON" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_JSON 1 -EOF - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:52650: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +$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 ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:52663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -52693,16 +53254,15 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -52711,46 +53271,57 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -EOF -if { (eval echo configure:52730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi - + ext_builddir=ext/json ext_srcdir=$abs_srcdir/ext/json @@ -52758,15 +53329,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_JSON_SHARED=no - - + + case ext/json in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -52779,12 +53350,12 @@ old_IFS=$IFS for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -52808,14 +53379,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_JSON_SHARED=yes - + case ext/json in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -52828,12 +53399,12 @@ old_IFS=$IFS for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_json="$shared_objects_json $ac_bdir$ac_obj.lo" case $ac_src in @@ -52851,7 +53422,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -52861,7 +53432,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPJSON, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(JSON_SHARED_LIBADD)' ;; *) suffix=la @@ -52874,7 +53445,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpjson.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_json" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_JSON 1 -EOF +_ACEOF fi fi @@ -52936,15 +53508,15 @@ PHP_JSON_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/json in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -52957,12 +53529,12 @@ old_IFS=$IFS for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -52982,15 +53554,15 @@ EXT_STATIC="$EXT_STATIC json" ;; *) - - + + case ext/json in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -53003,12 +53575,12 @@ old_IFS=$IFS for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -53029,40 +53601,40 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC json" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=json - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + header_path=ext/json for header_file in php_json.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + + - PHP_VAR_SUBST="$PHP_VAR_SUBST JSON_SHARED_LIBADD" fi @@ -53075,14 +53647,14 @@ php_with_ldap=no -echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 -echo "configure:53080: checking for LDAP support" >&5 -# Check whether --with-ldap or --without-ldap was given. -if test "${with_ldap+set}" = set; then - withval="$with_ldap" - PHP_LDAP=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5 +$as_echo_n "checking for LDAP support... " >&6; } + +# Check whether --with-ldap was given. +if test "${with_ldap+set}" = set; then : + withval=$with_ldap; PHP_LDAP=$withval else - + PHP_LDAP=no test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL @@ -53111,7 +53683,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -53119,29 +53692,30 @@ php_with_ldap_sasl=no -echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 -echo "configure:53124: checking for LDAP Cyrus SASL support" >&5 -# Check whether --with-ldap-sasl or --without-ldap-sasl was given. -if test "${with_ldap_sasl+set}" = set; then - withval="$with_ldap_sasl" - PHP_LDAP_SASL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP Cyrus SASL support" >&5 +$as_echo_n "checking for LDAP Cyrus SASL support... " >&6; } + +# Check whether --with-ldap-sasl was given. +if test "${with_ldap_sasl+set}" = set; then : + withval=$with_ldap_sasl; PHP_LDAP_SASL=$withval else - + PHP_LDAP_SASL=no - + fi ext_output=$PHP_LDAP_SASL -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_LDAP" != "no"; then - + ext_builddir=ext/ldap ext_srcdir=$abs_srcdir/ext/ldap @@ -53149,15 +53723,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_LDAP_SHARED=no - - + + case ext/ldap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -53170,12 +53744,12 @@ old_IFS=$IFS for ac_src in ldap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -53199,14 +53773,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_LDAP_SHARED=yes - + case ext/ldap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -53219,12 +53793,12 @@ old_IFS=$IFS for ac_src in ldap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_ldap="$shared_objects_ldap $ac_bdir$ac_obj.lo" case $ac_src in @@ -53242,7 +53816,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -53252,7 +53826,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLDAP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(LDAP_SHARED_LIBADD)' ;; *) suffix=la @@ -53265,7 +53839,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpldap.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ldap" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_LDAP 1 -EOF +_ACEOF fi fi @@ -53327,15 +53902,15 @@ PHP_LDAP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/ldap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -53348,12 +53923,12 @@ old_IFS=$IFS for ac_src in ldap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -53373,15 +53948,15 @@ EXT_STATIC="$EXT_STATIC ldap" ;; *) - - + + case ext/ldap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -53394,12 +53969,12 @@ old_IFS=$IFS for ac_src in ldap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -53420,15 +53995,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC ldap" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=ldap - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -53436,7 +54011,7 @@ if test "$PHP_LDAP" = "yes"; then for i in /usr/local /usr; do - + if test -f $i/include/ldap.h; then LDAP_DIR=$i LDAP_INCDIR=$i/include @@ -53453,7 +54028,7 @@ done else - + if test -f $PHP_LDAP/include/ldap.h; then LDAP_DIR=$PHP_LDAP LDAP_INCDIR=$PHP_LDAP/include @@ -53471,105 +54046,105 @@ fi if test -z "$LDAP_DIR"; then - { echo "configure: error: Cannot find ldap.h" 1>&2; exit 1; } + as_fn_error $? "Cannot find ldap.h" "$LINENO" 5 fi - + if test `uname` = "Linux"; then LDAP_PTHREAD=pthread else LDAP_PTHREAD= fi - if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then - + if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-llber $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 lber in c|c_r|pthread*) ;; - *) - LIBS="-llber $LIBS" + *) + LIBS="-llber $LIBS" ;; esac @@ -53579,94 +54154,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldap in c|c_r|pthread*) ;; - *) - LIBS="-lldap $LIBS" + *) + LIBS="-lldap $LIBS" ;; esac @@ -53678,94 +54253,94 @@ elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldap in c|c_r|pthread*) ;; - *) - LIBS="-lldap $LIBS" + *) + LIBS="-lldap $LIBS" ;; esac @@ -53777,106 +54352,106 @@ elif test -f $LDAP_LIBDIR/libssldap50.$SHLIB_SUFFIX_NAME; then - if test -n "$LDAP_PTHREAD"; then - - + if test -n "$LDAP_PTHREAD"; then + + case $LDAP_PTHREAD in c|c_r|pthread*) ;; - *) - LIBS="-l$LDAP_PTHREAD $LIBS" + *) + LIBS="-l$LDAP_PTHREAD $LIBS" ;; esac fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lnspr4 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 nspr4 in c|c_r|pthread*) ;; - *) - LIBS="-lnspr4 $LIBS" + *) + LIBS="-lnspr4 $LIBS" ;; esac @@ -53886,94 +54461,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lplc4 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 plc4 in c|c_r|pthread*) ;; - *) - LIBS="-lplc4 $LIBS" + *) + LIBS="-lplc4 $LIBS" ;; esac @@ -53983,94 +54558,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lplds4 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 plds4 in c|c_r|pthread*) ;; - *) - LIBS="-lplds4 $LIBS" + *) + LIBS="-lplds4 $LIBS" ;; esac @@ -54080,94 +54655,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lssldap50 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ssldap50 in c|c_r|pthread*) ;; - *) - LIBS="-lssldap50 $LIBS" + *) + LIBS="-lssldap50 $LIBS" ;; esac @@ -54177,94 +54752,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldap50 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldap50 in c|c_r|pthread*) ;; - *) - LIBS="-lldap50 $LIBS" + *) + LIBS="-lldap50 $LIBS" ;; esac @@ -54274,94 +54849,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lprldap50 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 prldap50 in c|c_r|pthread*) ;; - *) - LIBS="-lprldap50 $LIBS" + *) + LIBS="-lprldap50 $LIBS" ;; esac @@ -54371,94 +54946,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lssl3 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ssl3 in c|c_r|pthread*) ;; - *) - LIBS="-lssl3 $LIBS" + *) + LIBS="-lssl3 $LIBS" ;; esac @@ -54468,112 +55043,111 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_NSLDAP 1 -EOF + +$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libldapssl41.$SHLIB_SUFFIX_NAME; then - if test -n "$LDAP_PTHREAD"; then - - + if test -n "$LDAP_PTHREAD"; then + + case $LDAP_PTHREAD in c|c_r|pthread*) ;; - *) - LIBS="-l$LDAP_PTHREAD $LIBS" + *) + LIBS="-l$LDAP_PTHREAD $LIBS" ;; esac fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lnspr3 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 nspr3 in c|c_r|pthread*) ;; - *) - LIBS="-lnspr3 $LIBS" + *) + LIBS="-lnspr3 $LIBS" ;; esac @@ -54583,94 +55157,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lplc3 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 plc3 in c|c_r|pthread*) ;; - *) - LIBS="-lplc3 $LIBS" + *) + LIBS="-lplc3 $LIBS" ;; esac @@ -54680,94 +55254,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lplds3 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 plds3 in c|c_r|pthread*) ;; - *) - LIBS="-lplds3 $LIBS" + *) + LIBS="-lplds3 $LIBS" ;; esac @@ -54777,94 +55351,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldapssl41 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldapssl41 in c|c_r|pthread*) ;; - *) - LIBS="-lldapssl41 $LIBS" + *) + LIBS="-lldapssl41 $LIBS" ;; esac @@ -54874,112 +55448,111 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_NSLDAP 1 -EOF + +$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libldapssl30.$SHLIB_SUFFIX_NAME; then - if test -n "$LDAP_PTHREAD"; then - - + if test -n "$LDAP_PTHREAD"; then + + case $LDAP_PTHREAD in c|c_r|pthread*) ;; - *) - LIBS="-l$LDAP_PTHREAD $LIBS" + *) + LIBS="-l$LDAP_PTHREAD $LIBS" ;; esac fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldapssl30 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldapssl30 in c|c_r|pthread*) ;; - *) - LIBS="-lldapssl30 $LIBS" + *) + LIBS="-lldapssl30 $LIBS" ;; esac @@ -54989,112 +55562,111 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_NSLDAP 1 -EOF + +$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libldap30.$SHLIB_SUFFIX_NAME; then - if test -n "$LDAP_PTHREAD"; then - - + if test -n "$LDAP_PTHREAD"; then + + case $LDAP_PTHREAD in c|c_r|pthread*) ;; - *) - LIBS="-l$LDAP_PTHREAD $LIBS" + *) + LIBS="-l$LDAP_PTHREAD $LIBS" ;; esac fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lldap30 $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 ldap30 in c|c_r|pthread*) ;; - *) - LIBS="-lldap30 $LIBS" + *) + LIBS="-lldap30 $LIBS" ;; esac @@ -55104,100 +55676,99 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_NSLDAP 1 -EOF + +$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME; then - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lumich_lber $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 umich_lber in c|c_r|pthread*) ;; - *) - LIBS="-lumich_lber $LIBS" + *) + LIBS="-lumich_lber $LIBS" ;; esac @@ -55207,94 +55778,94 @@ fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lumich_ldap $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 umich_ldap in c|c_r|pthread*) ;; - *) - LIBS="-lumich_ldap $LIBS" + *) + LIBS="-lumich_ldap $LIBS" ;; esac @@ -55306,94 +55877,94 @@ elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lclntsh $LDAP_SHARED_LIBADD" if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_LIBDIR"; then - + if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_LIBDIR else - + ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_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 clntsh in c|c_r|pthread*) ;; - *) - LIBS="-lclntsh $LIBS" + *) + LIBS="-lclntsh $LIBS" ;; esac @@ -55403,155 +55974,107 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_ORALDAP 1 -EOF + +$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then - cat >> confdefs.h <<\EOF -#define HAVE_ORALDAP_10 1 -EOF + +$as_echo "#define HAVE_ORALDAP_10 1" >>confdefs.h fi else - { echo "configure: error: Cannot find ldap libraries in $LDAP_LIBDIR." 1>&2; exit 1; } + as_fn_error $? "Cannot find ldap libraries in $LDAP_LIBDIR." "$LINENO" 5 fi - + if test "$LDAP_INCDIR" != "/usr/include"; then - + if test -z "$LDAP_INCDIR" || echo "$LDAP_INCDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_INCDIR else - + ep_dir="`echo $LDAP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_INCDIR\"`" 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 - + PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD" - cat >> confdefs.h <<\EOF -#define HAVE_LDAP 1 -EOF - +$as_echo "#define HAVE_LDAP 1" >>confdefs.h + + _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LIBS=$LIBS CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" LIBS="$LIBS $LDAP_SHARED_LIBADD" - echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 -echo "configure:55466: checking for 3 arg ldap_set_rebind_proc" >&5 -if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_3arg_setrebindproc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ ldap_set_rebind_proc(0,0,0) -; return 0; } -EOF -if { (eval echo configure:55478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_3arg_setrebindproc=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_3arg_setrebindproc=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_3arg_setrebindproc" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5 +$as_echo "$ac_cv_3arg_setrebindproc" >&6; } if test "$ac_cv_3arg_setrebindproc" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_3ARG_SETREBINDPROC 1 -EOF + +$as_echo "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h fi for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:55501: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:55529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + if test "$PHP_LDAP_SASL" != "no"; then - + if test "$PHP_LDAP_SASL" = "yes"; then SEARCH_DIRS="/usr/local /usr" else @@ -55561,26 +56084,24 @@ for i in $SEARCH_DIRS; do if test -f $i/include/sasl/sasl.h; then LDAP_SASL_DIR=$i - cat >> confdefs.h <<\EOF -#define HAVE_LDAP_SASL_SASL_H 1 -EOF + +$as_echo "#define HAVE_LDAP_SASL_SASL_H 1" >>confdefs.h break elif test -f $i/include/sasl.h; then LDAP_SASL_DIR=$i - cat >> confdefs.h <<\EOF -#define HAVE_LDAP_SASL_H 1 -EOF + +$as_echo "#define HAVE_LDAP_SASL_H 1" >>confdefs.h break fi done - + if test "$LDAP_SASL_DIR"; then LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR else - { echo "configure: error: sasl.h not found!" 1>&2; exit 1; } + as_fn_error $? "sasl.h not found!" "$LINENO" 5 fi if test "$PHP_LDAP_SASL" = "yes"; then @@ -55588,26 +56109,26 @@ else SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2" fi - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $LDAP_SHARED_LIBADD $SASL_LIB " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -55618,20 +56139,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -55644,206 +56165,208 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6 -echo "configure:55691: checking for sasl_version in -lldap" >&5 -ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lldap $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + { $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 ${ac_cv_lib_sasl2_sasl_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsasl2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sasl_version (); +int +main () +{ +return sasl_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sasl2_sasl_version=yes +else + ac_cv_lib_sasl2_sasl_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_version" >&5 +$as_echo "$ac_cv_lib_sasl2_sasl_version" >&6; } +if test "x$ac_cv_lib_sasl2_sasl_version" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$LDAP_SASL_INCDIR" != "/usr/include"; then - + if test -z "$LDAP_SASL_INCDIR" || echo "$LDAP_SASL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_SASL_INCDIR else - + ep_dir="`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_SASL_INCDIR\"`" 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 - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-lsasl2 $LDAP_SHARED_LIBADD" if test -n "$LDAP_SASL_LIBDIR"; then - + if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_SASL_LIBDIR else - + ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LDAP_SASL_LIBDIR"; then - + if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then - + if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LDAP_SASL_LIBDIR else - + ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LDAP_SASL_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 sasl2 in c|c_r|pthread*) ;; - *) - LIBS="-lsasl2 $LIBS" + *) + LIBS="-lsasl2 $LIBS" ;; esac @@ -55853,82 +56376,38 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LDAP_SASL 1 -EOF - - +$as_echo "#define HAVE_LDAP_SASL 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - unset ac_cv_lib_ldap_sasl_version - - { echo "configure: error: LDAP SASL check failed. Please check config.log for more information." 1>&2; exit 1; } - - -fi + unset ac_cv_lib_sasl2_sasl_version + as_fn_error $? "LDAP SASL check failed. Please check config.log for more information." "$LINENO" 5 - fi - echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 -echo "configure:55879: checking for ldap_bind_s" >&5 -if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char ldap_bind_s(); +fi -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_ldap_bind_s) || defined (__stub___ldap_bind_s) -choke me -#else -ldap_bind_s(); -#endif + fi -; return 0; } -EOF -if { (eval echo configure:55907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_ldap_bind_s=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_ldap_bind_s=no" -fi -rm -f conftest* -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" = xyes; then : -if eval "test \"`echo '$ac_cv_func_'ldap_bind_s`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : else - echo "$ac_t""no" 1>&6 - { echo "configure: error: LDAP build check failed. Please check config.log for more information." 1>&2; exit 1; } - + as_fn_error $? "LDAP build check failed. Please check config.log for more information." "$LINENO" 5 + fi - + CPPFLAGS=$_SAVE_CPPFLAGS LIBS=$_SAVE_LIBS -fi +fi @@ -55955,14 +56434,13 @@ php_enable_mbstring=no -echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 -echo "configure:55960: checking whether to enable multibyte string support" >&5 -# Check whether --enable-mbstring or --disable-mbstring was given. -if test "${enable_mbstring+set}" = set; then - enableval="$enable_mbstring" - PHP_MBSTRING=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5 +$as_echo_n "checking whether to enable multibyte string support... " >&6; } +# Check whether --enable-mbstring was given. +if test "${enable_mbstring+set}" = set; then : + enableval=$enable_mbstring; PHP_MBSTRING=$enableval else - + PHP_MBSTRING=no test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL @@ -55991,7 +56469,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -55999,22 +56478,22 @@ php_enable_mbregex=yes -echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 -echo "configure:56004: checking whether to enable multibyte regex support" >&5 -# Check whether --enable-mbregex or --disable-mbregex was given. -if test "${enable_mbregex+set}" = set; then - enableval="$enable_mbregex" - PHP_MBREGEX=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support" >&5 +$as_echo_n "checking whether to enable multibyte regex support... " >&6; } +# Check whether --enable-mbregex was given. +if test "${enable_mbregex+set}" = set; then : + enableval=$enable_mbregex; PHP_MBREGEX=$enableval else - + PHP_MBREGEX=yes - + fi ext_output=$PHP_MBREGEX -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -56022,22 +56501,22 @@ php_enable_mbregex_backtrack=yes -echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 -echo "configure:56027: checking whether to check multibyte regex backtrack" >&5 -# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. -if test "${enable_mbregex_backtrack+set}" = set; then - enableval="$enable_mbregex_backtrack" - PHP_MBREGEX_BACKTRACK=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check multibyte regex backtrack" >&5 +$as_echo_n "checking whether to check multibyte regex backtrack... " >&6; } +# Check whether --enable-mbregex_backtrack was given. +if test "${enable_mbregex_backtrack+set}" = set; then : + enableval=$enable_mbregex_backtrack; PHP_MBREGEX_BACKTRACK=$enableval else - + PHP_MBREGEX_BACKTRACK=yes - + fi ext_output=$PHP_MBREGEX_BACKTRACK -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -56045,22 +56524,23 @@ php_with_libmbfl=no -echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 -echo "configure:56050: checking for external libmbfl" >&5 -# Check whether --with-libmbfl or --without-libmbfl was given. -if test "${with_libmbfl+set}" = set; then - withval="$with_libmbfl" - PHP_LIBMBFL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libmbfl" >&5 +$as_echo_n "checking for external libmbfl... " >&6; } + +# Check whether --with-libmbfl was given. +if test "${with_libmbfl+set}" = set; then : + withval=$with_libmbfl; PHP_LIBMBFL=$withval else - + PHP_LIBMBFL=no - + fi ext_output=$PHP_LIBMBFL -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -56068,55 +56548,54 @@ php_with_onig=no -echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 -echo "configure:56073: checking for external oniguruma" >&5 -# Check whether --with-onig or --without-onig was given. -if test "${with_onig+set}" = set; then - withval="$with_onig" - PHP_ONIG=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external oniguruma" >&5 +$as_echo_n "checking for external oniguruma... " >&6; } + +# Check whether --with-onig was given. +if test "${with_onig+set}" = set; then : + withval=$with_onig; PHP_ONIG=$withval else - + PHP_ONIG=no - + fi ext_output=$PHP_ONIG -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } -if test "$PHP_MBSTRING" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_MBSTRING 1 -EOF +if test "$PHP_MBSTRING" != "no"; then + +$as_echo "#define HAVE_MBSTRING 1" >>confdefs.h + - PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" if test "$PHP_MBREGEX" != "no"; then - + if test "$PHP_MBREGEX" = "yes"; then if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then if test "$PHP_MBREGEX_BACKTRACK" != "no"; then - cat >> confdefs.h <<\EOF -#define USE_COMBINATION_EXPLOSION_CHECK 1 -EOF + +$as_echo "#define USE_COMBINATION_EXPLOSION_CHECK 1" >>confdefs.h fi - echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:56114: checking for variable length prototypes and stdarg.h" >&5 -if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${php_cv_mbstring_stdarg+:} false; then : + $as_echo_n "(cached) " >&6 else - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + case $host_alias in *netware*) php_cv_mbstring_stdarg=yes @@ -56125,11 +56604,10 @@ php_cv_mbstring_stdarg=no ;; esac - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include int foo(int x, ...) { @@ -56141,336 +56619,291 @@ return 0; } int main() { return foo(10, "", 3.14); } - -EOF -if { (eval echo configure:56147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : php_cv_mbstring_stdarg=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* php_cv_mbstring_stdarg=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_mbstring_stdarg" >&5 +$as_echo "$php_cv_mbstring_stdarg" >&6; } -echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6 + for ac_header in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:56168: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:56178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 fi + done - echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:56205: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); -} -EOF -if { (eval echo configure:56224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $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 : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF - echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:56244: checking size of short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_short=2 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(short)); - return(0); -} -EOF -if { (eval echo configure:56263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_short=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_short=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if ${ac_cv_sizeof_short+:} false; then : + $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 : + +else + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_short=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short -EOF +_ACEOF - echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:56283: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); -} -EOF -if { (eval echo configure:56302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } - echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:56322: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF -/* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this 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; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} -; return 0; } -EOF -if { (eval echo configure:56376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no -fi -rm -f conftest* -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this 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; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif -echo "$ac_t""$ac_cv_c_const" 1>&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF + +$as_echo "#define const /**/" >>confdefs.h fi - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:56397: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:56411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_time=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 -EOF + +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi - + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:56434: checking for working alloca.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if ${ac_cv_working_alloca_h+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:56446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_working_alloca_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no + ac_cv_working_alloca_h=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:56467: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if ${ac_cv_func_alloca_works+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -56478,151 +56911,108 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:56500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ +char *p = (char *) alloca (1); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF -fi +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext +$as_echo "#define C_ALLOCA 1" >>confdefs.h -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:56532: checking whether alloca needs Cray hooks" >&5 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $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 ${ac_cv_os_cray+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:56562: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif + 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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -; return 0; } -EOF -if { (eval echo configure:56590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF - break -else - echo "$ac_t""no" 1>&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:56617: checking stack direction for C alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_c_stack_direction+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int find_stack_direction () { static char *addr = 0; @@ -56635,131 +57025,127 @@ else return (&dummy > addr) ? 1 : -1; } + +int main () { - exit (find_stack_direction() < 0); + return find_stack_direction () < 0; } -EOF -if { (eval echo configure:56644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:56666: checking for 8-bit clean memcmp" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 +$as_echo_n "checking for working memcmp... " >&6; } +if ${ac_cv_func_memcmp_working+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_clean=no + if test "$cross_compiling" = yes; then : + ac_cv_func_memcmp_working=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () { - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); -} -EOF -if { (eval echo configure:56684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_memcmp_clean=yes + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = '\100', c1 = '\200', c2 = '\201'; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) + return 1; + + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. + William Lewis provided this test program. */ + { + char foo[21]; + char bar[21]; + int i; + for (i = 0; i < 4; i++) + { + char *a = foo + i; + char *b = bar + i; + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) + return 1; + } + return 0; + } + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_memcmp_working=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_memcmp_clean=no + ac_cv_func_memcmp_working=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 +$as_echo "$ac_cv_func_memcmp_working" >&6; } +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in + *" memcmp.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" + ;; +esac -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" - ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 -echo "configure:56703: checking for stdarg.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:56713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_STDARG_PROTOTYPES 1 -EOF + 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" = xyes; then : + + +$as_echo "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h + - -else - echo "$ac_t""no" 1>&6 fi - cat >> confdefs.h <<\EOF -#define PHP_ONIG_BUNDLED 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_ONIG 1 -EOF - - + +$as_echo "#define PHP_ONIG_BUNDLED 1" >>confdefs.h + + +$as_echo "#define HAVE_ONIG 1" >>confdefs.h + + PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" - + PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" - + PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" - - PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES + + PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES oniguruma/regcomp.c oniguruma/regerror.c oniguruma/regexec.c @@ -56802,64 +57188,64 @@ oniguruma/enc/utf32_le.c " - + PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h" else if test ! -f "$PHP_ONIG/include/oniguruma.h"; then - { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } + as_fn_error $? "oniguruma.h not found in $PHP_ONIG/include" "$LINENO" 5 fi - + if test "$PHP_ONIG/include" != "/usr/include"; then - + if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then ai_p=$PHP_ONIG/include else - + ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" 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 - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PHP_ONIG/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -56870,20 +57256,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -56896,175 +57282,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 -echo "configure:56943: checking for onig_init in -lonig" >&5 -ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_onig_onig_init+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lonig $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -onig_init() -; return 0; } -EOF -if { (eval echo configure:56962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char onig_init (); +int +main () +{ +return onig_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_onig_onig_init=yes +else + ac_cv_lib_onig_onig_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_onig_onig_init" >&5 +$as_echo "$ac_cv_lib_onig_onig_init" >&6; } +if test "x$ac_cv_lib_onig_onig_init" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" if test -n "$PHP_ONIG/$PHP_LIBDIR"; then - + if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ONIG/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ONIG/$PHP_LIBDIR"; then - + if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ONIG/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ONIG/$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 onig in c|c_r|pthread*) ;; - *) - LIBS="-lonig $LIBS" + *) + LIBS="-lonig $LIBS" ;; esac @@ -57074,37 +57462,35 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_ONIG 1 -EOF - - - + +$as_echo "#define HAVE_ONIG 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_onig_onig_init - - { echo "configure: error: Problem with oniguruma. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with oniguruma. Please check config.log for more information." "$LINENO" 5 + + fi save_old_LDFLAGS=$LDFLAGS - + for ac_i in $MBSTRING_SHARED_LIBADD; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -57115,20 +57501,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -57141,131 +57527,131 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 -echo "configure:57188: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ return (int)(ONIG_ENCODING_KOI8 + 1); - -; return 0; } -EOF -if { (eval echo configure:57201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""no" 1>&6 - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define PHP_ONIG_BAD_KOI8_ENTRY 1 -EOF - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h + + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_old_LDFLAGS fi - + PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DONIG_ESCAPE_UCHAR_COLLISION=1" - + PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DUChar=OnigUChar" - cat >> confdefs.h <<\EOF -#define HAVE_MBREGEX 1 -EOF + +$as_echo "#define HAVE_MBREGEX 1" >>confdefs.h + - PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES php_mbregex.c" - + PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS php_mbregex.h php_onig_compat.h" fi fi - - + + if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl" - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/mbfl" - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/filters" - + PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/nls" - + PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl" - + PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl/mbfl" - + PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS libmbfl/config.h" - - PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES + + PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES libmbfl/filters/html_entities.c libmbfl/filters/mbfilter_7bit.c libmbfl/filters/mbfilter_ascii.c @@ -57347,10 +57733,10 @@ libmbfl/nls/nls_ua.c " - + PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DHAVE_CONFIG_H" - + PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h" else @@ -57362,60 +57748,60 @@ done if test -z "$PHP_LIBMBFL_INCLUDE"; then - { echo "configure: error: mbfilter.h not found. Please reinstall libmbfl library." 1>&2; exit 1; } - else - + as_fn_error $? "mbfilter.h not found. Please reinstall libmbfl library." "$LINENO" 5 + else + if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then - + if test -z "$PHP_LIBMBFL_INCLUDE" || echo "$PHP_LIBMBFL_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$PHP_LIBMBFL_INCLUDE else - + ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`" 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 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PHP_LIBMBFL/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -57426,20 +57812,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -57452,175 +57838,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 -echo "configure:57499: checking for mbfl_buffer_converter_new in -lmbfl" >&5 -ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_mbfl_mbfl_buffer_converter_new+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmbfl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mbfl_buffer_converter_new() -; return 0; } -EOF -if { (eval echo configure:57518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mbfl_buffer_converter_new (); +int +main () +{ +return mbfl_buffer_converter_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mbfl_mbfl_buffer_converter_new=yes +else + ac_cv_lib_mbfl_mbfl_buffer_converter_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then MBSTRING_SHARED_LIBADD="-lmbfl $MBSTRING_SHARED_LIBADD" if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then - + if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_LIBMBFL/$PHP_LIBDIR else - + ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then - + if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_LIBMBFL/$PHP_LIBDIR else - + ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$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 mbfl in c|c_r|pthread*) ;; - *) - LIBS="-lmbfl $LIBS" + *) + LIBS="-lmbfl $LIBS" ;; esac @@ -57630,24 +58018,23 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_mbfl_mbfl_buffer_converter_new - - { echo "configure: error: Problem with libmbfl. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Problem with libmbfl. Please check config.log for more information." "$LINENO" 5 + + fi fi - - + + ext_builddir=ext/mbstring ext_srcdir=$abs_srcdir/ext/mbstring @@ -57655,15 +58042,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_MBSTRING_SHARED=no - - + + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -57676,12 +58063,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -57705,14 +58092,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_MBSTRING_SHARED=yes - + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -57725,12 +58112,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo" case $ac_src in @@ -57748,7 +58135,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -57758,7 +58145,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMBSTRING, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(MBSTRING_SHARED_LIBADD)' ;; *) suffix=la @@ -57771,7 +58158,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmbstring.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MBSTRING 1 -EOF +_ACEOF fi fi @@ -57833,15 +58221,15 @@ PHP_MBSTRING_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -57854,12 +58242,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -57879,15 +58267,15 @@ EXT_STATIC="$EXT_STATIC mbstring" ;; *) - - + + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -57900,12 +58288,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -57926,90 +58314,90 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mbstring - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST MBSTRING_SHARED_LIBADD" for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do - - + + $php_shtool mkdir -p $ext_builddir/$dir - + done - + for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do - + if test "$ext_srcdir/$dir" != "/usr/include"; then - + if test -z "$ext_srcdir/$dir" || echo "$ext_srcdir/$dir" | grep '^/' >/dev/null ; then ai_p=$ext_srcdir/$dir else - + ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`" 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 - + if test "$ext_builddir/$dir" != "/usr/include"; then - + if test -z "$ext_builddir/$dir" || echo "$ext_builddir/$dir" | grep '^/' >/dev/null ; then ai_p=$ext_builddir/$dir else - + ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`" 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 @@ -58017,15 +58405,15 @@ done if test "$ext_shared" = "no"; then - - + + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -58038,12 +58426,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_BASE_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -58062,14 +58450,14 @@ out="php_config.h" else - + case ext/mbstring in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -58082,12 +58470,12 @@ old_IFS=$IFS for ac_src in $PHP_MBSTRING_BASE_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo" case $ac_src in @@ -58109,34 +58497,34 @@ out="php_config.h" fi fi - + for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do cat > $ext_builddir/$cfg <&6 -echo "configure:58155: checking for mcrypt support" >&5 -# Check whether --with-mcrypt or --without-mcrypt was given. -if test "${with_mcrypt+set}" = set; then - withval="$with_mcrypt" - PHP_MCRYPT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt support" >&5 +$as_echo_n "checking for mcrypt support... " >&6; } + +# Check whether --with-mcrypt was given. +if test "${with_mcrypt+set}" = set; then : + withval=$with_mcrypt; PHP_MCRYPT=$withval else - + PHP_MCRYPT=no test "$PHP_ENABLE_ALL" && PHP_MCRYPT=$PHP_ENABLE_ALL @@ -58186,7 +58574,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -58197,60 +58586,58 @@ done if test -z "$MCRYPT_DIR"; then - { echo "configure: error: mcrypt.h not found. Please reinstall libmcrypt." 1>&2; exit 1; } + as_fn_error $? "mcrypt.h not found. Please reinstall libmcrypt." "$LINENO" 5 fi - + old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$MCRYPT_DIR/include - echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 -echo "configure:58208: checking for libmcrypt version" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for libmcrypt version... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if MCRYPT_API_VERSION >= 20021217 yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t"">= 2.5.6" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 2.5.6" >&5 +$as_echo ">= 2.5.6" >&6; } + else - rm -rf conftest* - - { echo "configure: error: libmcrypt version 2.5.6 or greater required." 1>&2; exit 1; } - + + as_fn_error $? "libmcrypt version 2.5.6 or greater required." "$LINENO" 5 + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -58261,20 +58648,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -58287,101 +58674,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:58334: checking for mcrypt_module_open in -lmcrypt" >&5 -ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_mcrypt_mcrypt_module_open+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmcrypt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mcrypt_module_open() -; return 0; } -EOF -if { (eval echo configure:58353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mcrypt_module_open (); +int +main () +{ +return mcrypt_module_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mcrypt_mcrypt_module_open=yes +else + ac_cv_lib_mcrypt_mcrypt_module_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case ltdl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD" + MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD" else - - + + case ltdl in c|c_r|pthread*) ;; - *) - LIBS="-lltdl $LIBS" + *) + LIBS="-lltdl $LIBS" ;; esac @@ -58391,38 +58780,36 @@ esac - cat >> confdefs.h <<\EOF -#define HAVE_LIBMCRYPT 1 -EOF - - +$as_echo "#define HAVE_LIBMCRYPT 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_mcrypt_mcrypt_module_open - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$MCRYPT_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -58433,20 +58820,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -58459,198 +58846,198 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:58506: checking for mcrypt_module_open in -lmcrypt" >&5 -ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_mcrypt_mcrypt_module_open+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmcrypt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mcrypt_module_open() -; return 0; } -EOF -if { (eval echo configure:58525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mcrypt_module_open (); +int +main () +{ +return mcrypt_module_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mcrypt_mcrypt_module_open=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_mcrypt_mcrypt_module_open=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_LIBMCRYPT 1 -EOF - - + +$as_echo "#define HAVE_LIBMCRYPT 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_mcrypt_mcrypt_module_open - - { echo "configure: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." 1>&2; exit 1; } - - + + as_fn_error $? "Sorry, I was not able to diagnose which libmcrypt version you have installed." "$LINENO" 5 + + fi - - + + fi - + if test "$ext_shared" = "yes"; then MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD" if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then - + if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$MCRYPT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then MCRYPT_SHARED_LIBADD="-L$ai_p $MCRYPT_SHARED_LIBADD" test -n "$ld_runpath_switch" && MCRYPT_SHARED_LIBADD="$ld_runpath_switch$ai_p $MCRYPT_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then - + if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$MCRYPT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$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 mcrypt in c|c_r|pthread*) ;; - *) - LIBS="-lmcrypt $LIBS" + *) + LIBS="-lmcrypt $LIBS" ;; esac @@ -58660,42 +59047,42 @@ fi - + if test "$MCRYPT_DIR/include" != "/usr/include"; then - + if test -z "$MCRYPT_DIR/include" || echo "$MCRYPT_DIR/include" | grep '^/' >/dev/null ; then ai_p=$MCRYPT_DIR/include else - + ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`" 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 - + PHP_VAR_SUBST="$PHP_VAR_SUBST MCRYPT_SHARED_LIBADD" - + ext_builddir=ext/mcrypt ext_srcdir=$abs_srcdir/ext/mcrypt @@ -58703,15 +59090,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_MCRYPT_SHARED=no - - + + case ext/mcrypt in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -58724,12 +59111,12 @@ old_IFS=$IFS for ac_src in mcrypt.c mcrypt_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -58753,14 +59140,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_MCRYPT_SHARED=yes - + case ext/mcrypt in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -58773,12 +59160,12 @@ old_IFS=$IFS for ac_src in mcrypt.c mcrypt_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mcrypt="$shared_objects_mcrypt $ac_bdir$ac_obj.lo" case $ac_src in @@ -58796,7 +59183,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -58806,7 +59193,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMCRYPT, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(MCRYPT_SHARED_LIBADD)' ;; *) suffix=la @@ -58819,7 +59206,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmcrypt.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MCRYPT 1 -EOF +_ACEOF fi fi @@ -58881,15 +59269,15 @@ PHP_MCRYPT_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mcrypt in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -58902,12 +59290,12 @@ old_IFS=$IFS for ac_src in mcrypt.c mcrypt_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -58927,15 +59315,15 @@ EXT_STATIC="$EXT_STATIC mcrypt" ;; *) - - + + case ext/mcrypt in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -58948,12 +59336,12 @@ old_IFS=$IFS for ac_src in mcrypt.c mcrypt_filter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -58974,15 +59362,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mcrypt - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -58993,14 +59381,14 @@ php_with_mssql=no -echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 -echo "configure:58998: checking for MSSQL support via FreeTDS" >&5 -# Check whether --with-mssql or --without-mssql was given. -if test "${with_mssql+set}" = set; then - withval="$with_mssql" - PHP_MSSQL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSSQL support via FreeTDS" >&5 +$as_echo_n "checking for MSSQL support via FreeTDS... " >&6; } + +# Check whether --with-mssql was given. +if test "${with_mssql+set}" = set; then : + withval=$with_mssql; PHP_MSSQL=$withval else - + PHP_MSSQL=no test "$PHP_ENABLE_ALL" && PHP_MSSQL=$PHP_ENABLE_ALL @@ -59029,7 +59417,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -59050,7 +59439,7 @@ done if test -z "$FREETDS_INSTALLATION_DIR"; then - { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; } + as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5 fi elif test "$PHP_MSSQL" != "no"; then @@ -59062,133 +59451,133 @@ FREETDS_INSTALLATION_DIR=$PHP_MSSQL FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds else - { echo "configure: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" 1>&2; exit 1; } + as_fn_error $? "Directory $PHP_MSSQL is not a FreeTDS installation directory" "$LINENO" 5 fi - fi + fi if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then - { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; } + as_fn_error $? "Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 fi - + if test "$FREETDS_INCLUDE_DIR" != "/usr/include"; then - + if test -z "$FREETDS_INCLUDE_DIR" || echo "$FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then ai_p=$FREETDS_INCLUDE_DIR else - + ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`" 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 - + if test "$ext_shared" = "yes"; then MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD" if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then - + if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then - + if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR else - + ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$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 sybdb in c|c_r|pthread*) ;; - *) - LIBS="-lsybdb $LIBS" + *) + LIBS="-lsybdb $LIBS" ;; esac @@ -59199,7 +59588,7 @@ - + ext_builddir=ext/mssql ext_srcdir=$abs_srcdir/ext/mssql @@ -59207,15 +59596,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_MSSQL_SHARED=no - - + + case ext/mssql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -59228,12 +59617,12 @@ old_IFS=$IFS for ac_src in php_mssql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -59257,14 +59646,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_MSSQL_SHARED=yes - + case ext/mssql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -59277,12 +59666,12 @@ old_IFS=$IFS for ac_src in php_mssql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mssql="$shared_objects_mssql $ac_bdir$ac_obj.lo" case $ac_src in @@ -59300,7 +59689,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -59310,7 +59699,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(MSSQL_SHARED_LIBADD)' ;; *) suffix=la @@ -59323,7 +59712,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MSSQL 1 -EOF +_ACEOF fi fi @@ -59385,15 +59775,15 @@ PHP_MSSQL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mssql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -59406,12 +59796,12 @@ old_IFS=$IFS for ac_src in php_mssql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -59431,15 +59821,15 @@ EXT_STATIC="$EXT_STATIC mssql" ;; *) - - + + case ext/mssql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -59452,12 +59842,12 @@ old_IFS=$IFS for ac_src in php_mssql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -59478,142 +59868,144 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mssql" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mssql - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:59496: checking for dnet_addr in -ldnet_stub" >&5 -ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dnet_addr() -; return 0; } -EOF -if { (eval echo configure:59515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_addr (); +int +main () +{ +return dnet_addr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_addr=yes +else + ac_cv_lib_dnet_stub_dnet_addr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - if test "$ext_shared" = "yes"; then MSSQL_SHARED_LIBADD="-ldnet_stub $MSSQL_SHARED_LIBADD" if test -n ""; then - + if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then - + if test -z "" || echo "" | grep '^/' >/dev/null ; then ai_p= else - + ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"\"`" fi - + if test "$ext_shared" = "yes"; then MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n ""; then - + if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then - + if test -z "" || echo "" | grep '^/' >/dev/null ; then ai_p= else - + ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"\"`" 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 dnet_stub in c|c_r|pthread*) ;; - *) - LIBS="-ldnet_stub $LIBS" + *) + LIBS="-ldnet_stub $LIBS" ;; esac @@ -59623,24 +60015,19 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBDNET_STUB 1 -EOF - -else - echo "$ac_t""no" 1>&6 +$as_echo "#define HAVE_LIBDNET_STUB 1" >>confdefs.h + + fi - cat >> confdefs.h <<\EOF -#define HAVE_MSSQL 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_FREETDS 1 -EOF +$as_echo "#define HAVE_MSSQL 1" >>confdefs.h + + +$as_echo "#define HAVE_FREETDS 1" >>confdefs.h + - PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD" fi @@ -59654,14 +60041,14 @@ php_with_mysql=no -echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 -echo "configure:59659: checking for MySQL support" >&5 -# Check whether --with-mysql or --without-mysql was given. -if test "${with_mysql+set}" = set; then - withval="$with_mysql" - PHP_MYSQL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support" >&5 +$as_echo_n "checking for MySQL support... " >&6; } + +# Check whether --with-mysql was given. +if test "${with_mysql+set}" = set; then : + withval=$with_mysql; PHP_MYSQL=$withval else - + PHP_MYSQL=no test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL @@ -59690,7 +60077,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -59698,46 +60086,48 @@ php_with_mysql_sock=no -echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 -echo "configure:59703: checking for specified location of the MySQL UNIX socket" >&5 -# Check whether --with-mysql-sock or --without-mysql-sock was given. -if test "${with_mysql_sock+set}" = set; then - withval="$with_mysql_sock" - PHP_MYSQL_SOCK=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5 +$as_echo_n "checking for specified location of the MySQL UNIX socket... " >&6; } + +# Check whether --with-mysql-sock was given. +if test "${with_mysql_sock+set}" = set; then : + withval=$with_mysql_sock; PHP_MYSQL_SOCK=$withval else - + PHP_MYSQL_SOCK=no - + fi ext_output=$PHP_MYSQL_SOCK -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_ZLIB_DIR"; then - + php_with_zlib_dir=no -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:59727: checking for the location of libz" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5 +$as_echo_n "checking for the location of libz... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -59763,11 +60153,11 @@ done if test -z "$MYSQL_DIR"; then - { echo "configure: error: Cannot find MySQL header files under $PHP_MYSQL. -Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; } + as_fn_error $? "Cannot find MySQL header files under $PHP_MYSQL. +Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 fi - if test "$enable_maintainer_zts" = "yes"; then + if true || test "$enable_maintainer_zts" = "yes"; then MYSQL_LIBNAME=mysqlclient_r else MYSQL_LIBNAME=mysqlclient @@ -59783,7 +60173,7 @@ fi for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do - + str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*" for j in `echo $str`; do if test -r $j; then @@ -59795,29 +60185,29 @@ done if test -z "$MYSQL_LIB_DIR"; then - { echo "configure: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. -Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; } + as_fn_error $? "Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. +Note that the MySQL client library is not bundled anymore!" "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$MYSQL_LIB_DIR + -L$MYSQL_LIB_DIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -59828,20 +60218,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -59854,184 +60244,187 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:59901: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_close() -; return 0; } -EOF -if { (eval echo configure:59920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_close (); +int +main () +{ +return mysql_close (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close - + if test "$PHP_ZLIB_DIR" != "no"; then - + if test "$ext_shared" = "yes"; then MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -60041,25 +60434,25 @@ fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -60070,20 +60463,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -60096,116 +60489,119 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:60143: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_error() -; return 0; } -EOF -if { (eval echo configure:60162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_error (); +int +main () +{ +return mysql_error (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error - - { echo "configure: error: mysql configure failed. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "mysql configure failed. Please check config.log for more information." "$LINENO" 5 + + fi - + MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else - - + + case z in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" + MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" else - - + + case z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -60215,25 +60611,25 @@ esac - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$MYSQL_LIB_DIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -60244,20 +60640,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -60270,195 +60666,198 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:60317: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_errno() -; return 0; } -EOF -if { (eval echo configure:60336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_errno (); +int +main () +{ +return mysql_errno (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno - - { echo "configure: error: Try adding --with-zlib-dir=. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Try adding --with-zlib-dir=. Please check config.log for more information." "$LINENO" 5 + + fi - + MYSQL_LIBS="-lz" fi - - + + fi - + if test "$ext_shared" = "yes"; then MYSQL_SHARED_LIBADD="-l$MYSQL_LIBNAME $MYSQL_SHARED_LIBADD" if test -n "$MYSQL_LIB_DIR"; then - + if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then - + if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then ai_p=$MYSQL_LIB_DIR else - + ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$MYSQL_LIB_DIR"; then - + if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then - + if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then ai_p=$MYSQL_LIB_DIR else - + ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`" 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 $MYSQL_LIBNAME in c|c_r|pthread*) ;; - *) - LIBS="-l$MYSQL_LIBNAME $LIBS" + *) + LIBS="-l$MYSQL_LIBNAME $LIBS" ;; esac @@ -60468,33 +60867,33 @@ fi - + if test "$MYSQL_INC_DIR" != "/usr/include"; then - + if test -z "$MYSQL_INC_DIR" || echo "$MYSQL_INC_DIR" | grep '^/' >/dev/null ; then ai_p=$MYSQL_INC_DIR else - + ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`" 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 @@ -60503,39 +60902,41 @@ MYSQL_MODULE_TYPE=external MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS" MYSQL_INCLUDE=-I$MYSQL_INC_DIR - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_MODULE_TYPE" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_LIBS" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_INCLUDE" - + fi if test "$PHP_MYSQL" != "no"; then - echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 -echo "configure:60530: checking for MySQL UNIX socket location" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5 +$as_echo_n "checking for MySQL UNIX socket location... " >&6; } if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then MYSQL_SOCK=$PHP_MYSQL_SOCK - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK" -EOF +_ACEOF - echo "$ac_t""$MYSQL_SOCK" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 +$as_echo "$MYSQL_SOCK" >&6; } elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then - + for i in \ /var/run/mysqld/mysqld.sock \ /var/tmp/mysql.sock \ @@ -60554,24 +60955,27 @@ done if test -n "$MYSQL_SOCK"; then - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK" -EOF +_ACEOF - echo "$ac_t""$MYSQL_SOCK" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 +$as_echo "$MYSQL_SOCK" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - cat >> confdefs.h <<\EOF -#define HAVE_MYSQL 1 -EOF - +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h + + ext_builddir=ext/mysql ext_srcdir=$abs_srcdir/ext/mysql @@ -60579,15 +60983,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_MYSQL_SHARED=no - - + + case ext/mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -60600,12 +61004,12 @@ old_IFS=$IFS for ac_src in php_mysql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -60629,14 +61033,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_MYSQL_SHARED=yes - + case ext/mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -60649,12 +61053,12 @@ old_IFS=$IFS for ac_src in php_mysql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mysql="$shared_objects_mysql $ac_bdir$ac_obj.lo" case $ac_src in @@ -60672,7 +61076,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -60682,7 +61086,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(MYSQL_SHARED_LIBADD)' ;; *) suffix=la @@ -60695,7 +61099,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MYSQL 1 -EOF +_ACEOF fi fi @@ -60757,15 +61162,15 @@ PHP_MYSQL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -60778,12 +61183,12 @@ old_IFS=$IFS for ac_src in php_mysql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -60803,15 +61208,15 @@ EXT_STATIC="$EXT_STATIC mysql" ;; *) - - + + case ext/mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -60824,12 +61229,12 @@ old_IFS=$IFS for ac_src in php_mysql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -60850,46 +61255,45 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mysql" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mysql - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_SHARED_LIBADD" if test "$PHP_MYSQL" = "mysqlnd"; then - + am_i_shared=$PHP_MYSQL_SHARED is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - cat >> confdefs.h <<\EOF -#define MYSQL_USE_MYSQLND 1 -EOF + + +$as_echo "#define MYSQL_USE_MYSQLND 1" >>confdefs.h fi fi @@ -60898,14 +61302,14 @@ php_with_mysqli=no -echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6 -echo "configure:60903: checking for MySQLi support" >&5 -# Check whether --with-mysqli or --without-mysqli was given. -if test "${with_mysqli+set}" = set; then - withval="$with_mysqli" - PHP_MYSQLI=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5 +$as_echo_n "checking for MySQLi support... " >&6; } + +# Check whether --with-mysqli was given. +if test "${with_mysqli+set}" = set; then : + withval=$with_mysqli; PHP_MYSQLI=$withval else - + PHP_MYSQLI=no test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL @@ -60934,7 +61338,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -60942,22 +61347,22 @@ php_enable_embedded_mysqli=no -echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 -echo "configure:60947: checking whether to enable embedded MySQLi support" >&5 -# Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. -if test "${enable_embedded_mysqli+set}" = set; then - enableval="$enable_embedded_mysqli" - PHP_EMBEDDED_MYSQLI=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable embedded MySQLi support" >&5 +$as_echo_n "checking whether to enable embedded MySQLi support... " >&6; } +# Check whether --enable-embedded_mysqli was given. +if test "${enable_embedded_mysqli+set}" = set; then : + enableval=$enable_embedded_mysqli; PHP_EMBEDDED_MYSQLI=$enableval else - + PHP_EMBEDDED_MYSQLI=no - + fi ext_output=$PHP_EMBEDDED_MYSQLI -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -60975,46 +61380,46 @@ MYSQL_LIB_NAME='mysqlclient' if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_EMBEDDED_MYSQLI 1 -EOF + +$as_echo "#define HAVE_EMBEDDED_MYSQLI 1" >>confdefs.h MYSQL_LIB_CFG='--libmysqld-libs' mysqli_extra_sources="mysqli_embedded.c" - elif test "$enable_maintainer_zts" = "yes"; then + elif true || test "$enable_maintainer_zts" = "yes"; then MYSQL_LIB_CFG='--libs_r' MYSQL_LIB_NAME='mysqlclient_r' else MYSQL_LIB_CFG='--libs' fi - + if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` else - echo "$ac_t""mysql_config not found" 1>&6 - { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; } + { $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 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $MYSQLI_LIBLINE " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -61025,20 +61430,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -61051,119 +61456,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61098: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIB_NAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_set_server_option() -; return 0; } -EOF -if { (eval echo configure:61117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_set_server_option (); +int +main () +{ +return mysql_set_server_option (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + for ac_i in $MYSQLI_INCLINE; 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 @@ -61172,17 +61581,17 @@ esac done - + for ac_i in $MYSQLI_LIBLINE; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -61193,20 +61602,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii" + MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -61219,69 +61628,68 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then MYSQLI_SHARED_LIBADD="-L$ai_p $MYSQLI_SHARED_LIBADD" test -n "$ld_runpath_switch" && MYSQLI_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLI_SHARED_LIBADD" else - - - + + + 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 ;; esac done - cat >> confdefs.h <<\EOF -#define HAVE_MYSQLILIB 1 -EOF - +$as_echo "#define HAVE_MYSQLILIB 1" >>confdefs.h + + save_old_LDFLAGS=$LDFLAGS ac_stuff="$MYSQLI_LIBLINE" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -61292,20 +61700,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -61318,133 +61726,135 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61365: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIB_NAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_set_character_set() -; return 0; } -EOF -if { (eval echo configure:61384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_set_character_set (); +int +main () +{ +return mysql_set_character_set (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set - - { echo "configure: 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." 1>&2; exit 1; } - - + + 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 - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option - - { echo "configure: error: wrong mysql library version or lib not found. Check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "wrong mysql library version or lib not found. Check config.log for more information." "$LINENO" 5 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $MYSQLI_LIBLINE " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -61455,20 +61865,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -61481,102 +61891,104 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:61528: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 -ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIB_NAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_stmt_next_result() -; return 0; } -EOF -if { (eval echo configure:61547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_stmt_next_result (); +int +main () +{ +return mysql_stmt_next_result (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_STMT_NEXT_RESULT 1 -EOF - - + +$as_echo "#define HAVE_STMT_NEXT_RESULT 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result - - - + + + fi fi @@ -61585,7 +61997,7 @@ mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ mysqli_exception.c $mysqli_extra_sources" - + ext_builddir=ext/mysqli ext_srcdir=$abs_srcdir/ext/mysqli @@ -61593,15 +62005,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_MYSQLI_SHARED=no - - + + case ext/mysqli in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -61614,12 +62026,12 @@ old_IFS=$IFS for ac_src in $mysqli_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -61643,14 +62055,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_MYSQLI_SHARED=yes - + case ext/mysqli in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -61663,12 +62075,12 @@ old_IFS=$IFS for ac_src in $mysqli_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo" case $ac_src in @@ -61686,7 +62098,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -61696,7 +62108,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(MYSQLI_SHARED_LIBADD)' ;; *) suffix=la @@ -61709,7 +62121,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MYSQLI 1 -EOF +_ACEOF fi fi @@ -61771,15 +62184,15 @@ PHP_MYSQLI_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mysqli in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -61792,12 +62205,12 @@ old_IFS=$IFS for ac_src in $mysqli_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -61817,15 +62230,15 @@ EXT_STATIC="$EXT_STATIC mysqli" ;; *) - - + + case ext/mysqli in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -61838,12 +62251,12 @@ old_IFS=$IFS for ac_src in $mysqli_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -61864,64 +62277,63 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mysqli - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD" - - + + for header_file in ext/mysqli/php_mysqli_structs.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + if test "$PHP_MYSQLI" = "mysqlnd"; then - + am_i_shared=$PHP_MYSQLI_SHARED is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - cat >> confdefs.h <<\EOF -#define MYSQLI_USE_MYSQLND 1 -EOF + + +$as_echo "#define MYSQLI_USE_MYSQLND 1" >>confdefs.h fi fi @@ -61946,14 +62358,14 @@ php_with_oci8=no -echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6 -echo "configure:61951: checking for Oracle (OCI8) support" >&5 -# Check whether --with-oci8 or --without-oci8 was given. -if test "${with_oci8+set}" = set; then - withval="$with_oci8" - PHP_OCI8=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Oracle (OCI8) support" >&5 +$as_echo_n "checking for Oracle (OCI8) support... " >&6; } + +# Check whether --with-oci8 was given. +if test "${with_oci8+set}" = set; then : + withval=$with_oci8; PHP_OCI8=$withval else - + PHP_OCI8=no test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL @@ -61982,25 +62394,26 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } -if test "$PHP_OCI8" != "no"; then +if test "$PHP_OCI8" != "no"; then if test -z "$PHP_OCI8"; then - { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; } + as_fn_error $? "Empty parameter value passed to --with-oci8" "$LINENO" 5 fi - - echo $ac_n "checking PHP version""... $ac_c" 1>&6 -echo "configure:61999: checking PHP version" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5 +$as_echo_n "checking PHP version... " >&6; } tmp_version=$PHP_VERSION if test -z "$tmp_version"; then if test -z "$PHP_CONFIG"; then - { echo "configure: error: php-config not found" 1>&2; exit 1; } + 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 @@ -62008,7 +62421,7 @@ fi if test -z "$php_version"; then - { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; } + as_fn_error $? "failed to detect PHP version, please report" "$LINENO" 5 fi ac_IFS=$IFS @@ -62018,70 +62431,68 @@ oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3` if test "$oci8_php_version" -lt "4003009"; then - { echo "configure: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" 1>&2; exit 1; } + 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 - { echo "configure: error: This version of OCI8 is not compatible with PHP 6 or higher" 1>&2; exit 1; } + as_fn_error $? "This version of OCI8 is not compatible with PHP 6 or higher" "$LINENO" 5 else - echo "$ac_t""$php_version, ok" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5 +$as_echo "$php_version, ok" >&6; } fi - - echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:62031: checking size of long int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_int=4 + + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${ac_cv_sizeof_long_int+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long int)); - return(0); -} -EOF -if { (eval echo configure:62050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_int=`cat conftestval` + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_int=0 -fi -rm -fr conftest* + 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_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int -EOF +_ACEOF - echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 -echo "configure:62070: checking checking if we're on a 64-bit platform" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if we're on a 64-bit platform" >&5 +$as_echo_n "checking checking if we're on a 64-bit platform... " >&6; } if test "$ac_cv_sizeof_long_int" = "4"; then - echo "$ac_t""no" 1>&6 - PHP_OCI8_OH_LIBDIR=lib32 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PHP_OCI8_OH_LIBDIR=lib32 PHP_OCI8_IC_LIBDIR_SUFFIX="" else - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PHP_OCI8_OH_LIBDIR=lib PHP_OCI8_IC_LIBDIR_SUFFIX=64 fi - + PHP_OCI8_INSTANT_CLIENT="no" if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then - echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5 +$as_echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;} PHP_OCI8=instantclient fi @@ -62108,22 +62519,23 @@ fi if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then - - echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 -echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5 +$as_echo_n "checking Oracle ORACLE_HOME install directory... " >&6; } if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME else OCI8_DIR=$PHP_OCI8 fi - echo "$ac_t""$OCI8_DIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5 +$as_echo "$OCI8_DIR" >&6; } + - - echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 -echo "configure:62125: checking ORACLE_HOME library validity" >&5 + { $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 - { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } + 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 @@ -62133,42 +62545,43 @@ OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR else if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then - { echo "configure: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" 1>&2; exit 1; } + 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 - { echo "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; } + as_fn_error $? "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5 fi fi - echo "$ac_t""$OCI8_LIB_DIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5 +$as_echo "$OCI8_LIB_DIR" >&6; } if test -d "$OCI8_DIR/rdbms/public"; then - + if test "$OCI8_DIR/rdbms/public" != "/usr/include"; then - + if test -z "$OCI8_DIR/rdbms/public" || echo "$OCI8_DIR/rdbms/public" | grep '^/' >/dev/null ; then ai_p=$OCI8_DIR/rdbms/public else - + ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`" 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 @@ -62176,33 +62589,33 @@ OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public" fi if test -d "$OCI8_DIR/rdbms/demo"; then - + if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then - + if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then ai_p=$OCI8_DIR/rdbms/demo else - + ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`" 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 @@ -62210,33 +62623,33 @@ OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo" fi if test -d "$OCI8_DIR/network/public"; then - + if test "$OCI8_DIR/network/public" != "/usr/include"; then - + if test -z "$OCI8_DIR/network/public" || echo "$OCI8_DIR/network/public" | grep '^/' >/dev/null ; then ai_p=$OCI8_DIR/network/public else - + ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`" 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 @@ -62244,33 +62657,33 @@ OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public" fi if test -d "$OCI8_DIR/plsql/public"; then - + if test "$OCI8_DIR/plsql/public" != "/usr/include"; then - + if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then ai_p=$OCI8_DIR/plsql/public else - + ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`" 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 @@ -62279,17 +62692,17 @@ fi if test -f "$OCI8_DIR/$OCI8_LIB_DIR/sysliblist"; then - + for ac_i in `cat $OCI8_DIR/$OCI8_LIB_DIR/sysliblist`; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then OCI8_SYSLIB="$OCI8_SYSLIB -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -62300,20 +62713,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" + OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -62326,42 +62739,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" else - - - + + + 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 ;; @@ -62369,17 +62782,17 @@ done elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then - + for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then OCI8_SYSLIB="$OCI8_SYSLIB -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -62390,20 +62803,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" + OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -62416,42 +62829,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" else - - - + + + 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 ;; @@ -62460,9 +62873,9 @@ fi - - echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:62466: checking Oracle version" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5 +$as_echo_n "checking Oracle version... " >&6; } if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3 @@ -62476,43 +62889,44 @@ OCI8_ORACLE_VERSION=8.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then OCI8_ORACLE_VERSION=8.0 - elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then - if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then + elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then + if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then OCI8_ORACLE_VERSION=8.0 else OCI8_ORACLE_VERSION=8.1 fi else - { echo "configure: error: Oracle client libraries not found" 1>&2; exit 1; } + as_fn_error $? "Oracle client libraries not found" "$LINENO" 5 fi - echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5 +$as_echo "$OCI8_ORACLE_VERSION" >&6; } case $OCI8_ORACLE_VERSION in 7.3|8.0|8.1) - { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; } + as_fn_error $? "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 ;; 9.0) - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -62523,20 +62937,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -62549,130 +62963,130 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5 +$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCIEnvNlsCreate() -; return 0; } -EOF -if { (eval echo configure:62615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCIEnvNlsCreate (); +int +main () +{ +return OCIEnvNlsCreate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCIEnvNlsCreate=yes +else + ac_cv_lib_clntsh_OCIEnvNlsCreate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5 +$as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; } +if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + OCI8_ORACLE_VERSION=9.2 - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCIEnvNlsCreate - - { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; } - - + + as_fn_error $? "Oracle client libraries < 9.2 are not supported" "$LINENO" 5 + + fi ;; 10.1|11.1) - cat >> confdefs.h <<\EOF -#define HAVE_OCI_LOB_READ2 1 -EOF + +$as_echo "#define HAVE_OCI_LOB_READ2 1" >>confdefs.h ;; *) - { echo "configure: error: Oracle version $OCI8_ORACLE_VERSION is not supported" 1>&2; exit 1; } + as_fn_error $? "Oracle version $OCI8_ORACLE_VERSION is not supported" "$LINENO" 5 ;; esac - - + + case clntsh in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" + OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" else - - + + case clntsh in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lclntsh" + *) + LIBS="$LIBS -lclntsh" ;; esac @@ -62682,45 +63096,45 @@ esac - + if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then - + if test -z "$OCI8_DIR/$OCI8_LIB_DIR" || echo "$OCI8_DIR/$OCI8_LIB_DIR" | grep '^/' >/dev/null ; then ai_p=$OCI8_DIR/$OCI8_LIB_DIR else - + ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD" test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD" else - - - + + + 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 - + ext_builddir=ext/oci8 ext_srcdir=$abs_srcdir/ext/oci8 @@ -62728,15 +63142,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_OCI8_SHARED=no - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -62749,12 +63163,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -62778,14 +63192,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_OCI8_SHARED=yes - + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -62798,12 +63212,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo" case $ac_src in @@ -62821,7 +63235,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -62831,7 +63245,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_SHARED_LIBADD)' ;; *) suffix=la @@ -62844,7 +63258,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_OCI8 1 -EOF +_ACEOF fi fi @@ -62906,15 +63321,15 @@ PHP_OCI8_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -62927,12 +63342,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -62952,15 +63367,15 @@ EXT_STATIC="$EXT_STATIC oci8" ;; *) - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -62973,12 +63388,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -62999,69 +63414,71 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC oci8" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=oci8 - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - cat >> confdefs.h <<\EOF -#define HAVE_OCI8 1 -EOF + +$as_echo "#define HAVE_OCI8 1" >>confdefs.h + + - - PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION" - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_OCI8_DEF_DIR "$OCI8_DIR" -EOF +_ACEOF + - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD" -EOF +_ACEOF else - - echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 -echo "configure:63052: checking Oracle Instant Client directory" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5 +$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 | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` if test -z "$PHP_OCI8_INSTANT_CLIENT"; then - { echo "configure: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" 1>&2; exit 1; } + 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 - echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5 +$as_echo "$PHP_OCI8_INSTANT_CLIENT" >&6; } OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT - echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 -echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5 +$as_echo_n "checking Oracle Instant Client SDK header directory... " >&6; } OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` @@ -63070,124 +63487,127 @@ OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'` if test -f "$OCISDKRPMINC/oci.h"; then - echo "$ac_t""$OCISDKRPMINC" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5 +$as_echo "$OCISDKRPMINC" >&6; } + if test "$OCISDKRPMINC" != "/usr/include"; then - + if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then ai_p=$OCISDKRPMINC else - + ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`" 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 OCI8INCDIR=$OCISDKRPMINC elif test -f "$OCISDKZIPINC/oci.h"; then - echo "$ac_t""$OCISDKZIPINC" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5 +$as_echo "$OCISDKZIPINC" >&6; } + if test "$OCISDKZIPINC" != "/usr/include"; then - + if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then ai_p=$OCISDKZIPINC else - + ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`" 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 OCI8INCDIR=$OCISDKZIPINC elif test -f "$OCISDKMANINC/oci.h"; then - echo "$ac_t""$OCISDKMANINC" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5 +$as_echo "$OCISDKMANINC" >&6; } + if test "$OCISDKMANINC" != "/usr/include"; then - + if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then ai_p=$OCISDKMANINC else - + ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`" 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 OCI8INCDIR=$OCISDKMANINC else - { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; } + 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!'` if test -f "$OCISYSLIBLIST"; then - + for ac_i in `cat $OCISYSLIBLIST`; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then OCI8_SYSLIB="$OCI8_SYSLIB -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -63198,20 +63618,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" + OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -63224,42 +63644,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" else - - - + + + 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 ;; @@ -63268,48 +63688,49 @@ fi - - echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6 -echo "configure:63274: checking Oracle Instant Client version" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client version" >&5 +$as_echo_n "checking Oracle Instant Client version... " >&6; } if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then - { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" 1>&2; exit 1; } + as_fn_error $? "Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found" "$LINENO" 5 fi OCI8_ORACLE_VERSION=11.1 else - { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; } + as_fn_error $? "Oracle Instant Client library version not supported" "$LINENO" 5 fi elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then - { echo "configure: error: Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" 1>&2; exit 1; } + as_fn_error $? "Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found" "$LINENO" 5 fi OCI8_ORACLE_VERSION=10.1 else - { echo "configure: error: Oracle Instant Client library version not supported" 1>&2; exit 1; } + as_fn_error $? "Oracle Instant Client library version not supported" "$LINENO" 5 fi else - { echo "configure: error: Oracle Instant Client libraries not found" 1>&2; exit 1; } + as_fn_error $? "Oracle Instant Client libraries not found" "$LINENO" 5 fi - echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5 +$as_echo "$OCI8_ORACLE_VERSION" >&6; } case $OCI8_ORACLE_VERSION in 10.1|11.1) - - + + case clntsh in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" + OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" else - - + + case clntsh in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lclntsh" + *) + LIBS="$LIBS -lclntsh" ;; esac @@ -63319,61 +63740,59 @@ esac - + if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then - + if test -z "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then ai_p=$PHP_OCI8_INSTANT_CLIENT else - + ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`" fi - + if test "$ext_shared" = "yes"; then OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD" test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD" else - - - + + + 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 ;; *) - { echo "configure: error: Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" 1>&2; exit 1; } + as_fn_error $? "Oracle Instant Client version $PHP_OCI8_INSTANT_CLIENT is not supported" "$LINENO" 5 ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_OCI_INSTANT_CLIENT 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_OCI_LOB_READ2 1 -EOF +$as_echo "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h + + +$as_echo "#define HAVE_OCI_LOB_READ2 1" >>confdefs.h + - ext_builddir=ext/oci8 ext_srcdir=$abs_srcdir/ext/oci8 @@ -63381,15 +63800,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_OCI8_SHARED=no - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -63402,12 +63821,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -63431,14 +63850,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_OCI8_SHARED=yes - + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -63451,12 +63870,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo" case $ac_src in @@ -63474,7 +63893,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -63484,7 +63903,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_SHARED_LIBADD)' ;; *) suffix=la @@ -63497,7 +63916,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_OCI8 1 -EOF +_ACEOF fi fi @@ -63559,15 +63979,15 @@ PHP_OCI8_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -63580,12 +64000,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -63605,15 +64025,15 @@ EXT_STATIC="$EXT_STATIC oci8" ;; *) - - + + case ext/oci8 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -63626,12 +64046,12 @@ old_IFS=$IFS for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -63652,41 +64072,40 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC oci8" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=oci8 - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - cat >> confdefs.h <<\EOF -#define HAVE_OCI8 1 -EOF + +$as_echo "#define HAVE_OCI8 1" >>confdefs.h + + - - PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION" - + fi @@ -63708,12 +64127,12 @@ php_with_adabas=no -# Check whether --with-adabas or --without-adabas was given. -if test "${with_adabas+set}" = set; then - withval="$with_adabas" - PHP_ADABAS=$withval + +# Check whether --with-adabas was given. +if test "${with_adabas+set}" = set; then : + withval=$with_adabas; PHP_ADABAS=$withval else - + PHP_ADABAS=no test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL @@ -63748,73 +64167,73 @@ if test "$PHP_ADABAS" != "no"; then - echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 -echo "configure:63753: checking for Adabas support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5 +$as_echo_n "checking for Adabas support... " >&6; } if test "$PHP_ADABAS" = "yes"; then PHP_ADABAS=/usr/local fi - + if test "$PHP_ADABAS/incl" != "/usr/include"; then - + if test -z "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then ai_p=$PHP_ADABAS/incl else - + ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`" 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 - + if test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ADABAS/$PHP_LIBDIR" || echo "$PHP_ADABAS/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ADABAS/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$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 ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a" @@ -63822,69 +64241,69 @@ $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" cp "$ODBC_OBJS" "$ODBC_LIB" - - + + case sqlptc in c|c_r|pthread*) ;; - *) - LIBS="-lsqlptc $LIBS" + *) + LIBS="-lsqlptc $LIBS" ;; esac - - + + case sqlrte in c|c_r|pthread*) ;; - *) - LIBS="-lsqlrte $LIBS" + *) + LIBS="-lsqlrte $LIBS" ;; esac - + if test -n "$abs_builddir/ext/odbc"; then - + if test "$abs_builddir/ext/odbc" != "/usr/$PHP_LIBDIR" && test "$abs_builddir/ext/odbc" != "/usr/lib"; then - + if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then ai_p=$abs_builddir/ext/odbc else - + ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`" 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 odbc_adabas in c|c_r|pthread*) ;; - *) - LIBS="-lodbc_adabas $LIBS" + *) + LIBS="-lodbc_adabas $LIBS" ;; esac @@ -63893,16 +64312,16 @@ ODBC_TYPE=adabas ODBC_INCDIR=$PHP_ADABAS/incl - + if ! test -f "$ODBC_INCDIR/sqlext.h"; then - { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; } + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_ADABAS 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_ADABAS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -63911,12 +64330,12 @@ php_with_sapdb=no -# Check whether --with-sapdb or --without-sapdb was given. -if test "${with_sapdb+set}" = set; then - withval="$with_sapdb" - PHP_SAPDB=$withval + +# Check whether --with-sapdb was given. +if test "${with_sapdb+set}" = set; then : + withval=$with_sapdb; PHP_SAPDB=$withval else - + PHP_SAPDB=no test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL @@ -63951,91 +64370,91 @@ if test "$PHP_SAPDB" != "no"; then - echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 -echo "configure:63956: checking for SAP DB support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5 +$as_echo_n "checking for SAP DB support... " >&6; } if test "$PHP_SAPDB" = "yes"; then PHP_SAPDB=/usr/local fi - + if test "$PHP_SAPDB/incl" != "/usr/include"; then - + if test -z "$PHP_SAPDB/incl" || echo "$PHP_SAPDB/incl" | grep '^/' >/dev/null ; then ai_p=$PHP_SAPDB/incl else - + ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`" 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 - + if test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_SAPDB/$PHP_LIBDIR" || echo "$PHP_SAPDB/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_SAPDB/$PHP_LIBDIR else - + ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$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 - - + + case sqlod in c|c_r|pthread*) ;; - *) - LIBS="-lsqlod $LIBS" + *) + LIBS="-lsqlod $LIBS" ;; esac ODBC_TYPE=sapdb - cat >> confdefs.h <<\EOF -#define HAVE_SAPDB 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_SAPDB 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64044,12 +64463,12 @@ php_with_solid=no -# Check whether --with-solid or --without-solid was given. -if test "${with_solid+set}" = set; then - withval="$with_solid" - PHP_SOLID=$withval + +# Check whether --with-solid was given. +if test "${with_solid+set}" = set; then : + withval=$with_solid; PHP_SOLID=$withval else - + PHP_SOLID=no test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL @@ -64084,8 +64503,8 @@ if test "$PHP_SOLID" != "no"; then - echo $ac_n "checking for Solid support""... $ac_c" 1>&6 -echo "configure:64089: checking for Solid support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5 +$as_echo_n "checking for Solid support... " >&6; } if test "$PHP_SOLID" = "yes"; then PHP_SOLID=/usr/local/solid fi @@ -64094,58 +64513,52 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=solid if test -f $ODBC_LIBDIR/soc*35.a; then - cat >> confdefs.h <<\EOF -#define HAVE_SOLID_35 1 -EOF + +$as_echo "#define HAVE_SOLID_35 1" >>confdefs.h elif test -f $ODBC_LIBDIR/scl*30.a; then - cat >> confdefs.h <<\EOF -#define HAVE_SOLID_30 1 -EOF + +$as_echo "#define HAVE_SOLID_30 1" >>confdefs.h elif test -f $ODBC_LIBDIR/scl*23.a; then - cat >> confdefs.h <<\EOF -#define HAVE_SOLID 1 -EOF + +$as_echo "#define HAVE_SOLID 1" >>confdefs.h fi - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Solid library file""... $ac_c" 1>&6 -echo "configure:64116: checking Solid library file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5 +$as_echo_n "checking Solid library file... " >&6; } ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10 IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only - Linux) + Linux) if ldd -v /bin/sh | grep GLIBC > /dev/null; then - cat >> confdefs.h <<\EOF -#define SS_LINUX 1 -EOF + +$as_echo "#define SS_LINUX 1" >>confdefs.h ac_solid_os=l2x else - cat >> confdefs.h <<\EOF -#define SS_LINUX 1 -EOF + +$as_echo "#define SS_LINUX 1" >>confdefs.h ac_solid_os=lux - fi;; - SunOS) + fi;; + SunOS) ac_solid_os=ssx;; # should we deal with SunOS 4? - FreeBSD) + FreeBSD) if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then - cat >> confdefs.h <<\EOF -#define SS_FBX 1 -EOF + +$as_echo "#define SS_FBX 1" >>confdefs.h ac_solid_os=fex - else - cat >> confdefs.h <<\EOF -#define SS_FBX 1 -EOF + else + +$as_echo "#define SS_FBX 1" >>confdefs.h ac_solid_os=fbx fi;; @@ -64182,7 +64595,8 @@ ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} fi - echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5 +$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; } fi fi @@ -64192,12 +64606,12 @@ php_with_ibm_db2=no -# Check whether --with-ibm-db2 or --without-ibm-db2 was given. -if test "${with_ibm_db2+set}" = set; then - withval="$with_ibm_db2" - PHP_IBM_DB2=$withval + +# Check whether --with-ibm-db2 was given. +if test "${with_ibm_db2+set}" = set; then : + withval=$with_ibm_db2; PHP_IBM_DB2=$withval else - + PHP_IBM_DB2=no test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL @@ -64232,8 +64646,8 @@ if test "$PHP_IBM_DB2" != "no"; then - echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 -echo "configure:64237: checking for IBM DB2 support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5 +$as_echo_n "checking for IBM DB2 support... " >&6; } if test "$PHP_IBM_DB2" = "yes"; then ODBC_INCDIR=/home/db2inst1/sqllib/include ODBC_LIBDIR=/home/db2inst1/sqllib/lib @@ -64242,9 +64656,9 @@ ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR fi - + if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then - { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; } + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" "$LINENO" 5 fi @@ -64253,57 +64667,54 @@ ODBC_TYPE=ibm-db2 ODBC_LIBS=-ldb2 - + old_LIBS=$LIBS LIBS=" $ODBC_LFLAGS $ODBC_LIBS $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char SQLExecute(); int main() { SQLExecute(); return 0; } - -EOF -if { (eval echo configure:64279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - - cat >> confdefs.h <<\EOF -#define HAVE_IBMDB2 1 -EOF - echo "$ac_t""$ext_output" 1>&6 - - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +$as_echo "#define HAVE_IBMDB2 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + + +else + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: + + { $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. You need to source your DB2 environment before running PHP configure: # . \$IBM_DB2/db2profile -" 1>&2; exit 1; } - - +" "$LINENO" 5 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -64315,12 +64726,12 @@ php_with_odbcrouter=no -# Check whether --with-ODBCRouter or --without-ODBCRouter was given. -if test "${with_ODBCRouter+set}" = set; then - withval="$with_ODBCRouter" - PHP_ODBCROUTER=$withval + +# Check whether --with-ODBCRouter was given. +if test "${with_ODBCRouter+set}" = set; then : + withval=$with_ODBCRouter; PHP_ODBCROUTER=$withval else - + PHP_ODBCROUTER=no test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL @@ -64355,8 +64766,8 @@ if test "$PHP_ODBCROUTER" != "no"; then - echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 -echo "configure:64360: checking for ODBCRouter.com support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBCRouter.com support" >&5 +$as_echo_n "checking for ODBCRouter.com support... " >&6; } if test "$PHP_ODBCROUTER" = "yes"; then PHP_ODBCROUTER=/usr fi @@ -64366,11 +64777,11 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbcsdk ODBC_TYPE=ODBCRouter - cat >> confdefs.h <<\EOF -#define HAVE_ODBC_ROUTER 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_ODBC_ROUTER 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64379,12 +64790,12 @@ php_with_empress=no -# Check whether --with-empress or --without-empress was given. -if test "${with_empress+set}" = set; then - withval="$with_empress" - PHP_EMPRESS=$withval + +# Check whether --with-empress was given. +if test "${with_empress+set}" = set; then : + withval=$with_empress; PHP_EMPRESS=$withval else - + PHP_EMPRESS=no test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL @@ -64419,8 +64830,8 @@ if test "$PHP_EMPRESS" != "no"; then - echo $ac_n "checking for Empress support""... $ac_c" 1>&6 -echo "configure:64424: checking for Empress support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5 +$as_echo_n "checking for Empress support... " >&6; } if test "$PHP_EMPRESS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib @@ -64431,19 +64842,20 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_TYPE=empress - cat >> confdefs.h <<\EOF -#define HAVE_EMPRESS 1 -EOF - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Empress library file""... $ac_c" 1>&6 -echo "configure:64442: checking Empress library file" >&5 +$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5 +$as_echo_n "checking Empress library file... " >&6; } ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` if test ! -f $ODBC_LIBS; then ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` fi - echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5 +$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; } fi fi @@ -64453,12 +64865,12 @@ php_with_empress_bcs=no -# Check whether --with-empress-bcs or --without-empress-bcs was given. -if test "${with_empress_bcs+set}" = set; then - withval="$with_empress_bcs" - PHP_EMPRESS_BCS=$withval + +# Check whether --with-empress-bcs was given. +if test "${with_empress_bcs+set}" = set; then : + withval=$with_empress_bcs; PHP_EMPRESS_BCS=$withval else - + PHP_EMPRESS_BCS=no test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL @@ -64493,8 +64905,8 @@ if test "$PHP_EMPRESS_BCS" != "no"; then - echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 -echo "configure:64498: checking for Empress local access support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5 +$as_echo_n "checking for Empress local access support... " >&6; } if test "$PHP_EMPRESS_BCS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib @@ -64521,19 +64933,20 @@ done ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt" ODBC_TYPE=empress-bcs - cat >> confdefs.h <<\EOF -#define HAVE_EMPRESS 1 -EOF - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 -echo "configure:64532: checking Empress local access library file" >&5 +$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5 +$as_echo_n "checking Empress local access library file... " >&6; } ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` if test ! -f $ODBCBCS_LIBS; then ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` fi - echo "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5 +$as_echo "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; } fi fi @@ -64543,12 +64956,12 @@ php_with_birdstep=no -# Check whether --with-birdstep or --without-birdstep was given. -if test "${with_birdstep+set}" = set; then - withval="$with_birdstep" - PHP_BIRDSTEP=$withval + +# Check whether --with-birdstep was given. +if test "${with_birdstep+set}" = set; then : + withval=$with_birdstep; PHP_BIRDSTEP=$withval else - + PHP_BIRDSTEP=no test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL @@ -64581,10 +64994,10 @@ - + if test "$PHP_BIRDSTEP" != "no"; then - echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 -echo "configure:64588: checking for Birdstep support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Birdstep support" >&5 +$as_echo_n "checking for Birdstep support... " >&6; } if test "$PHP_BIRDSTEP" = "yes"; then ODBC_INCDIR=/usr/local/birdstep/include ODBC_LIBDIR=/usr/local/birdstep/lib @@ -64592,42 +65005,35 @@ ODBC_INCDIR=$PHP_BIRDSTEP/include ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR fi - + case $host_alias in *aix*) - cat >> confdefs.h <<\EOF -#define AIX 1 -EOF + +$as_echo "#define AIX 1" >>confdefs.h ;; *hpux*) - cat >> confdefs.h <<\EOF -#define HPUX 1 -EOF + +$as_echo "#define HPUX 1" >>confdefs.h ;; *linux*) - cat >> confdefs.h <<\EOF -#define LINUX 1 -EOF + +$as_echo "#define LINUX 1" >>confdefs.h ;; *qnx*) - cat >> confdefs.h <<\EOF -#define NEUTRINO 1 -EOF + +$as_echo "#define NEUTRINO 1" >>confdefs.h ;; i?86-*-solaris*) - cat >> confdefs.h <<\EOF -#define ISOLARIS 1 -EOF + +$as_echo "#define ISOLARIS 1" >>confdefs.h ;; sparc-*-solaris*) - cat >> confdefs.h <<\EOF -#define SOLARIS 1 -EOF + +$as_echo "#define SOLARIS 1" >>confdefs.h ;; *unixware*) - cat >> confdefs.h <<\EOF -#define UNIXWARE 1 -EOF + +$as_echo "#define UNIXWARE 1" >>confdefs.h ;; esac @@ -64642,11 +65048,11 @@ ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil" fi - cat >> confdefs.h <<\EOF -#define HAVE_BIRDSTEP 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_BIRDSTEP 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64655,12 +65061,12 @@ php_with_custom_odbc=no -# Check whether --with-custom-odbc or --without-custom-odbc was given. -if test "${with_custom_odbc+set}" = set; then - withval="$with_custom_odbc" - PHP_CUSTOM_ODBC=$withval + +# Check whether --with-custom-odbc was given. +if test "${with_custom_odbc+set}" = set; then : + withval=$with_custom_odbc; PHP_CUSTOM_ODBC=$withval else - + PHP_CUSTOM_ODBC=no test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL @@ -64695,8 +65101,8 @@ if test "$PHP_CUSTOM_ODBC" != "no"; then - echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 -echo "configure:64700: checking for a custom ODBC support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5 +$as_echo_n "checking for a custom ODBC support... " >&6; } if test "$PHP_CUSTOM_ODBC" = "yes"; then PHP_CUSTOM_ODBC=/usr/local fi @@ -64706,11 +65112,11 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=$CUSTOM_ODBC_LIBS ODBC_TYPE=custom-odbc - cat >> confdefs.h <<\EOF -#define HAVE_CODBC 1 -EOF - echo "$ac_t""$ext_ouput" 1>&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; } fi fi @@ -64719,12 +65125,12 @@ php_with_iodbc=no -# Check whether --with-iodbc or --without-iodbc was given. -if test "${with_iodbc+set}" = set; then - withval="$with_iodbc" - PHP_IODBC=$withval + +# Check whether --with-iodbc was given. +if test "${with_iodbc+set}" = set; then : + withval=$with_iodbc; PHP_IODBC=$withval else - + PHP_IODBC=no test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL @@ -64759,87 +65165,87 @@ if test "$PHP_IODBC" != "no"; then - echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 -echo "configure:64764: checking for iODBC support" >&5 + { $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 fi - + 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" + *) + LIBS="-liodbc $LIBS" ;; esac - + if test "$PHP_IODBC/include" != "/usr/include"; then - + if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then ai_p=$PHP_IODBC/include else - + ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`" 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 "1"; then INCLUDES="-I$ai_p $INCLUDES" else INCLUDES="$INCLUDES -I$ai_p" fi - + fi fi @@ -64848,15 +65254,14 @@ ODBC_INCLUDE=-I$PHP_IODBC/include ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR ODBC_LIBS=-liodbc - cat >> confdefs.h <<\EOF -#define HAVE_IODBC 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_ODBC2 1 -EOF +$as_echo "#define HAVE_IODBC 1" >>confdefs.h + - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_ODBC2 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64865,12 +65270,12 @@ php_with_esoob=no -# Check whether --with-esoob or --without-esoob was given. -if test "${with_esoob+set}" = set; then - withval="$with_esoob" - PHP_ESOOB=$withval + +# Check whether --with-esoob was given. +if test "${with_esoob+set}" = set; then : + withval=$with_esoob; PHP_ESOOB=$withval else - + PHP_ESOOB=no test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL @@ -64905,8 +65310,8 @@ if test "$PHP_ESOOB" != "no"; then - echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 -echo "configure:64910: checking for Easysoft ODBC-ODBC Bridge support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5 +$as_echo_n "checking for Easysoft ODBC-ODBC Bridge support... " >&6; } if test "$PHP_ESOOB" = "yes"; then PHP_ESOOB=/usr/local/easysoft/oob/client fi @@ -64916,11 +65321,11 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient ODBC_TYPE=esoob - cat >> confdefs.h <<\EOF -#define HAVE_ESOOB 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_ESOOB 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64929,12 +65334,12 @@ php_with_unixodbc=no -# Check whether --with-unixODBC or --without-unixODBC was given. -if test "${with_unixODBC+set}" = set; then - withval="$with_unixODBC" - PHP_UNIXODBC=$withval + +# Check whether --with-unixODBC was given. +if test "${with_unixODBC+set}" = set; then : + withval=$with_unixODBC; PHP_UNIXODBC=$withval else - + PHP_UNIXODBC=no test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL @@ -64969,8 +65374,8 @@ if test "$PHP_UNIXODBC" != "no"; then - echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 -echo "configure:64974: checking for unixODBC support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unixODBC support" >&5 +$as_echo_n "checking for unixODBC support... " >&6; } if test "$PHP_UNIXODBC" = "yes"; then PHP_UNIXODBC=/usr/local fi @@ -64980,16 +65385,16 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc ODBC_TYPE=unixODBC - + if ! test -f "$ODBC_INCDIR/sqlext.h"; then - { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; } + as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_UNIXODBC 1 -EOF - echo "$ac_t""$ext_output" 1>&6 +$as_echo "#define HAVE_UNIXODBC 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } fi fi @@ -64998,12 +65403,12 @@ php_with_dbmaker=no -# Check whether --with-dbmaker or --without-dbmaker was given. -if test "${with_dbmaker+set}" = set; then - withval="$with_dbmaker" - PHP_DBMAKER=$withval + +# Check whether --with-dbmaker was given. +if test "${with_dbmaker+set}" = set; then : + withval=$with_dbmaker; PHP_DBMAKER=$withval else - + PHP_DBMAKER=no test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL @@ -65038,8 +65443,8 @@ if test "$PHP_DBMAKER" != "no"; then - echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 -echo "configure:65043: checking for DBMaker support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5 +$as_echo_n "checking for DBMaker support... " >&6; } if test "$PHP_DBMAKER" = "yes"; then # find dbmaker's home directory DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` @@ -65069,93 +65474,94 @@ ODBC_LIBS="-ldmapic -lc" ODBC_TYPE=dbmaker - cat >> confdefs.h <<\EOF -#define HAVE_DBMAKER 1 -EOF + +$as_echo "#define HAVE_DBMAKER 1" >>confdefs.h if test "$ext_shared" = "yes"; then - echo "$ac_t""yes (shared)" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5 +$as_echo "yes (shared)" >&6; } ODBC_LIBS="-ldmapic -lc -lm" ODBC_SHARED="odbc.la" else - echo "$ac_t""yes (static)" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5 +$as_echo "yes (static)" >&6; } + if test -n "$ODBC_LIBDIR"; then - + if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then - + if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ODBC_LIBDIR else - + ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ODBC_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 dmapic in c|c_r|pthread*) ;; - *) - LIBS="-ldmapic $LIBS" + *) + LIBS="-ldmapic $LIBS" ;; esac - + if test "$ODBC_INCDIR" != "/usr/include"; then - + if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then ai_p=$ODBC_INCDIR else - + ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`" 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 @@ -65167,17 +65573,17 @@ if test -n "$ODBC_TYPE"; then if test "$ODBC_TYPE" != "dbmaker"; then - + for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -65188,20 +65594,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii" + ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -65214,42 +65620,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then ODBC_SHARED_LIBADD="-L$ai_p $ODBC_SHARED_LIBADD" test -n "$ld_runpath_switch" && ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $ODBC_SHARED_LIBADD" else - - - + + + 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 ;; @@ -65257,52 +65663,50 @@ done if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then - cat >> confdefs.h <<\EOF -#define HAVE_SQLDATASOURCES 1 -EOF + +$as_echo "#define HAVE_SQLDATASOURCES 1" >>confdefs.h fi fi - - cat >> confdefs.h <<\EOF -#define HAVE_UODBC 1 -EOF - + +$as_echo "#define HAVE_UODBC 1" >>confdefs.h + + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD" - + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR" - + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE" - - + + ext_builddir=ext/odbc ext_srcdir=$abs_srcdir/ext/odbc @@ -65310,15 +65714,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_ODBC_SHARED=no - - + + case ext/odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -65331,12 +65735,12 @@ old_IFS=$IFS for ac_src in php_odbc.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -65360,14 +65764,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_ODBC_SHARED=yes - + case ext/odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -65380,12 +65784,12 @@ old_IFS=$IFS for ac_src in php_odbc.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo" case $ac_src in @@ -65403,7 +65807,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -65413,7 +65817,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(ODBC_SHARED_LIBADD)' ;; *) suffix=la @@ -65426,7 +65830,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_ODBC 1 -EOF +_ACEOF fi fi @@ -65488,15 +65893,15 @@ PHP_ODBC_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -65509,12 +65914,12 @@ old_IFS=$IFS for ac_src in php_odbc.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -65534,15 +65939,15 @@ EXT_STATIC="$EXT_STATIC odbc" ;; *) - - + + case ext/odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -65555,12 +65960,12 @@ old_IFS=$IFS for ac_src in php_odbc.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -65581,15 +65986,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC odbc" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=odbc - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -65600,14 +66005,13 @@ php_enable_pcntl=no -echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 -echo "configure:65605: checking whether to enable pcntl support" >&5 -# Check whether --enable-pcntl or --disable-pcntl was given. -if test "${enable_pcntl+set}" = set; then - enableval="$enable_pcntl" - PHP_PCNTL=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5 +$as_echo_n "checking whether to enable pcntl support... " >&6; } +# Check whether --enable-pcntl was given. +if test "${enable_pcntl+set}" = set; then : + enableval=$enable_pcntl; PHP_PCNTL=$enableval else - + PHP_PCNTL=no test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL @@ -65636,245 +66040,71 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_PCNTL" != "no"; then for ac_func in fork -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65649: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +do : + ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork" +if test "x$ac_cv_func_fork" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FORK 1 +_ACEOF -; return 0; } -EOF -if { (eval echo configure:65677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +$as_echo "#define HAVE_FORK 1" >>confdefs.h -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_FORK 1 -EOF - else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; } + as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5 fi done for ac_func in waitpid -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65708: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +do : + ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid" +if test "x$ac_cv_func_waitpid" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WAITPID 1 +_ACEOF -; return 0; } -EOF -if { (eval echo configure:65736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +$as_echo "#define HAVE_WAITPID 1" >>confdefs.h -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_WAITPID 1 -EOF - else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; } + as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5 fi done for ac_func in sigaction -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65767: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +do : + ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGACTION 1 +_ACEOF -; return 0; } -EOF -if { (eval echo configure:65795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +$as_echo "#define HAVE_SIGACTION 1" >>confdefs.h -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_SIGACTION 1 -EOF - else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; } + as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5 fi done for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:65826: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:65854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + ext_builddir=ext/pcntl ext_srcdir=$abs_srcdir/ext/pcntl @@ -65882,15 +66112,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then PHP_PCNTL_SHARED=no - - + + case ext/pcntl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -65903,12 +66133,12 @@ old_IFS=$IFS for ac_src in pcntl.c php_signal.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -65932,14 +66162,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PCNTL_SHARED=yes - + case ext/pcntl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -65952,12 +66182,12 @@ old_IFS=$IFS for ac_src in pcntl.c php_signal.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pcntl="$shared_objects_pcntl $ac_bdir$ac_obj.lo" case $ac_src in @@ -65975,7 +66205,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -65985,7 +66215,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(PCNTL_SHARED_LIBADD)' ;; *) suffix=la @@ -65998,7 +66228,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PCNTL 1 -EOF +_ACEOF fi fi @@ -66060,15 +66291,15 @@ PHP_PCNTL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pcntl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66081,12 +66312,12 @@ old_IFS=$IFS for ac_src in pcntl.c php_signal.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66106,15 +66337,15 @@ EXT_STATIC="$EXT_STATIC pcntl" ;; *) - - + + case ext/pcntl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66127,12 +66358,12 @@ old_IFS=$IFS for ac_src in pcntl.c php_signal.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66153,15 +66384,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pcntl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -66174,14 +66405,13 @@ php_enable_pdo=yes -echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 -echo "configure:66179: checking whether to enable PDO support" >&5 -# Check whether --enable-pdo or --disable-pdo was given. -if test "${enable_pdo+set}" = set; then - enableval="$enable_pdo" - PHP_PDO=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5 +$as_echo_n "checking whether to enable PDO support... " >&6; } +# Check whether --enable-pdo was given. +if test "${enable_pdo+set}" = set; then : + enableval=$enable_pdo; PHP_PDO=$enableval else - + PHP_PDO=yes test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL @@ -66210,7 +66440,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -66219,7 +66450,7 @@ PHP_PDO=yes - + pdo_running_under_pear=0 case `pwd` in /var/tmp/pear-build-*) @@ -66231,7 +66462,7 @@ # 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 - { echo "configure: error: + as_fn_error $? " PDO requires that you upgrade your PEAR installer tools. Please do so now by running: @@ -66240,25 +66471,25 @@ or by manually downloading and installing PEAR version 1.3.5 or higher. Once you've upgraded, please re-try your PDO install. - " 1>&2; exit 1; } + " "$LINENO" 5 fi if test "$ext_shared" = "yes" ; then case $host_alias in *darwin*) - { echo "configure: 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. Please follow the instructions at: http://netevil.org/node.php?nid=202 for more detail on this issue. - " 1>&2; exit 1; } + " "$LINENO" 5 ext_shared=no ;; esac fi - + ext_builddir=ext/pdo ext_srcdir=$abs_srcdir/ext/pdo @@ -66266,15 +66497,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_SHARED=no - - + + case ext/pdo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66287,12 +66518,12 @@ old_IFS=$IFS for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66316,14 +66547,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_SHARED=yes - + case ext/pdo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -66336,12 +66567,12 @@ old_IFS=$IFS for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo" case $ac_src in @@ -66359,7 +66590,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -66369,7 +66600,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(PDO_SHARED_LIBADD)' ;; *) suffix=la @@ -66382,7 +66613,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO 1 -EOF +_ACEOF fi fi @@ -66444,15 +66676,15 @@ PHP_PDO_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66465,12 +66697,12 @@ old_IFS=$IFS for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66490,15 +66722,15 @@ EXT_STATIC="$EXT_STATIC pdo" ;; *) - - + + case ext/pdo in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66511,12 +66743,12 @@ old_IFS=$IFS for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66537,65 +66769,65 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + am_i_shared=$PHP_PDO_SHARED is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - - - - - + + + + + + header_path=ext/pdo for header_file in php_pdo.h php_pdo_driver.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + + + - - src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -66608,14 +66840,14 @@ php_with_pdo_dblib=no -echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 -echo "configure:66613: checking for PDO_DBLIB support via FreeTDS" >&5 -# Check whether --with-pdo-dblib or --without-pdo-dblib was given. -if test "${with_pdo_dblib+set}" = set; then - withval="$with_pdo_dblib" - PHP_PDO_DBLIB=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5 +$as_echo_n "checking for PDO_DBLIB support via FreeTDS... " >&6; } + +# Check whether --with-pdo-dblib was given. +if test "${with_pdo_dblib+set}" = set; then : + withval=$with_pdo_dblib; PHP_PDO_DBLIB=$withval else - + PHP_PDO_DBLIB=no test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL @@ -66644,7 +66876,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -66652,7 +66885,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi if test "$PHP_PDO_DBLIB" = "yes"; then @@ -66670,7 +66903,7 @@ done if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then - { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; } + as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5 fi elif test "$PHP_PDO_DBLIB" != "no"; then @@ -66682,137 +66915,137 @@ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds else - { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; } + as_fn_error $? "Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" "$LINENO" 5 fi - fi + fi if test "x$PHP_LIBDIR" = "x" ; then PHP_LIBDIR=lib fi if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then - { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; } + as_fn_error $? "Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5 fi - + if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then - + if test -z "$PDO_FREETDS_INCLUDE_DIR" || echo "$PDO_FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then ai_p=$PDO_FREETDS_INCLUDE_DIR else - + ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`" 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 - + if test "$ext_shared" = "yes"; then PDO_DBLIB_SHARED_LIBADD="-lsybdb $PDO_DBLIB_SHARED_LIBADD" if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then - + if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then - + if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$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 sybdb in c|c_r|pthread*) ;; - *) - LIBS="-lsybdb $LIBS" + *) + LIBS="-lsybdb $LIBS" ;; esac @@ -66823,16 +67056,16 @@ - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:66830: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:66836: checking for PDO includes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -66840,20 +67073,20 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - + PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\"" - + ext_builddir=ext/pdo_dblib ext_srcdir=$abs_srcdir/ext/pdo_dblib @@ -66861,15 +67094,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_DBLIB_SHARED=no - - + + case ext/pdo_dblib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -66882,12 +67115,12 @@ old_IFS=$IFS for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -66911,14 +67144,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_DBLIB_SHARED=yes - + case ext/pdo_dblib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -66931,12 +67164,12 @@ old_IFS=$IFS for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_dblib="$shared_objects_pdo_dblib $ac_bdir$ac_obj.lo" case $ac_src in @@ -66954,7 +67187,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -66964,7 +67197,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(PDO_DBLIB_SHARED_LIBADD)' ;; *) suffix=la @@ -66977,7 +67210,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_DBLIB 1 -EOF +_ACEOF fi fi @@ -67039,15 +67273,15 @@ PHP_PDO_DBLIB_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_dblib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -67060,12 +67294,12 @@ old_IFS=$IFS for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -67085,15 +67319,15 @@ EXT_STATIC="$EXT_STATIC pdo_dblib" ;; *) - - + + case ext/pdo_dblib in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -67106,12 +67340,12 @@ old_IFS=$IFS for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -67132,142 +67366,144 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_dblib - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:67150: checking for dnet_addr in -ldnet_stub" >&5 -ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -dnet_addr() -; return 0; } -EOF -if { (eval echo configure:67169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_addr (); +int +main () +{ +return dnet_addr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_addr=yes +else + ac_cv_lib_dnet_stub_dnet_addr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - if test "$ext_shared" = "yes"; then PDO_DBLIB_SHARED_LIBADD="-ldnet_stub $PDO_DBLIB_SHARED_LIBADD" if test -n ""; then - + if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then - + if test -z "" || echo "" | grep '^/' >/dev/null ; then ai_p= else - + ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"\"`" fi - + if test "$ext_shared" = "yes"; then PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n ""; then - + if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then - + if test -z "" || echo "" | grep '^/' >/dev/null ; then ai_p= else - + ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"\"`" 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 dnet_stub in c|c_r|pthread*) ;; - *) - LIBS="-ldnet_stub $LIBS" + *) + LIBS="-ldnet_stub $LIBS" ;; esac @@ -67277,62 +67513,57 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBDNET_STUB 1 -EOF - -else - echo "$ac_t""no" 1>&6 +$as_echo "#define HAVE_LIBDNET_STUB 1" >>confdefs.h + + fi - cat >> confdefs.h <<\EOF -#define HAVE_PDO_DBLIB 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_FREETDS 1 -EOF +$as_echo "#define HAVE_PDO_DBLIB 1" >>confdefs.h + + +$as_echo "#define HAVE_FREETDS 1" >>confdefs.h + - PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD" - - + + am_i_shared=$PHP_PDO_DBLIB_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + fi php_with_pdo_firebird=no -echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 -echo "configure:67330: checking for Firebird support for PDO" >&5 -# Check whether --with-pdo-firebird or --without-pdo-firebird was given. -if test "${with_pdo_firebird+set}" = set; then - withval="$with_pdo_firebird" - PHP_PDO_FIREBIRD=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5 +$as_echo_n "checking for Firebird support for PDO... " >&6; } + +# Check whether --with-pdo-firebird was given. +if test "${with_pdo_firebird+set}" = set; then : + withval=$with_pdo_firebird; PHP_PDO_FIREBIRD=$withval else - + PHP_PDO_FIREBIRD=no test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL @@ -67361,7 +67592,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -67369,7 +67601,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi if test "$PHP_PDO_FIREBIRD" = "yes"; then @@ -67382,25 +67614,25 @@ FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $FIREBIRD_LIBDIR_FLAG " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -67411,20 +67643,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -67437,116 +67669,117 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:67484: checking for isc_detach_database in -lfbclient" >&5 -ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_fbclient_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lfbclient $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:67503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fbclient_isc_detach_database=yes +else + ac_cv_lib_fbclient_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + FIREBIRD_LIBNAME=fbclient - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_fbclient_isc_detach_database - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $FIREBIRD_LIBDIR_FLAG " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -67557,20 +67790,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -67583,116 +67816,117 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:67630: checking for isc_detach_database in -lgds" >&5 -ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_gds_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgds $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:67649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gds_isc_detach_database=yes +else + ac_cv_lib_gds_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + FIREBIRD_LIBNAME=gds - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gds_isc_detach_database - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $FIREBIRD_LIBDIR_FLAG " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -67703,20 +67937,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -67729,120 +67963,121 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:67776: checking for isc_detach_database in -lib_util" >&5 -ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ib_util_isc_detach_database+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lib_util $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -isc_detach_database() -; return 0; } -EOF -if { (eval echo configure:67795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char isc_detach_database (); +int +main () +{ +return isc_detach_database (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ib_util_isc_detach_database=yes +else + ac_cv_lib_ib_util_isc_detach_database=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + FIREBIRD_LIBNAME=ib_util - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ib_util_isc_detach_database - - { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5 + + fi - - + + fi - - + + fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:67840: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:67846: checking for PDO includes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -67850,105 +68085,105 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - + if test "$ext_shared" = "yes"; then PDO_FIREBIRD_SHARED_LIBADD="-l$FIREBIRD_LIBNAME $PDO_FIREBIRD_SHARED_LIBADD" if test -n "$FIREBIRD_LIBDIR"; then - + if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then - + if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FIREBIRD_LIBDIR else - + ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_FIREBIRD_SHARED_LIBADD="-L$ai_p $PDO_FIREBIRD_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_FIREBIRD_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_FIREBIRD_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$FIREBIRD_LIBDIR"; then - + if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then - + if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$FIREBIRD_LIBDIR else - + ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FIREBIRD_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 $FIREBIRD_LIBNAME in c|c_r|pthread*) ;; - *) - LIBS="-l$FIREBIRD_LIBNAME $LIBS" + *) + LIBS="-l$FIREBIRD_LIBNAME $LIBS" ;; esac @@ -67958,42 +68193,41 @@ fi - + if test "$FIREBIRD_INCDIR" != "/usr/include"; then - + if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then ai_p=$FIREBIRD_INCDIR else - + ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`" 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 - cat >> confdefs.h <<\EOF -#define HAVE_PDO_FIREBIRD 1 -EOF - +$as_echo "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h + + ext_builddir=ext/pdo_firebird ext_srcdir=$abs_srcdir/ext/pdo_firebird @@ -68001,15 +68235,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_FIREBIRD_SHARED=no - - + + case ext/pdo_firebird in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -68022,12 +68256,12 @@ old_IFS=$IFS for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -68051,14 +68285,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_FIREBIRD_SHARED=yes - + case ext/pdo_firebird in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -68071,12 +68305,12 @@ old_IFS=$IFS for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_firebird="$shared_objects_pdo_firebird $ac_bdir$ac_obj.lo" case $ac_src in @@ -68094,7 +68328,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -68104,7 +68338,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(PDO_FIREBIRD_SHARED_LIBADD)' ;; *) suffix=la @@ -68117,7 +68351,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_FIREBIRD 1 -EOF +_ACEOF fi fi @@ -68179,15 +68414,15 @@ PHP_PDO_FIREBIRD_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_firebird in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -68200,12 +68435,12 @@ old_IFS=$IFS for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -68225,15 +68460,15 @@ EXT_STATIC="$EXT_STATIC pdo_firebird" ;; *) - - + + case ext/pdo_firebird in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -68246,12 +68481,12 @@ old_IFS=$IFS for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -68272,55 +68507,55 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_firebird - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD" - + am_i_shared=$PHP_PDO_FIREBIRD_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + fi php_with_pdo_mysql=no -echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 -echo "configure:68318: checking for MySQL support for PDO" >&5 -# Check whether --with-pdo-mysql or --without-pdo-mysql was given. -if test "${with_pdo_mysql+set}" = set; then - withval="$with_pdo_mysql" - PHP_PDO_MYSQL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5 +$as_echo_n "checking for MySQL support for PDO... " >&6; } + +# Check whether --with-pdo-mysql was given. +if test "${with_pdo_mysql+set}" = set; then : + withval=$with_pdo_mysql; PHP_PDO_MYSQL=$withval else - + PHP_PDO_MYSQL=no test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL @@ -68349,31 +68584,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_ZLIB_DIR"; then - + php_with_zlib_dir=no -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:68363: checking for the location of libz" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5 +$as_echo_n "checking for the location of libz... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -68382,10 +68619,10 @@ if test "$PHP_PDO_MYSQL" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi - + if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL @@ -68412,58 +68649,62 @@ if test "$PHP_PDO_MYSQL" = "mysqlnd"; then PHP_MYSQLND_ENABLED=yes - cat >> confdefs.h <<\EOF -#define PDO_USE_MYSQLND 1 -EOF + +$as_echo "#define PDO_USE_MYSQLND 1" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define HAVE_MYSQL 1 -EOF +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h - echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 -echo "configure:68427: checking for mysql_config" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5 +$as_echo_n "checking for mysql_config... " >&6; } if test -n "$PDO_MYSQL_CONFIG"; then - echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5 +$as_echo "$PDO_MYSQL_CONFIG" >&6; } if test "x$SED" = "x"; then # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:68434: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$SED" in - /*) + case $SED in + [\\/]* | ?:[\\/]*) ac_cv_path_SED="$SED" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_SED="$SED" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SED="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + ;; esac fi -SED="$ac_cv_path_SED" +SED=$ac_cv_path_SED if test -n "$SED"; then - echo "$ac_t""$SED" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi - if test "$enable_maintainer_zts" = "yes"; then + if true || test "$enable_maintainer_zts" = "yes"; then PDO_MYSQL_LIBNAME=mysqlclient_r PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` else @@ -68472,9 +68713,10 @@ fi PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` elif test -n "$PDO_MYSQL_DIR"; then - echo "$ac_t""not found" 1>&6 - echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 -echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5 +$as_echo_n "checking for mysql install under $PDO_MYSQL_DIR... " >&6; } if test -r $PDO_MYSQL_DIR/include/mysql; then PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql else @@ -68487,68 +68729,71 @@ fi if test -r "$PDO_MYSQL_LIB_DIR"; then - echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5 +$as_echo "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; } else - echo "$ac_t""can not find it" 1>&6 - { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; } + { $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 fi - + if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then - + if test -z "$PDO_MYSQL_INC_DIR" || echo "$PDO_MYSQL_INC_DIR" | grep '^/' >/dev/null ; then ai_p=$PDO_MYSQL_INC_DIR else - + ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`" 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 PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR else - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; } + { $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 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $PDO_MYSQL_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -68559,20 +68804,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -68585,119 +68830,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:68632: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_query() -; return 0; } -EOF -if { (eval echo configure:68651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (); +int +main () +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + for ac_i in $PDO_MYSQL_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 @@ -68706,17 +68955,17 @@ esac done - + for ac_i in $PDO_MYSQL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -68727,20 +68976,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" + PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -68753,146 +69002,145 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query - + if test "$PHP_ZLIB_DIR" != "no"; then - + if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - + + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -68902,25 +69150,25 @@ fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -68931,20 +69179,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -68957,116 +69205,119 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:69004: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_query() -; return 0; } -EOF -if { (eval echo configure:69023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (); +int +main () +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query - - { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "PDO_MYSQL configure failed. Please check config.log for more information." "$LINENO" 5 + + fi - + PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else - - + + case z in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" + PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" else - - + + case z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -69076,25 +69327,25 @@ esac - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_MYSQL_LIB_DIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -69105,20 +69356,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -69131,135 +69382,138 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:69178: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -mysql_query() -; return 0; } -EOF -if { (eval echo configure:69197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (); +int +main () +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query - - { echo "configure: error: Try adding --with-zlib-dir=. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "Try adding --with-zlib-dir=. Please check config.log for more information." "$LINENO" 5 + + fi - + PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" fi - + for ac_i in $PDO_MYSQL_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 @@ -69268,17 +69522,17 @@ esac done - + for ac_i in $PDO_MYSQL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -69289,20 +69543,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" + PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -69315,123 +69569,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - - + + fi _SAVE_LIBS=$LIBS LIBS="$LIBS $PDO_MYSQL_LIBS" for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:69371: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:69399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + LIBS=$_SAVE_LIBS fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69429: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69435: checking for PDO includes" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -69439,27 +69650,28 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - + if test -n "$PDO_MYSQL_CONFIG"; then PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET" -EOF +_ACEOF fi - + ext_builddir=ext/pdo_mysql ext_srcdir=$abs_srcdir/ext/pdo_mysql @@ -69467,15 +69679,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_MYSQL_SHARED=no - - + + case ext/pdo_mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -69488,12 +69700,12 @@ old_IFS=$IFS for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -69517,14 +69729,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_MYSQL_SHARED=yes - + case ext/pdo_mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -69537,12 +69749,12 @@ old_IFS=$IFS for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo" case $ac_src in @@ -69560,7 +69772,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -69570,7 +69782,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(PDO_MYSQL_SHARED_LIBADD)' ;; *) suffix=la @@ -69583,7 +69795,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_MYSQL 1 -EOF +_ACEOF fi fi @@ -69645,15 +69858,15 @@ PHP_PDO_MYSQL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -69666,12 +69879,12 @@ old_IFS=$IFS for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -69691,15 +69904,15 @@ EXT_STATIC="$EXT_STATIC pdo_mysql" ;; *) - - + + case ext/pdo_mysql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -69712,12 +69925,12 @@ old_IFS=$IFS for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -69738,91 +69951,91 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_mysql - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + am_i_shared=$PHP_PDO_MYSQL_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + if test "$PHP_MYSQL" = "mysqlnd"; then - + am_i_shared=$PHP_PDO_MYSQL_SHARED is_it_shared=$PHP_MYSQLND_SHARED is_it_enabled=$PHP_MYSQLND if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + fi - + PDO_MYSQL_MODULE_TYPE=external - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE" - + fi SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 11.1 installs - + php_with_pdo_oci=no -echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 -echo "configure:69820: checking Oracle OCI support for PDO" >&5 -# Check whether --with-pdo-oci or --without-pdo-oci was given. -if test "${with_pdo_oci+set}" = set; then - withval="$with_pdo_oci" - PHP_PDO_OCI=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5 +$as_echo_n "checking Oracle OCI support for PDO... " >&6; } + +# Check whether --with-pdo-oci was given. +if test "${with_pdo_oci+set}" = set; then : + withval=$with_pdo_oci; PHP_PDO_OCI=$withval else - + PHP_PDO_OCI=no test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL @@ -69851,7 +70064,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -69859,167 +70073,173 @@ if test "$PHP_PDO_OCI" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi - echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 -echo "configure:69867: checking Oracle Install-Dir" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5 +$as_echo_n "checking Oracle Install-Dir... " >&6; } if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then PDO_OCI_DIR=$ORACLE_HOME else PDO_OCI_DIR=$PHP_PDO_OCI fi - echo "$ac_t""$PHP_PDO_OCI" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5 +$as_echo "$PHP_PDO_OCI" >&6; } - echo $ac_n "checking if that is sane""... $ac_c" 1>&6 -echo "configure:69876: checking if that is sane" >&5 + { $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 - { echo "configure: error: + as_fn_error $? " You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. -" 1>&2; exit 1; } +" "$LINENO" 5 else - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`" PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`" - echo $ac_n "checking for oci.h""... $ac_c" 1>&6 -echo "configure:69889: checking for oci.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5 +$as_echo_n "checking for oci.h... " >&6; } if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then - + if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then - + if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client else - + ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client\"`" 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 - echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" >&5 +$as_echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" >&6; } elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then - + if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" != "/usr/include"; then - + if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include else - + ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include\"`" 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 - echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" >&5 +$as_echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include" >&6; } elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then - + if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then - + if test -z "$PDO_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_IC_PREFIX/sdk/include else - + ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`" 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 - echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/sdk/include" >&5 +$as_echo "$PDO_OCI_IC_PREFIX/sdk/include" >&6; } elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then - + if test "$PDO_OCI_IC_PREFIX/client/include" != "/usr/include"; then - + if test -z "$PDO_OCI_IC_PREFIX/client/include" || echo "$PDO_OCI_IC_PREFIX/client/include" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_IC_PREFIX/client/include else - + ep_dir="`echo $PDO_OCI_IC_PREFIX/client/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/client/include\"`" 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 - echo "$ac_t""$PDO_OCI_IC_PREFIX/client/include" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/client/include" >&5 +$as_echo "$PDO_OCI_IC_PREFIX/client/include" >&6; } else - { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; } + 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/client/lib/libclntsh.so" ; then PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib" @@ -70028,62 +70248,58 @@ elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX" else - { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; } + 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 - - echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:70038: checking size of long int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_int=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long int)); - return(0); -} -EOF -if { (eval echo configure:70057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_int=0 -fi -rm -fr conftest* + + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${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 : + +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_error 77 "cannot compute sizeof (long int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int -EOF +_ACEOF - echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 -echo "configure:70077: checking if we're on a 64-bit platform" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're on a 64-bit platform" >&5 +$as_echo_n "checking if we're on a 64-bit platform... " >&6; } if test "$ac_cv_sizeof_long_int" = "4" ; then - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" else - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" fi - echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 -echo "configure:70087: checking OCI8 libraries dir" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5 +$as_echo_n "checking OCI8 libraries dir... " >&6; } if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then @@ -70091,39 +70307,40 @@ elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR else - { echo "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; } + as_fn_error $? "Oracle required OCI8 libraries not found" "$LINENO" 5 fi - echo "$ac_t""$PDO_OCI_LIB_DIR" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5 +$as_echo "$PDO_OCI_LIB_DIR" >&6; } if test -d "$PDO_OCI_DIR/rdbms/public"; then - + if test "$PDO_OCI_DIR/rdbms/public" != "/usr/include"; then - + if test -z "$PDO_OCI_DIR/rdbms/public" || echo "$PDO_OCI_DIR/rdbms/public" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_DIR/rdbms/public else - + ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`" 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 @@ -70131,33 +70348,33 @@ PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public" fi if test -d "$PDO_OCI_DIR/rdbms/demo"; then - + if test "$PDO_OCI_DIR/rdbms/demo" != "/usr/include"; then - + if test -z "$PDO_OCI_DIR/rdbms/demo" || echo "$PDO_OCI_DIR/rdbms/demo" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_DIR/rdbms/demo else - + ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`" 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 @@ -70165,33 +70382,33 @@ PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/demo" fi if test -d "$PDO_OCI_DIR/network/public"; then - + if test "$PDO_OCI_DIR/network/public" != "/usr/include"; then - + if test -z "$PDO_OCI_DIR/network/public" || echo "$PDO_OCI_DIR/network/public" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_DIR/network/public else - + ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`" 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 @@ -70199,33 +70416,33 @@ PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public" fi if test -d "$PDO_OCI_DIR/plsql/public"; then - + if test "$PDO_OCI_DIR/plsql/public" != "/usr/include"; then - + if test -z "$PDO_OCI_DIR/plsql/public" || echo "$PDO_OCI_DIR/plsql/public" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_DIR/plsql/public else - + ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`" 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 @@ -70233,33 +70450,33 @@ PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public" fi if test -d "$PDO_OCI_DIR/include"; then - + if test "$PDO_OCI_DIR/include" != "/usr/include"; then - + if test -z "$PDO_OCI_DIR/include" || echo "$PDO_OCI_DIR/include" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_DIR/include else - + ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`" 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 @@ -70268,17 +70485,17 @@ fi if test -f "$PDO_OCI_LIB_DIR/sysliblist"; then - + for ac_i in `cat $PDO_OCI_LIB_DIR/sysliblist`; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -70289,20 +70506,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" + PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -70315,42 +70532,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB" test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB" else - - - + + + 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 ;; @@ -70358,17 +70575,17 @@ done elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then - + for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -70379,20 +70596,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" + PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -70405,42 +70622,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB" test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB" else - - - + + + 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 ;; @@ -70448,37 +70665,38 @@ done fi - - echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:70454: checking Oracle version" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5 +$as_echo_n "checking Oracle version... " >&6; } for OCI_VER in $SUPPORTED_LIB_VERS; do if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then PDO_OCI_VERSION="$OCI_VER" fi done if test -z "$PDO_OCI_VERSION"; then - { echo "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; } + as_fn_error $? "Oracle required OCI8 libraries not found under $PDO_OCI_DIR" "$LINENO" 5 fi - echo "$ac_t""$PDO_OCI_VERSION" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5 +$as_echo "$PDO_OCI_VERSION" >&6; } fi case $PDO_OCI_VERSION in 9.0|10.1|10.2|11.1|11.2) - - + + case clntsh in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh" + PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh" else - - + + case clntsh in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -lclntsh" + *) + LIBS="$LIBS -lclntsh" ;; esac @@ -70491,68 +70709,68 @@ ;; *) - { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; } + as_fn_error $? "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5 ;; esac - + if test "$PDO_OCI_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PDO_OCI_LIB_DIR" != "/usr/lib"; then - + if test -z "$PDO_OCI_LIB_DIR" || echo "$PDO_OCI_LIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PDO_OCI_LIB_DIR else - + ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_OCI_SHARED_LIBADD="-L$ai_p $PDO_OCI_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_OCI_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_OCI_SHARED_LIBADD" else - - - + + + 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 - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -70563,20 +70781,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -70589,123 +70807,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5 +$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCIEnvCreate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCIEnvCreate() -; return 0; } -EOF -if { (eval echo configure:70655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCIEnvCreate (); +int +main () +{ +return OCIEnvCreate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCIEnvCreate=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_clntsh_OCIEnvCreate=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_OCIENVCREATE 1 -EOF - - + +$as_echo "#define HAVE_OCIENVCREATE 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCIEnvCreate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -70716,20 +70934,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -70742,123 +70960,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:70789: checking for OCIEnvNlsCreate in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5 +$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCIEnvNlsCreate() -; return 0; } -EOF -if { (eval echo configure:70808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCIEnvNlsCreate (); +int +main () +{ +return OCIEnvNlsCreate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCIEnvNlsCreate=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_clntsh_OCIEnvNlsCreate=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_OCIENVNLSCREATE 1 -EOF - - + +$as_echo "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCIEnvNlsCreate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -70869,20 +71087,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -70895,119 +71113,119 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 -echo "configure:70942: checking for OCILobIsTemporary in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -lclntsh" >&5 +$as_echo_n "checking for OCILobIsTemporary in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCILobIsTemporary+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCILobIsTemporary() -; return 0; } -EOF -if { (eval echo configure:70961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCILobIsTemporary (); +int +main () +{ +return OCILobIsTemporary (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCILobIsTemporary=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_clntsh_OCILobIsTemporary=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_OCILOBISTEMPORARY 1 -EOF - - + +$as_echo "#define HAVE_OCILOBISTEMPORARY 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCILobIsTemporary - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -71018,20 +71236,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -71044,101 +71262,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 -echo "configure:71091: checking for OCILobIsTemporary in -locijdbc8" >&5 -ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -locijdbc8" >&5 +$as_echo_n "checking for OCILobIsTemporary in -locijdbc8... " >&6; } +if ${ac_cv_lib_ocijdbc8_OCILobIsTemporary+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-locijdbc8 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCILobIsTemporary() -; return 0; } -EOF -if { (eval echo configure:71110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCILobIsTemporary (); +int +main () +{ +return OCILobIsTemporary (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ocijdbc8_OCILobIsTemporary=yes +else + ac_cv_lib_ocijdbc8_OCILobIsTemporary=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5 +$as_echo "$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6; } +if test "x$ac_cv_lib_ocijdbc8_OCILobIsTemporary" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case ocijdbc8 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8" + PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8" else - - + + case ocijdbc8 in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -locijdbc8" + *) + LIBS="$LIBS -locijdbc8" ;; esac @@ -71148,46 +71368,44 @@ esac - cat >> confdefs.h <<\EOF -#define HAVE_OCILOBISTEMPORARY 1 -EOF - - +$as_echo "#define HAVE_OCILOBISTEMPORARY 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ocijdbc8_OCILobIsTemporary - - + + fi - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -71198,20 +71416,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -71224,123 +71442,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 -echo "configure:71271: checking for OCICollAssign in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCICollAssign in -lclntsh" >&5 +$as_echo_n "checking for OCICollAssign in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCICollAssign+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCICollAssign() -; return 0; } -EOF -if { (eval echo configure:71290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCICollAssign (); +int +main () +{ +return OCICollAssign (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCICollAssign=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_clntsh_OCICollAssign=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_OCICOLLASSIGN 1 -EOF - - + +$as_echo "#define HAVE_OCICOLLASSIGN 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCICollAssign - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -71351,20 +71569,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -71377,114 +71595,114 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:71424: checking for OCIStmtFetch2 in -lclntsh" >&5 -ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5 +$as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; } +if ${ac_cv_lib_clntsh_OCIStmtFetch2+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lclntsh $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -OCIStmtFetch2() -; return 0; } -EOF -if { (eval echo configure:71443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OCIStmtFetch2 (); +int +main () +{ +return OCIStmtFetch2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_clntsh_OCIStmtFetch2=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_clntsh_OCIStmtFetch2=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_OCISTMTFETCH2 1 -EOF - - + +$as_echo "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_clntsh_OCIStmtFetch2 - - + + fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71482: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71488: checking for PDO includes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -71492,19 +71710,19 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - - + + ext_builddir=ext/pdo_oci ext_srcdir=$abs_srcdir/ext/pdo_oci @@ -71512,15 +71730,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_OCI_SHARED=no - - + + case ext/pdo_oci in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -71533,12 +71751,12 @@ old_IFS=$IFS for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -71562,14 +71780,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_OCI_SHARED=yes - + case ext/pdo_oci in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -71582,12 +71800,12 @@ old_IFS=$IFS for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo" case $ac_src in @@ -71605,7 +71823,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -71615,7 +71833,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(PDO_OCI_SHARED_LIBADD)' ;; *) suffix=la @@ -71628,7 +71846,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_OCI 1 -EOF +_ACEOF fi fi @@ -71690,15 +71909,15 @@ PHP_PDO_OCI_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_oci in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -71711,12 +71930,12 @@ old_IFS=$IFS for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -71736,15 +71955,15 @@ EXT_STATIC="$EXT_STATIC pdo_oci" ;; *) - - + + case ext/pdo_oci in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -71757,12 +71976,12 @@ old_IFS=$IFS for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -71783,64 +72002,65 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_oci - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_SHARED_LIBADD" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_DIR" - - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_VERSION" - - - + + + am_i_shared=$PHP_PDO_OCI_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION" -EOF +_ACEOF fi @@ -71851,14 +72071,14 @@ php_with_pdo_odbc=no -echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 -echo "configure:71856: checking for ODBC v3 support for PDO" >&5 -# Check whether --with-pdo-odbc or --without-pdo-odbc was given. -if test "${with_pdo_odbc+set}" = set; then - withval="$with_pdo_odbc" - PHP_PDO_ODBC=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5 +$as_echo_n "checking for ODBC v3 support for PDO... " >&6; } + +# Check whether --with-pdo-odbc was given. +if test "${with_pdo_odbc+set}" = set; then : + withval=$with_pdo_odbc; PHP_PDO_ODBC=$withval else - + PHP_PDO_ODBC=no test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL @@ -71887,30 +72107,31 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } + - if test "$PHP_PDO_ODBC" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71908: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:71914: checking for PDO includes" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -71918,20 +72139,20 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - - echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 -echo "configure:71935: checking for selected PDO ODBC flavour" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5 +$as_echo_n "checking for selected PDO ODBC flavour... " >&6; } pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" @@ -71973,22 +72194,22 @@ ;; *) - { echo "configure: 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 - If ',dir' part is omitted, default for the flavour + If ',dir' part is omitted, default for the flavour you have selected will used. e.g.: - + --with-pdo-odbc=unixODBC - - will check for unixODBC under /usr/local. You may attempt - to use an otherwise unsupported driver using the \"generic\" + + will check for unixODBC under /usr/local. You may attempt + to use an otherwise unsupported driver using the \"generic\" flavour. The syntax for generic ODBC support is: - + --with-pdo-odbc=generic,dir,libname,ldflags,cflags - When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; } + When build as shared the extension filename is always pdo_odbc.so" "$LINENO" 5 ;; esac @@ -71999,286 +72220,308 @@ PDO_ODBC_INCDIR="$pdo_odbc_def_incdir" PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" fi - - echo "$ac_t""$pdo_odbc_flavour + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour libs $PDO_ODBC_LIBDIR, - headers $PDO_ODBC_INCDIR" 1>&6 + headers $PDO_ODBC_INCDIR" >&5 +$as_echo "$pdo_odbc_flavour + libs $PDO_ODBC_LIBDIR, + headers $PDO_ODBC_INCDIR" >&6; } if test ! -d "$PDO_ODBC_LIBDIR" ; then - echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5 +$as_echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;} fi - - echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72014: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/odbc.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_ODBC_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_ODBC_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72028: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_ODBCSDK_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_ODBCSDK_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72042: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_IODBC_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_IODBC_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72056: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQLUNIX_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQLUNIX_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72070: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQLTYPES_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQLTYPES_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72084: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQLUCODE_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72098: checking for sql.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sql.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQL_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQL_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72112: checking for isql.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/isql.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_ISQL_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_ISQL_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72126: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQLEXT_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72140: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_ISQLEXT_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_ISQLEXT_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72154: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_UDBCEXT_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_UDBCEXT_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72168: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_SQLCLI1_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_SQLCLI1_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72182: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_LIBRARYMANAGER_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72196: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_CLI0CORE_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_CLI0CORE_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72210: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_CLI0EXT_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_CLI0EXT_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72224: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_CLI0CLI_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_CLI0CLI_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72238: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_CLI0DEFS_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_CLI0DEFS_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:72252: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 +$as_echo_n "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; } if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -#define HAVE_CLI0ENV_H 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_CLI0ENV_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$php_pdo_have_header" != "yes"; then - { echo "configure: error: Cannot find header file(s) for pdo_odbc" 1>&2; exit 1; } + 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\\\"" PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib" - + for ac_i in $PDO_ODBC_LDFLAGS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -72289,20 +72532,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii" + PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -72315,42 +72558,42 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then PDO_ODBC_SHARED_LIBADD="-L$ai_p $PDO_ODBC_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_ODBC_SHARED_LIBADD" else - - - + + + 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 ;; @@ -72358,23 +72601,23 @@ done - + save_old_LDFLAGS=$LDFLAGS ac_stuff="$PDO_ODBC_LDFLAGS" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -72385,20 +72628,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -72411,104 +72654,108 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:72458: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 -ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$pdo_odbc_def_lib $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SQLBindCol() -; return 0; } -EOF -if { (eval echo configure:72477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SQLBindCol (); +int +main () +{ +return SQLBindCol (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff="$PDO_ODBC_LDFLAGS" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -72519,20 +72766,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -72545,120 +72792,122 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:72592: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 -ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$pdo_odbc_def_lib $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SQLAllocHandle() -; return 0; } -EOF -if { (eval echo configure:72611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SQLAllocHandle (); +int +main () +{ +return SQLAllocHandle (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle - - { echo "configure: 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 functions required for PDO support. -" 1>&2; exit 1; } - +" "$LINENO" 5 + fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol - - { echo "configure: error: Your ODBC library does not exist or there was an error. Check config.log for more information" 1>&2; exit 1; } - - + + as_fn_error $? "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5 + + fi - + ext_builddir=ext/pdo_odbc ext_srcdir=$abs_srcdir/ext/pdo_odbc @@ -72666,15 +72915,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_ODBC_SHARED=no - - + + case ext/pdo_odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -72687,12 +72936,12 @@ old_IFS=$IFS for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -72716,14 +72965,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_ODBC_SHARED=yes - + case ext/pdo_odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -72736,12 +72985,12 @@ old_IFS=$IFS for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_odbc="$shared_objects_pdo_odbc $ac_bdir$ac_obj.lo" case $ac_src in @@ -72759,7 +73008,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -72769,7 +73018,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(PDO_ODBC_SHARED_LIBADD)' ;; *) suffix=la @@ -72782,7 +73031,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_ODBC 1 -EOF +_ACEOF fi fi @@ -72844,15 +73094,15 @@ PHP_PDO_ODBC_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -72865,12 +73115,12 @@ old_IFS=$IFS for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -72890,15 +73140,15 @@ EXT_STATIC="$EXT_STATIC pdo_odbc" ;; *) - - + + case ext/pdo_odbc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -72911,12 +73161,12 @@ old_IFS=$IFS for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -72937,57 +73187,57 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_odbc - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD" - - + + am_i_shared=$PHP_PDO_ODBC_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + fi php_with_pdo_pgsql=no -echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 -echo "configure:72985: checking for PostgreSQL support for PDO" >&5 -# Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. -if test "${with_pdo_pgsql+set}" = set; then - withval="$with_pdo_pgsql" - PHP_PDO_PGSQL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5 +$as_echo_n "checking for PostgreSQL support for PDO... " >&6; } + +# Check whether --with-pdo-pgsql was given. +if test "${with_pdo_pgsql+set}" = set; then : + withval=$with_pdo_pgsql; PHP_PDO_PGSQL=$withval else - + PHP_PDO_PGSQL=no test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL @@ -73016,7 +73266,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -73024,23 +73275,23 @@ if test "$PHP_PDO_PGSQL" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi - + if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then PGSQL_INCLUDE=$PGSQL_INCLUDE else - + ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" fi - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:73044: checking for pg_config" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 +$as_echo_n "checking for pg_config... " >&6; } for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" @@ -73049,37 +73300,37 @@ done if test -n "$PG_CONFIG"; then - echo "$ac_t""$PG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +$as_echo "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` PGSQL_LIBDIR=`$PG_CONFIG --libdir` - cat >> confdefs.h <<\EOF -#define HAVE_PG_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h else - echo "$ac_t""not found" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } if test "$PHP_PDO_PGSQL" = "yes"; then PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql" else PGSQL_SEARCH_PATHS=$PHP_PDO_PGSQL fi - + for i in $PGSQL_SEARCH_PATHS; do for j in include include/pgsql include/postgres include/postgresql ""; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INC_BASE=$i PGSQL_INCLUDE=$i/$j if test -r "$i/$j/pg_config.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_PG_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h fi fi done for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi done @@ -73087,386 +73338,388 @@ fi if test -z "$PGSQL_INCLUDE"; then - { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } + as_fn_error $? "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_LIBDIR"; then - { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } + 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 - { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; } + as_fn_error $? "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_PDO_PGSQL 1 -EOF + +$as_echo "#define HAVE_PDO_PGSQL 1" >>confdefs.h - echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 -echo "configure:73108: checking for openssl dependencies" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl dependencies" >&5 +$as_echo_n "checking for openssl dependencies... " >&6; } if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:73114: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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="$ac_save_ifs" +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" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags` fi else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi old_LIBS=$LIBS old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" - echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:73158: checking for PQparameterStatus in -lpq" >&5 -ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5 +$as_echo_n "checking for PQparameterStatus in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQparameterStatus+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQparameterStatus() -; return 0; } -EOF -if { (eval echo configure:73177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQparameterStatus (); +int +main () +{ +return PQparameterStatus (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQparameterStatus=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQparameterStatus=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPARAMETERSTATUS 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h else - echo "$ac_t""no" 1>&6 echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required" exit 1 - + fi - echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -echo "configure:73206: checking for PQprepare in -lpq" >&5 -ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5 +$as_echo_n "checking for PQprepare in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQprepare+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQprepare() -; return 0; } -EOF -if { (eval echo configure:73225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQprepare (); +int +main () +{ +return PQprepare (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQprepare=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQprepare=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPREPARE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -echo "configure:73249: checking for PQescapeStringConn in -lpq" >&5 -ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5 +$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQescapeStringConn+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQescapeStringConn() -; return 0; } -EOF -if { (eval echo configure:73268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeStringConn (); +int +main () +{ +return PQescapeStringConn (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQescapeStringConn=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQescapeStringConn=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQESCAPE_CONN 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -echo "configure:73292: checking for PQescapeByteaConn in -lpq" >&5 -ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5 +$as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQescapeByteaConn+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQescapeByteaConn() -; return 0; } -EOF -if { (eval echo configure:73311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeByteaConn (); +int +main () +{ +return PQescapeByteaConn (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQescapeByteaConn=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQescapeByteaConn=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQESCAPE_BYTEA_CONN 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:73336: checking for pg_encoding_to_char in -lpq" >&5 -ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -pg_encoding_to_char() -; return 0; } -EOF -if { (eval echo configure:73355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pg_encoding_to_char (); +int +main () +{ +return pg_encoding_to_char (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_pg_encoding_to_char=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_pg_encoding_to_char=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - + LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS - + if test "$ext_shared" = "yes"; then PDO_PGSQL_SHARED_LIBADD="-lpq $PDO_PGSQL_SHARED_LIBADD" if test -n "$PGSQL_LIBDIR"; then - + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then - + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PGSQL_LIBDIR else - + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_PGSQL_SHARED_LIBADD="-L$ai_p $PDO_PGSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_PGSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PGSQL_LIBDIR"; then - + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then - + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PGSQL_LIBDIR else - + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_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 pq in c|c_r|pthread*) ;; - *) - LIBS="-lpq $LIBS" + *) + LIBS="-lpq $LIBS" ;; esac @@ -73476,52 +73729,52 @@ fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD" - + if test "$PGSQL_INCLUDE" != "/usr/include"; then - + if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$PGSQL_INCLUDE else - + ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 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 - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73519: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73525: checking for PDO includes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -73529,19 +73782,19 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - - + + ext_builddir=ext/pdo_pgsql ext_srcdir=$abs_srcdir/ext/pdo_pgsql @@ -73549,15 +73802,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_PGSQL_SHARED=no - - + + case ext/pdo_pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -73570,12 +73823,12 @@ old_IFS=$IFS for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -73599,14 +73852,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_PGSQL_SHARED=yes - + case ext/pdo_pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -73619,12 +73872,12 @@ old_IFS=$IFS for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo" case $ac_src in @@ -73642,7 +73895,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -73652,7 +73905,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(PDO_PGSQL_SHARED_LIBADD)' ;; *) suffix=la @@ -73665,7 +73918,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_PGSQL 1 -EOF +_ACEOF fi fi @@ -73727,15 +73981,15 @@ PHP_PDO_PGSQL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -73748,12 +74002,12 @@ old_IFS=$IFS for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -73773,15 +74027,15 @@ EXT_STATIC="$EXT_STATIC pdo_pgsql" ;; *) - - + + case ext/pdo_pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -73794,12 +74048,12 @@ old_IFS=$IFS for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -73820,54 +74074,54 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_pgsql - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + am_i_shared=$PHP_PDO_PGSQL_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + fi php_with_pdo_sqlite=$PHP_PDO -echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 -echo "configure:73865: checking for sqlite 3 support for PDO" >&5 -# Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. -if test "${with_pdo_sqlite+set}" = set; then - withval="$with_pdo_sqlite" - PHP_PDO_SQLITE=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5 +$as_echo_n "checking for sqlite 3 support for PDO... " >&6; } + +# Check whether --with-pdo-sqlite was given. +if test "${with_pdo_sqlite+set}" = set; then : + withval=$with_pdo_sqlite; PHP_PDO_SQLITE=$withval else - + PHP_PDO_SQLITE=$PHP_PDO test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL @@ -73896,7 +74150,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -73904,19 +74159,19 @@ if test "$PHP_PDO_SQLITE" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then - { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } + as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5 fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73914: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73920: checking for PDO includes" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -73924,17 +74179,17 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } +as_fn_error $? "Cannot find php_pdo_driver.h." "$LINENO" 5 fi - + php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c" @@ -73944,47 +74199,49 @@ if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter PDO_SQLITE_DIR=$PHP_PDO_SQLITE else # search default path list - echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 -echo "configure:73949: checking for sqlite3 files in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 files in default path" >&5 +$as_echo_n "checking for sqlite3 files in default path... " >&6; } for i in $SEARCH_PATH ; do if test -r $i/$SEARCH_FOR; then PDO_SQLITE_DIR=$i - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } fi done fi if test -z "$PDO_SQLITE_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; } + { $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 fi - + if test "$PDO_SQLITE_DIR/include" != "/usr/include"; then - + if test -z "$PDO_SQLITE_DIR/include" || echo "$PDO_SQLITE_DIR/include" | grep '^/' >/dev/null ; then ai_p=$PDO_SQLITE_DIR/include else - + ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`" 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 @@ -73993,25 +74250,25 @@ LIBNAME=sqlite3 LIBSYMBOL=sqlite3_open - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -74022,20 +74279,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -74048,175 +74305,179 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:74095: checking for $LIBSYMBOL in -l$LIBNAME" >&5 -ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -$LIBSYMBOL() -; return 0; } -EOF -if { (eval echo configure:74114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $LIBSYMBOL (); +int +main () +{ +return $LIBSYMBOL (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD" if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then - + if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PDO_SQLITE_SHARED_LIBADD="-L$ai_p $PDO_SQLITE_SHARED_LIBADD" test -n "$ld_runpath_switch" && PDO_SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_SQLITE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then - + if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$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 $LIBNAME in c|c_r|pthread*) ;; - *) - LIBS="-l$LIBNAME $LIBS" + *) + LIBS="-l$LIBNAME $LIBS" ;; esac @@ -74226,41 +74487,39 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_PDO_SQLITELIB 1 -EOF - - +$as_echo "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$LIBNAME_$LIBSYMBOL - - { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } - - + + as_fn_error $? "wrong sqlite lib version or lib not found" "$LINENO" 5 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -74271,20 +74530,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -74297,108 +74556,108 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 -echo "configure:74344: checking for sqlite3_key in -lsqlite3" >&5 -ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -sqlite3_key() -; return 0; } -EOF -if { (eval echo configure:74363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_key (); +int +main () +{ +return sqlite3_key (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite3_sqlite3_key=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_sqlite3_sqlite3_key=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_SQLITE3_KEY 1 -EOF - - + +$as_echo "#define HAVE_SQLITE3_KEY 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_key - - + + fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD" - + ext_builddir=ext/pdo_sqlite ext_srcdir=$abs_srcdir/ext/pdo_sqlite @@ -74406,15 +74665,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_SQLITE_SHARED=no - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74427,12 +74686,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74456,14 +74715,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_SQLITE_SHARED=yes - + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -74476,12 +74735,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo" case $ac_src in @@ -74499,7 +74758,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -74509,7 +74768,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_SHARED_LIBADD)' ;; *) suffix=la @@ -74522,7 +74781,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_SQLITE 1 -EOF +_ACEOF fi fi @@ -74584,15 +74844,15 @@ PHP_PDO_SQLITE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74605,12 +74865,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74630,15 +74890,15 @@ EXT_STATIC="$EXT_STATIC pdo_sqlite" ;; *) - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74651,12 +74911,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74677,15 +74937,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_sqlite - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -74705,15 +74965,15 @@ fi if test "$PHP_SQLITE3" != "yes"; then - - + + case ext/sqlite3 in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74726,12 +74986,12 @@ old_IFS=$IFS for ac_src in libsqlite/sqlite3.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74750,7 +75010,7 @@ fi - + ext_builddir=ext/pdo_sqlite ext_srcdir=$abs_srcdir/ext/pdo_sqlite @@ -74758,15 +75018,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_SQLITE_SHARED=no - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74779,12 +75039,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74808,14 +75068,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PDO_SQLITE_SHARED=yes - + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -74828,12 +75088,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo" case $ac_src in @@ -74851,7 +75111,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -74861,7 +75121,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_SHARED_LIBADD)' ;; *) suffix=la @@ -74874,7 +75134,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PDO_SQLITE 1 -EOF +_ACEOF fi fi @@ -74936,15 +75197,15 @@ PHP_PDO_SQLITE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -74957,12 +75218,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -74982,15 +75243,15 @@ EXT_STATIC="$EXT_STATIC pdo_sqlite" ;; *) - - + + case ext/pdo_sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -75003,12 +75264,12 @@ old_IFS=$IFS for ac_src in $php_pdo_sqlite_sources_core; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -75029,188 +75290,117 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pdo_sqlite - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD" - + am_i_shared=$PHP_PDO_SQLITE_SHARED is_it_shared=$PHP_SQLITE3_SHARED is_it_enabled=$PHP_SQLITE3 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + if test "$abs_srcdir/ext/sqlite3/libsqlite" != "/usr/include"; then - + if test -z "$abs_srcdir/ext/sqlite3/libsqlite" || echo "$abs_srcdir/ext/sqlite3/libsqlite" | grep '^/' >/dev/null ; then ai_p=$abs_srcdir/ext/sqlite3/libsqlite else - + ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`" 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 for ac_func in usleep nanosleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:75104: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:75132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - for ac_hdr in time.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:75160: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:75170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TIME_H 1 +_ACEOF + fi + done fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -75221,20 +75411,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -75247,100 +75437,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 -echo "configure:75294: checking for fdatasync in -lrt" >&5 -ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5 +$as_echo_n "checking for fdatasync in -lrt... " >&6; } +if ${ac_cv_lib_rt_fdatasync+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -fdatasync() -; return 0; } -EOF -if { (eval echo configure:75313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fdatasync (); +int +main () +{ +return fdatasync (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_fdatasync=yes +else + ac_cv_lib_rt_fdatasync=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5 +$as_echo "$ac_cv_lib_rt_fdatasync" >&6; } +if test "x$ac_cv_lib_rt_fdatasync" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case rt in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD" + PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD" else - - + + case rt in c|c_r|pthread*) ;; - *) - LIBS="-lrt $LIBS" + *) + LIBS="-lrt $LIBS" ;; esac @@ -75350,53 +75542,52 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_rt_fdatasync - - + + fi - - + + am_i_shared=$PHP_PDO_SQLITE_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + fi php_with_pgsql=no -echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 -echo "configure:75394: checking for PostgreSQL support" >&5 -# Check whether --with-pgsql or --without-pgsql was given. -if test "${with_pgsql+set}" = set; then - withval="$with_pgsql" - PHP_PGSQL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5 +$as_echo_n "checking for PostgreSQL support... " >&6; } + +# Check whether --with-pgsql was given. +if test "${with_pgsql+set}" = set; then : + withval=$with_pgsql; PHP_PGSQL=$withval else - + PHP_PGSQL=no test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL @@ -75425,26 +75616,27 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_PGSQL" != "no"; then - + if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then PGSQL_INCLUDE=$PGSQL_INCLUDE else - + ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" fi - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:75448: checking for pg_config" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 +$as_echo_n "checking for pg_config... " >&6; } for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" @@ -75453,39 +75645,39 @@ done if test -n "$PG_CONFIG"; then - echo "$ac_t""$PG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +$as_echo "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` PGSQL_LIBDIR=`$PG_CONFIG --libdir` if test -r "$PGSQL_INCLUDE/pg_config.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_PG_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h fi else - echo "$ac_t""not found" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } if test "$PHP_PGSQL" = "yes"; then PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql" else PGSQL_SEARCH_PATHS=$PHP_PGSQL fi - + for i in $PGSQL_SEARCH_PATHS; do for j in include include/pgsql include/postgres include/postgresql ""; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INC_BASE=$i PGSQL_INCLUDE=$i/$j if test -r "$i/$j/pg_config.h"; then - cat >> confdefs.h <<\EOF -#define HAVE_PG_CONFIG_H 1 -EOF + +$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h fi fi done for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi done @@ -75493,1276 +75685,1248 @@ fi if test -z "$PGSQL_INCLUDE"; then - { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } + as_fn_error $? "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5 fi if test -z "$PGSQL_LIBDIR"; then - { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } + 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 - { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; } + as_fn_error $? "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_PGSQL 1 -EOF + +$as_echo "#define HAVE_PGSQL 1" >>confdefs.h old_LIBS=$LIBS old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" - echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 -echo "configure:75516: checking for PQescapeString in -lpq" >&5 -ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeString in -lpq" >&5 +$as_echo_n "checking for PQescapeString in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQescapeString+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQescapeString() -; return 0; } -EOF -if { (eval echo configure:75535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeString (); +int +main () +{ +return PQescapeString (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQescapeString=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQescapeString=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQESCAPE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQESCAPE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 -echo "configure:75559: checking for PQunescapeBytea in -lpq" >&5 -ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQunescapeBytea in -lpq" >&5 +$as_echo_n "checking for PQunescapeBytea in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQunescapeBytea+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQunescapeBytea() -; return 0; } -EOF -if { (eval echo configure:75578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQunescapeBytea (); +int +main () +{ +return PQunescapeBytea (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQunescapeBytea=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQunescapeBytea=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQUNESCAPEBYTEA 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQUNESCAPEBYTEA 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 -echo "configure:75602: checking for PQsetnonblocking in -lpq" >&5 -ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetnonblocking in -lpq" >&5 +$as_echo_n "checking for PQsetnonblocking in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsetnonblocking+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQsetnonblocking() -; return 0; } -EOF -if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetnonblocking (); +int +main () +{ +return PQsetnonblocking (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQsetnonblocking=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQsetnonblocking=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQSETNONBLOCKING 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQSETNONBLOCKING 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 -echo "configure:75645: checking for PQcmdTuples in -lpq" >&5 -ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 +$as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQcmdTuples+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQcmdTuples() -; return 0; } -EOF -if { (eval echo configure:75664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQcmdTuples (); +int +main () +{ +return PQcmdTuples (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQcmdTuples=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQcmdTuples=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQCMDTUPLES 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 -echo "configure:75688: checking for PQoidValue in -lpq" >&5 -ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQoidValue in -lpq" >&5 +$as_echo_n "checking for PQoidValue in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQoidValue+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQoidValue() -; return 0; } -EOF -if { (eval echo configure:75707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQoidValue (); +int +main () +{ +return PQoidValue (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQoidValue=yes +else + ac_cv_lib_pq_PQoidValue=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQOIDVALUE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQOIDVALUE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 -echo "configure:75731: checking for PQclientEncoding in -lpq" >&5 -ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQclientEncoding in -lpq" >&5 +$as_echo_n "checking for PQclientEncoding in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQclientEncoding+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQclientEncoding() -; return 0; } -EOF -if { (eval echo configure:75750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQclientEncoding (); +int +main () +{ +return PQclientEncoding (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQclientEncoding=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQclientEncoding=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQCLIENTENCODING 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQCLIENTENCODING 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:75774: checking for PQparameterStatus in -lpq" >&5 -ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5 +$as_echo_n "checking for PQparameterStatus in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQparameterStatus+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQparameterStatus() -; return 0; } -EOF -if { (eval echo configure:75793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQparameterStatus (); +int +main () +{ +return PQparameterStatus (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQparameterStatus=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQparameterStatus=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPARAMETERSTATUS 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 -echo "configure:75817: checking for PQprotocolVersion in -lpq" >&5 -ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprotocolVersion in -lpq" >&5 +$as_echo_n "checking for PQprotocolVersion in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQprotocolVersion+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQprotocolVersion() -; return 0; } -EOF -if { (eval echo configure:75836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQprotocolVersion (); +int +main () +{ +return PQprotocolVersion (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQprotocolVersion=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQprotocolVersion=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPROTOCOLVERSION 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPROTOCOLVERSION 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 -echo "configure:75860: checking for PQtransactionStatus in -lpq" >&5 -ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQtransactionStatus in -lpq" >&5 +$as_echo_n "checking for PQtransactionStatus in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQtransactionStatus+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQtransactionStatus() -; return 0; } -EOF -if { (eval echo configure:75879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQtransactionStatus (); +int +main () +{ +return PQtransactionStatus (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQtransactionStatus=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQtransactionStatus=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PGTRANSACTIONSTATUS 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PGTRANSACTIONSTATUS 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 -echo "configure:75903: checking for PQexecParams in -lpq" >&5 -ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecParams in -lpq" >&5 +$as_echo_n "checking for PQexecParams in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQexecParams+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQexecParams() -; return 0; } -EOF -if { (eval echo configure:75922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQexecParams (); +int +main () +{ +return PQexecParams (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQexecParams=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQexecParams=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQEXECPARAMS 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQEXECPARAMS 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -echo "configure:75946: checking for PQprepare in -lpq" >&5 -ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5 +$as_echo_n "checking for PQprepare in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQprepare+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQprepare() -; return 0; } -EOF -if { (eval echo configure:75965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQprepare (); +int +main () +{ +return PQprepare (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQprepare=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQprepare=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPREPARE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 -echo "configure:75989: checking for PQexecPrepared in -lpq" >&5 -ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecPrepared in -lpq" >&5 +$as_echo_n "checking for PQexecPrepared in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQexecPrepared+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQexecPrepared() -; return 0; } -EOF -if { (eval echo configure:76008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQexecPrepared (); +int +main () +{ +return PQexecPrepared (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQexecPrepared=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQexecPrepared=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQEXECPREPARED 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQEXECPREPARED 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 -echo "configure:76032: checking for PQresultErrorField in -lpq" >&5 -ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQresultErrorField in -lpq" >&5 +$as_echo_n "checking for PQresultErrorField in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQresultErrorField+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQresultErrorField() -; return 0; } -EOF -if { (eval echo configure:76051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQresultErrorField (); +int +main () +{ +return PQresultErrorField (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQresultErrorField=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQresultErrorField=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQRESULTERRORFIELD 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQRESULTERRORFIELD 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 -echo "configure:76075: checking for PQsendQueryParams in -lpq" >&5 -ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryParams in -lpq" >&5 +$as_echo_n "checking for PQsendQueryParams in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsendQueryParams+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQsendQueryParams() -; return 0; } -EOF -if { (eval echo configure:76094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQsendQueryParams (); +int +main () +{ +return PQsendQueryParams (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQsendQueryParams=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQsendQueryParams=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQSENDQUERYPARAMS 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQSENDQUERYPARAMS 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 -echo "configure:76118: checking for PQsendPrepare in -lpq" >&5 -ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendPrepare in -lpq" >&5 +$as_echo_n "checking for PQsendPrepare in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsendPrepare+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQsendPrepare() -; return 0; } -EOF -if { (eval echo configure:76137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQsendPrepare (); +int +main () +{ +return PQsendPrepare (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQsendPrepare=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQsendPrepare=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQSENDPREPARE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQSENDPREPARE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 -echo "configure:76161: checking for PQsendQueryPrepared in -lpq" >&5 -ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryPrepared in -lpq" >&5 +$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsendQueryPrepared+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQsendQueryPrepared() -; return 0; } -EOF -if { (eval echo configure:76180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQsendQueryPrepared (); +int +main () +{ +return PQsendQueryPrepared (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQsendQueryPrepared=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQsendQueryPrepared=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQSENDQUERYPREPARED 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQSENDQUERYPREPARED 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 -echo "configure:76204: checking for PQputCopyData in -lpq" >&5 -ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5 +$as_echo_n "checking for PQputCopyData in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQputCopyData+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQputCopyData() -; return 0; } -EOF -if { (eval echo configure:76223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQputCopyData (); +int +main () +{ +return PQputCopyData (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQputCopyData=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQputCopyData=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPUTCOPYDATA 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPUTCOPYDATA 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 -echo "configure:76247: checking for PQputCopyEnd in -lpq" >&5 -ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyEnd in -lpq" >&5 +$as_echo_n "checking for PQputCopyEnd in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQputCopyEnd+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQputCopyEnd() -; return 0; } -EOF -if { (eval echo configure:76266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQputCopyEnd (); +int +main () +{ +return PQputCopyEnd (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQputCopyEnd=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQputCopyEnd=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQPUTCOPYEND 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQPUTCOPYEND 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 -echo "configure:76290: checking for PQgetCopyData in -lpq" >&5 -ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQgetCopyData in -lpq" >&5 +$as_echo_n "checking for PQgetCopyData in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQgetCopyData+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQgetCopyData() -; return 0; } -EOF -if { (eval echo configure:76309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQgetCopyData (); +int +main () +{ +return PQgetCopyData (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQgetCopyData=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQgetCopyData=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQGETCOPYDATA 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQGETCOPYDATA 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 -echo "configure:76333: checking for PQfreemem in -lpq" >&5 -ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQfreemem in -lpq" >&5 +$as_echo_n "checking for PQfreemem in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQfreemem+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQfreemem() -; return 0; } -EOF -if { (eval echo configure:76352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQfreemem (); +int +main () +{ +return PQfreemem (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQfreemem=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQfreemem=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQFREEMEM 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQFREEMEM 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 -echo "configure:76376: checking for PQsetErrorVerbosity in -lpq" >&5 -ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetErrorVerbosity in -lpq" >&5 +$as_echo_n "checking for PQsetErrorVerbosity in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsetErrorVerbosity+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQsetErrorVerbosity() -; return 0; } -EOF -if { (eval echo configure:76395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetErrorVerbosity (); +int +main () +{ +return PQsetErrorVerbosity (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQsetErrorVerbosity=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQsetErrorVerbosity=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQSETERRORVERBOSITY 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQSETERRORVERBOSITY 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 -echo "configure:76419: checking for PQftable in -lpq" >&5 -ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQftable in -lpq" >&5 +$as_echo_n "checking for PQftable in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQftable+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQftable() -; return 0; } -EOF -if { (eval echo configure:76438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQftable (); +int +main () +{ +return PQftable (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQftable=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQftable=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQFTABLE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQFTABLE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -echo "configure:76462: checking for PQescapeStringConn in -lpq" >&5 -ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5 +$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQescapeStringConn+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQescapeStringConn() -; return 0; } -EOF -if { (eval echo configure:76481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeStringConn (); +int +main () +{ +return PQescapeStringConn (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQescapeStringConn=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQescapeStringConn=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQESCAPE_CONN 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -echo "configure:76505: checking for PQescapeByteaConn in -lpq" >&5 -ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5 +$as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQescapeByteaConn+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -PQescapeByteaConn() -; return 0; } -EOF -if { (eval echo configure:76524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeByteaConn (); +int +main () +{ +return PQescapeByteaConn (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQescapeByteaConn=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_PQescapeByteaConn=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PQESCAPE_BYTEA_CONN 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:76548: checking for pg_encoding_to_char in -lpq" >&5 -ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -pg_encoding_to_char() -; return 0; } -EOF -if { (eval echo configure:76567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pg_encoding_to_char (); +int +main () +{ +return pg_encoding_to_char (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_pg_encoding_to_char=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_pg_encoding_to_char=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 -echo "configure:76591: checking for lo_create in -lpq" >&5 -ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_pq_lo_create+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -lo_create() -; return 0; } -EOF -if { (eval echo configure:76610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lo_create (); +int +main () +{ +return lo_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_lo_create=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_lo_create=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PG_LO_CREATE 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PG_LO_CREATE 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 -echo "configure:76634: checking for lo_import_with_oid in -lpq" >&5 -ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_pq_lo_import_with_oid+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -lo_import_with_oid() -; return 0; } -EOF -if { (eval echo configure:76653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lo_import_with_oid (); +int +main () +{ +return lo_import_with_oid (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_lo_import_with_oid=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_pq_lo_import_with_oid=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PG_LO_IMPORT_WITH_OID 1 -EOF +{ $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" = xyes; then : + +$as_echo "#define HAVE_PG_LO_IMPORT_WITH_OID 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS - + if test "$ext_shared" = "yes"; then PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" if test -n "$PGSQL_LIBDIR"; then - + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then - + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PGSQL_LIBDIR else - + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PGSQL_LIBDIR"; then - + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then - + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PGSQL_LIBDIR else - + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_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 pq in c|c_r|pthread*) ;; - *) - LIBS="-lpq $LIBS" + *) + LIBS="-lpq $LIBS" ;; esac @@ -76772,43 +76936,43 @@ fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" - + if test "$PGSQL_INCLUDE" != "/usr/include"; then - + if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then ai_p=$PGSQL_INCLUDE else - + ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 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 - + ext_builddir=ext/pgsql ext_srcdir=$abs_srcdir/ext/pgsql @@ -76816,15 +76980,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PGSQL_SHARED=no - - + + case ext/pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -76837,12 +77001,12 @@ old_IFS=$IFS for ac_src in pgsql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -76866,14 +77030,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PGSQL_SHARED=yes - + case ext/pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -76886,12 +77050,12 @@ old_IFS=$IFS for ac_src in pgsql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo" case $ac_src in @@ -76909,7 +77073,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -76919,7 +77083,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(PGSQL_SHARED_LIBADD)' ;; *) suffix=la @@ -76932,7 +77096,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PGSQL 1 -EOF +_ACEOF fi fi @@ -76994,15 +77159,15 @@ PHP_PGSQL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77015,12 +77180,12 @@ old_IFS=$IFS for ac_src in pgsql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77040,15 +77205,15 @@ EXT_STATIC="$EXT_STATIC pgsql" ;; *) - - + + case ext/pgsql in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77061,12 +77226,12 @@ old_IFS=$IFS for ac_src in pgsql.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77087,15 +77252,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pgsql - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -77108,14 +77273,13 @@ php_enable_phar=yes -echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 -echo "configure:77113: checking for phar archive support" >&5 -# Check whether --enable-phar or --disable-phar was given. -if test "${enable_phar+set}" = set; then - enableval="$enable_phar" - PHP_PHAR=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5 +$as_echo_n "checking for phar archive support... " >&6; } +# Check whether --enable-phar was given. +if test "${enable_phar+set}" = set; then : + enableval=$enable_phar; PHP_PHAR=$enableval else - + PHP_PHAR=yes test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL @@ -77144,13 +77308,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_PHAR" != "no"; then - + ext_builddir=ext/phar ext_srcdir=$abs_srcdir/ext/phar @@ -77158,15 +77323,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PHAR_SHARED=no - - + + case ext/phar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77179,12 +77344,12 @@ old_IFS=$IFS for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77208,14 +77373,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PHAR_SHARED=yes - + case ext/phar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -77228,12 +77393,12 @@ old_IFS=$IFS for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo" case $ac_src in @@ -77251,7 +77416,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -77261,7 +77426,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPHAR, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(PHAR_SHARED_LIBADD)' ;; *) suffix=la @@ -77274,7 +77439,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PHAR 1 -EOF +_ACEOF fi fi @@ -77336,15 +77502,15 @@ PHP_PHAR_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/phar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77357,12 +77523,12 @@ old_IFS=$IFS for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77382,15 +77548,15 @@ EXT_STATIC="$EXT_STATIC phar" ;; *) - - + + case ext/phar in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77403,12 +77569,12 @@ old_IFS=$IFS for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77429,83 +77595,85 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC phar" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=phar - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 -echo "configure:77447: checking for phar openssl support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5 +$as_echo_n "checking for phar openssl support... " >&6; } if test "$PHP_HASH_SHARED" != "yes"; then if test "$PHP_HASH" != "no"; then - cat >> confdefs.h <<\EOF -#define PHAR_HASH_OK 1 -EOF + +$as_echo "#define PHAR_HASH_OK 1" >>confdefs.h fi else - echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&5 +$as_echo "$as_me: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&2;} fi if test "$PHP_OPENSSL_SHARED" = "yes"; then - echo "$ac_t""no (shared openssl)" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5 +$as_echo "no (shared openssl)" >&6; } else if test "$PHP_OPENSSL" = "yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define PHAR_HAVE_OPENSSL 1 -EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi - + am_i_shared=$PHP_PHAR_SHARED is_it_shared=$PHP_HASH_SHARED is_it_enabled=$PHP_HASH if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + am_i_shared=$PHP_PHAR_SHARED is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -77517,14 +77685,13 @@ php_enable_posix=yes -echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 -echo "configure:77522: checking whether to enable POSIX-like functions" >&5 -# Check whether --enable-posix or --disable-posix was given. -if test "${enable_posix+set}" = set; then - enableval="$enable_posix" - PHP_POSIX=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5 +$as_echo_n "checking whether to enable POSIX-like functions... " >&6; } +# Check whether --enable-posix was given. +if test "${enable_posix+set}" = set; then : + enableval=$enable_posix; PHP_POSIX=$enableval else - + PHP_POSIX=yes test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL @@ -77553,17 +77720,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_POSIX" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_POSIX 1 -EOF - +$as_echo "#define HAVE_POSIX 1" >>confdefs.h + + ext_builddir=ext/posix ext_srcdir=$abs_srcdir/ext/posix @@ -77571,15 +77738,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_POSIX_SHARED=no - - + + case ext/posix in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77592,12 +77759,12 @@ old_IFS=$IFS for ac_src in posix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77621,14 +77788,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_POSIX_SHARED=yes - + case ext/posix in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -77641,12 +77808,12 @@ old_IFS=$IFS for ac_src in posix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" case $ac_src in @@ -77664,7 +77831,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -77674,7 +77841,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(POSIX_SHARED_LIBADD)' ;; *) suffix=la @@ -77687,7 +77854,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_POSIX 1 -EOF +_ACEOF fi fi @@ -77749,15 +77917,15 @@ PHP_POSIX_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/posix in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -77770,12 +77938,12 @@ old_IFS=$IFS for ac_src in posix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77795,17 +77963,17 @@ EXT_STATIC="$EXT_STATIC posix" ;; *) - - + + case ext/posix in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - - b_c_pre=$php_c_pre + + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre b_c_meta=$php_c_meta b_cxx_meta=$php_cxx_meta @@ -77816,12 +77984,12 @@ old_IFS=$IFS for ac_src in posix.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -77842,127 +78010,56 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC posix" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=posix - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - for ac_hdr in sys/mkdev.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:77864: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:77874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_MKDEV_H 1 +_ACEOF + fi + done for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:77904: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:77932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 -echo "configure:77958: checking for working ttyname_r() implementation" >&5 - if test "$cross_compiling" = yes; then - - echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5 +$as_echo_n "checking for working ttyname_r() implementation... " >&6; } + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5 +$as_echo "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; } + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include @@ -77972,70 +78069,66 @@ return ttyname_r(0, buf, 64) ? 1 : 0; } - -EOF -if { (eval echo configure:77978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_TTYNAME_R 1 -EOF - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_TTYNAME_R 1" >>confdefs.h + + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5 +$as_echo "no, posix_ttyname() will be thread-unsafe" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 -echo "configure:78000: checking for utsname.domainname" >&5 -if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for utsname.domainname... " >&6; } +if ${ac_cv_have_utsname_domainname+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #define _GNU_SOURCE #include - -int main() { + +int +main () +{ return sizeof(((struct utsname *)0)->domainname); - -; return 0; } -EOF -if { (eval echo configure:78018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_utsname_domainname=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_have_utsname_domainname=no - -fi -rm -f conftest* - + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5 +$as_echo "$ac_cv_have_utsname_domainname" >&6; } if test "$ac_cv_have_utsname_domainname" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_UTSNAME_DOMAINNAME 1 -EOF + +$as_echo "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h fi fi @@ -78044,14 +78137,14 @@ php_with_pspell=no -echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 -echo "configure:78049: checking for PSPELL support" >&5 -# Check whether --with-pspell or --without-pspell was given. -if test "${with_pspell+set}" = set; then - withval="$with_pspell" - PHP_PSPELL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5 +$as_echo_n "checking for PSPELL support... " >&6; } + +# Check whether --with-pspell was given. +if test "${with_pspell+set}" = set; then : + withval=$with_pspell; PHP_PSPELL=$withval else - + PHP_PSPELL=no test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL @@ -78080,13 +78173,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_PSPELL" != "no"; then - + ext_builddir=ext/pspell ext_srcdir=$abs_srcdir/ext/pspell @@ -78094,15 +78188,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PSPELL_SHARED=no - - + + case ext/pspell in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -78115,12 +78209,12 @@ old_IFS=$IFS for ac_src in pspell.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -78144,14 +78238,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_PSPELL_SHARED=yes - + case ext/pspell in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -78164,12 +78258,12 @@ old_IFS=$IFS for ac_src in pspell.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" case $ac_src in @@ -78187,7 +78281,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -78197,7 +78291,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(PSPELL_SHARED_LIBADD)' ;; *) suffix=la @@ -78210,7 +78304,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_PSPELL 1 -EOF +_ACEOF fi fi @@ -78272,15 +78367,15 @@ PHP_PSPELL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/pspell in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -78293,12 +78388,12 @@ old_IFS=$IFS for ac_src in pspell.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -78318,15 +78413,15 @@ EXT_STATIC="$EXT_STATIC pspell" ;; *) - - + + case ext/pspell in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -78339,12 +78434,12 @@ old_IFS=$IFS for ac_src in pspell.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -78365,15 +78460,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=pspell - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -78394,99 +78489,99 @@ done if test -z "$PSPELL_DIR"; then - { echo "configure: error: Cannot find pspell" 1>&2; exit 1; } + as_fn_error $? "Cannot find pspell" "$LINENO" 5 fi PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR - + if test "$ext_shared" = "yes"; then PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" if test -n "$PSPELL_LIBDIR"; then - + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then - + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PSPELL_LIBDIR else - + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PSPELL_LIBDIR"; then - + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then - + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PSPELL_LIBDIR else - + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PSPELL_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 pspell in c|c_r|pthread*) ;; - *) - LIBS="-lpspell $LIBS" + *) + LIBS="-lpspell $LIBS" ;; esac @@ -78497,25 +78592,25 @@ - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$PSPELL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -78526,20 +78621,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -78552,175 +78647,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 -echo "configure:78599: checking for new_aspell_config in -laspell" >&5 -ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_aspell_new_aspell_config+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-laspell $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -new_aspell_config() -; return 0; } -EOF -if { (eval echo configure:78618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char new_aspell_config (); +int +main () +{ +return new_aspell_config (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_aspell_new_aspell_config=yes +else + ac_cv_lib_aspell_new_aspell_config=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" if test -n "$PSPELL_LIBDIR"; then - + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then - + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PSPELL_LIBDIR else - + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PSPELL_LIBDIR"; then - + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then - + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PSPELL_LIBDIR else - + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PSPELL_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 aspell in c|c_r|pthread*) ;; - *) - LIBS="-laspell $LIBS" + *) + LIBS="-laspell $LIBS" ;; esac @@ -78730,56 +78827,54 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_aspell_new_aspell_config - - + + fi - + if test "$PSPELL_INCDIR" != "/usr/include"; then - + if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$PSPELL_INCDIR else - + ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" 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 - + PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" - cat >> confdefs.h <<\EOF -#define HAVE_PSPELL 1 -EOF + +$as_echo "#define HAVE_PSPELL 1" >>confdefs.h fi @@ -78787,14 +78882,14 @@ php_with_libedit=no -echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -echo "configure:78792: checking for libedit readline replacement" >&5 -# Check whether --with-libedit or --without-libedit was given. -if test "${with_libedit+set}" = set; then - withval="$with_libedit" - PHP_LIBEDIT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5 +$as_echo_n "checking for libedit readline replacement... " >&6; } + +# Check whether --with-libedit was given. +if test "${with_libedit+set}" = set; then : + withval=$with_libedit; PHP_LIBEDIT=$withval else - + PHP_LIBEDIT=no test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL @@ -78823,23 +78918,24 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_LIBEDIT" = "no"; then - + php_with_readline=no -echo $ac_n "checking for readline support""... $ac_c" 1>&6 -echo "configure:78837: checking for readline support" >&5 -# Check whether --with-readline or --without-readline was given. -if test "${with_readline+set}" = set; then - withval="$with_readline" - PHP_READLINE=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5 +$as_echo_n "checking for readline support... " >&6; } + +# Check whether --with-readline was given. +if test "${with_readline+set}" = set; then : + withval=$with_readline; PHP_READLINE=$withval else - + PHP_READLINE=no test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL @@ -78868,7 +78964,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -78882,92 +78979,94 @@ done if test -z "$READLINE_DIR"; then - { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } + as_fn_error $? "Please reinstall readline - I cannot find readline.h" "$LINENO" 5 fi - + if test "$READLINE_DIR/include" != "/usr/include"; then - + if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then ai_p=$READLINE_DIR/include else - + ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" 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 PHP_READLINE_LIBS="" - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:78923: checking for tgetent in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 +$as_echo_n "checking for tgetent in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgetent (); +int +main () +{ +return tgetent (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_tgetent=yes +else + ac_cv_lib_ncurses_tgetent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } +if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then : + -int main() { -tgetent() -; return 0; } -EOF -if { (eval echo configure:78942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - - case ncurses in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" + READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" else - - + + case ncurses in c|c_r|pthread*) ;; - *) - LIBS="-lncurses $LIBS" + *) + LIBS="-lncurses $LIBS" ;; esac @@ -78978,60 +79077,61 @@ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" - + else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:78987: checking for tgetent in -ltermcap" >&5 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 +$as_echo_n "checking for tgetent in -ltermcap... " >&6; } +if ${ac_cv_lib_termcap_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgetent (); +int +main () +{ +return tgetent (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_termcap_tgetent=yes +else + ac_cv_lib_termcap_tgetent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } +if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : + -int main() { -tgetent() -; return 0; } -EOF -if { (eval echo configure:79006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - - case termcap in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" + READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" else - - + + case termcap in c|c_r|pthread*) ;; - *) - LIBS="-ltermcap $LIBS" + *) + LIBS="-ltermcap $LIBS" ;; esac @@ -79042,34 +79142,32 @@ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" - -else - echo "$ac_t""no" 1>&6 + fi - + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -79080,20 +79178,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -79106,175 +79204,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:79153: checking for readline in -lreadline" >&5 -ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +$as_echo_n "checking for readline in -lreadline... " >&6; } +if ${ac_cv_lib_readline_readline+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -readline() -; return 0; } -EOF -if { (eval echo configure:79172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char readline (); +int +main () +{ +return readline (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_readline=yes +else + ac_cv_lib_readline_readline=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +$as_echo "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" if test -n "$READLINE_DIR/$PHP_LIBDIR"; then - + if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$READLINE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$READLINE_DIR/$PHP_LIBDIR"; then - + if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$READLINE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$READLINE_DIR/$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 readline in c|c_r|pthread*) ;; - *) - LIBS="-lreadline $LIBS" + *) + LIBS="-lreadline $LIBS" ;; esac @@ -79284,40 +79384,39 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_readline_readline - - { echo "configure: error: readline library not found" 1>&2; exit 1; } - - + + as_fn_error $? "readline library not found" "$LINENO" 5 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -79328,20 +79427,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -79354,120 +79453,121 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 -echo "configure:79401: checking for rl_pending_input in -lreadline" >&5 -ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_readline_rl_pending_input+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -rl_pending_input() -; return 0; } -EOF -if { (eval echo configure:79420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rl_pending_input (); +int +main () +{ +return rl_pending_input (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_rl_pending_input=yes +else + ac_cv_lib_readline_rl_pending_input=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_readline_rl_pending_input - - { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } - - + + as_fn_error $? "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5 + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -79478,20 +79578,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -79504,107 +79604,106 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 -echo "configure:79551: checking for rl_callback_read_char in -lreadline" >&5 -ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_readline_rl_callback_read_char+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -rl_callback_read_char() -; return 0; } -EOF -if { (eval echo configure:79570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rl_callback_read_char (); +int +main () +{ +return rl_callback_read_char (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_rl_callback_read_char=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_readline_rl_callback_read_char=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_RL_CALLBACK_READ_CHAR 1 -EOF - - + +$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_readline_rl_callback_read_char - - + + fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBREADLINE 1 -EOF + +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h elif test "$PHP_LIBEDIT" != "no"; then @@ -79614,91 +79713,93 @@ done if test -z "$LIBEDIT_DIR"; then - { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } + as_fn_error $? "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5 fi - + if test "$LIBEDIT_DIR/include" != "/usr/include"; then - + if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then ai_p=$LIBEDIT_DIR/include else - + ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" 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 - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:79654: checking for tgetent in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 +$as_echo_n "checking for tgetent in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgetent (); +int +main () +{ +return tgetent (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_tgetent=yes +else + ac_cv_lib_ncurses_tgetent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } +if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then : + -int main() { -tgetent() -; return 0; } -EOF -if { (eval echo configure:79673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - - case ncurses in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" + READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" else - - + + case ncurses in c|c_r|pthread*) ;; - *) - LIBS="-lncurses $LIBS" + *) + LIBS="-lncurses $LIBS" ;; esac @@ -79708,60 +79809,61 @@ esac - + else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:79717: checking for tgetent in -ltermcap" >&5 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 +$as_echo_n "checking for tgetent in -ltermcap... " >&6; } +if ${ac_cv_lib_termcap_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgetent (); +int +main () +{ +return tgetent (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_termcap_tgetent=yes +else + ac_cv_lib_termcap_tgetent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } +if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : + -int main() { -tgetent() -; return 0; } -EOF -if { (eval echo configure:79736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - - case termcap in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" + READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" else - - + + case termcap in c|c_r|pthread*) ;; - *) - LIBS="-ltermcap $LIBS" + *) + LIBS="-ltermcap $LIBS" ;; esac @@ -79771,34 +79873,32 @@ esac - -else - echo "$ac_t""no" 1>&6 + fi - + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$READLINE_DIR/$PHP_LIBDIR + -L$READLINE_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -79809,20 +79909,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -79835,175 +79935,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 -echo "configure:79882: checking for readline in -ledit" >&5 -ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 +$as_echo_n "checking for readline in -ledit... " >&6; } +if ${ac_cv_lib_edit_readline+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ledit $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -readline() -; return 0; } -EOF -if { (eval echo configure:79901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char readline (); +int +main () +{ +return readline (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_edit_readline=yes +else + ac_cv_lib_edit_readline=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 +$as_echo "$ac_cv_lib_edit_readline" >&6; } +if test "x$ac_cv_lib_edit_readline" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then - + if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LIBEDIT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then - + if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$LIBEDIT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$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 edit in c|c_r|pthread*) ;; - *) - LIBS="-ledit $LIBS" + *) + LIBS="-ledit $LIBS" ;; esac @@ -80012,85 +80114,39 @@ fi - - - + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_edit_readline - - { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } - - -fi + as_fn_error $? "edit library required by readline not found" "$LINENO" 5 - cat >> confdefs.h <<\EOF -#define HAVE_LIBEDIT 1 -EOF fi -if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then - for ac_func in rl_completion_matches -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:80042: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h -; return 0; } -EOF -if { (eval echo configure:80070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 +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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_RL_COMPLETION_MATCHES 1 +_ACEOF + fi done - + ext_builddir=ext/readline ext_srcdir=$abs_srcdir/ext/readline @@ -80098,15 +80154,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then PHP_READLINE_SHARED=no - - + + case ext/readline in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -80119,12 +80175,12 @@ old_IFS=$IFS for ac_src in readline.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -80148,14 +80204,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_READLINE_SHARED=yes - + case ext/readline in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -80168,12 +80224,12 @@ old_IFS=$IFS for ac_src in readline.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" case $ac_src in @@ -80191,7 +80247,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -80201,7 +80257,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(READLINE_SHARED_LIBADD)' ;; *) suffix=la @@ -80214,7 +80270,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_READLINE 1 -EOF +_ACEOF fi fi @@ -80276,15 +80333,15 @@ PHP_READLINE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/readline in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -80297,12 +80354,12 @@ old_IFS=$IFS for ac_src in readline.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -80322,15 +80379,15 @@ EXT_STATIC="$EXT_STATIC readline" ;; *) - - + + case ext/readline in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -80343,12 +80400,12 @@ old_IFS=$IFS for ac_src in readline.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -80369,20 +80426,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC readline" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=readline - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD" fi @@ -80391,14 +80448,14 @@ php_with_recode=no -echo $ac_n "checking for recode support""... $ac_c" 1>&6 -echo "configure:80396: checking for recode support" >&5 -# Check whether --with-recode or --without-recode was given. -if test "${with_recode+set}" = set; then - withval="$with_recode" - PHP_RECODE=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recode support" >&5 +$as_echo_n "checking for recode support... " >&6; } + +# Check whether --with-recode was given. +if test "${with_recode+set}" = set; then : + withval=$with_recode; PHP_RECODE=$withval else - + PHP_RECODE=no test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL @@ -80427,7 +80484,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -80455,28 +80513,28 @@ done if test -z "$RECODE_DIR"; then - { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } + as_fn_error $? "Can not find recode.h anywhere under $RECODE_LIST." "$LINENO" 5 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$RECODE_DIR/$RECODE_LIB " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -80487,20 +80545,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -80513,175 +80571,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 -echo "configure:80560: checking for recode_format_table in -lrecode" >&5 -ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_recode_recode_format_table+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lrecode $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -recode_format_table() -; return 0; } -EOF -if { (eval echo configure:80579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char recode_format_table (); +int +main () +{ +return recode_format_table (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_recode_recode_format_table=yes +else + ac_cv_lib_recode_recode_format_table=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" if test -n "$RECODE_DIR/$RECODE_LIB"; then - + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ai_p=$RECODE_DIR/$RECODE_LIB else - + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" fi - + if test "$ext_shared" = "yes"; then RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$RECODE_DIR/$RECODE_LIB"; then - + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ai_p=$RECODE_DIR/$RECODE_LIB else - + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 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 recode in c|c_r|pthread*) ;; - *) - LIBS="-lrecode $LIBS" + *) + LIBS="-lrecode $LIBS" ;; esac @@ -80691,122 +80751,123 @@ fi - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_recode_recode_format_table - + old_LDFLAGS=$LDFLAGS old_LIBS=$LIBS LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" LIBS="$LIBS -lrecode" - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ char *program_name; - -int main() { + +int +main () +{ recode_format_table(); - -; return 0; } -EOF -if { (eval echo configure:80720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + if test "$ext_shared" = "yes"; then RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" if test -n "$RECODE_DIR/$RECODE_LIB"; then - + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ai_p=$RECODE_DIR/$RECODE_LIB else - + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" fi - + if test "$ext_shared" = "yes"; then RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$RECODE_DIR/$RECODE_LIB"; then - + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ai_p=$RECODE_DIR/$RECODE_LIB else - + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 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 recode in c|c_r|pthread*) ;; - *) - DLIBS="-lrecode $DLIBS" + *) + DLIBS="-lrecode $DLIBS" ;; esac @@ -80816,106 +80877,74 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_BROKEN_RECODE 1 -EOF - +$as_echo "#define HAVE_BROKEN_RECODE 1" >>confdefs.h + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } - + + as_fn_error $? "I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" "$LINENO" 5 + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS - - + + fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBRECODE 1 -EOF - +$as_echo "#define HAVE_LIBRECODE 1" >>confdefs.h + + if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then - + if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then ai_p=$RECODE_DIR/$RECODE_INC else - + ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" 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 - + PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" - for ac_hdr in stdbool.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:80883: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:80893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDBOOL_H 1 +_ACEOF + fi + done - + ext_builddir=ext/recode ext_srcdir=$abs_srcdir/ext/recode @@ -80923,15 +80952,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_RECODE_SHARED=no - - + + case ext/recode in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -80944,12 +80973,12 @@ old_IFS=$IFS for ac_src in recode.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -80973,14 +81002,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_RECODE_SHARED=yes - + case ext/recode in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -80993,12 +81022,12 @@ old_IFS=$IFS for ac_src in recode.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" case $ac_src in @@ -81016,7 +81045,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -81026,7 +81055,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(RECODE_SHARED_LIBADD)' ;; *) suffix=la @@ -81039,7 +81068,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_RECODE 1 -EOF +_ACEOF fi fi @@ -81101,15 +81131,15 @@ PHP_RECODE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/recode in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81122,12 +81152,12 @@ old_IFS=$IFS for ac_src in recode.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81147,15 +81177,15 @@ EXT_STATIC="$EXT_STATIC recode" ;; *) - - + + case ext/recode in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81168,12 +81198,12 @@ old_IFS=$IFS for ac_src in recode.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81194,15 +81224,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC recode" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=recode - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -81210,9 +81240,8 @@ fi -cat >> confdefs.h <<\EOF -#define HAVE_REFLECTION 1 -EOF + +$as_echo "#define HAVE_REFLECTION 1" >>confdefs.h ext_builddir=ext/reflection @@ -81222,15 +81251,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_REFLECTION_SHARED=no - - + + case ext/reflection in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81243,12 +81272,12 @@ old_IFS=$IFS for ac_src in php_reflection.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81272,14 +81301,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_REFLECTION_SHARED=yes - + case ext/reflection in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -81292,12 +81321,12 @@ old_IFS=$IFS for ac_src in php_reflection.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" case $ac_src in @@ -81315,7 +81344,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -81325,7 +81354,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(REFLECTION_SHARED_LIBADD)' ;; *) suffix=la @@ -81338,7 +81367,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_REFLECTION 1 -EOF +_ACEOF fi fi @@ -81400,15 +81430,15 @@ PHP_REFLECTION_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/reflection in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81421,12 +81451,12 @@ old_IFS=$IFS for ac_src in php_reflection.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81446,15 +81476,15 @@ EXT_STATIC="$EXT_STATIC reflection" ;; *) - - + + case ext/reflection in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81467,12 +81497,12 @@ old_IFS=$IFS for ac_src in php_reflection.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81493,15 +81523,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=reflection - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -81511,14 +81541,13 @@ php_enable_session=yes -echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 -echo "configure:81516: checking whether to enable PHP sessions" >&5 -# Check whether --enable-session or --disable-session was given. -if test "${enable_session+set}" = set; then - enableval="$enable_session" - PHP_SESSION=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5 +$as_echo_n "checking whether to enable PHP sessions... " >&6; } +# Check whether --enable-session was given. +if test "${enable_session+set}" = set; then : + enableval=$enable_session; PHP_SESSION=$enableval else - + PHP_SESSION=yes test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL @@ -81547,7 +81576,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -81555,43 +81585,43 @@ php_with_mm=no -echo $ac_n "checking for mm support""... $ac_c" 1>&6 -echo "configure:81560: checking for mm support" >&5 -# Check whether --with-mm or --without-mm was given. -if test "${with_mm+set}" = set; then - withval="$with_mm" - PHP_MM=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5 +$as_echo_n "checking for mm support... " >&6; } + +# Check whether --with-mm was given. +if test "${with_mm+set}" = set; then : + withval=$with_mm; PHP_MM=$withval else - + PHP_MM=no - + fi ext_output=$PHP_MM -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SESSION" != "no"; then - - echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 -echo "configure:81582: checking whether pwrite works" >&5 -if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5 +$as_echo_n "checking whether pwrite works... " >&6; } +if ${ac_cv_pwrite+:} false; then : + $as_echo_n "(cached) " >&6 else - - - if test "$cross_compiling" = yes; then - + + + if test "$cross_compiling" = yes; then : + ac_cv_pwrite=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -81609,35 +81639,31 @@ exit(0); } - -EOF -if { (eval echo configure:81615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pwrite=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + ac_cv_pwrite=no + +else + ac_cv_pwrite=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test "$ac_cv_pwrite" = "no"; then - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + ac_cv_pwrite=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -81655,22 +81681,19 @@ exit(0); } - -EOF -if { (eval echo configure:81661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pwrite=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_pwrite=no - + +else + + ac_cv_pwrite=no + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -81678,41 +81701,38 @@ ac_cv_pwrite=64 fi fi - -fi -echo "$ac_t""$ac_cv_pwrite" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5 +$as_echo "$ac_cv_pwrite" >&6; } if test "$ac_cv_pwrite" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_PWRITE 1 -EOF + +$as_echo "#define HAVE_PWRITE 1" >>confdefs.h if test "$ac_cv_pwrite" = "64"; then - cat >> confdefs.h <<\EOF -#define PHP_PWRITE_64 1 -EOF + +$as_echo "#define PHP_PWRITE_64 1" >>confdefs.h fi - fi + fi + - - echo $ac_n "checking whether pread works""... $ac_c" 1>&6 -echo "configure:81702: checking whether pread works" >&5 -if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5 +$as_echo_n "checking whether pread works... " >&6; } +if ${ac_cv_pread+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + echo test > conftest_in - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + ac_cv_pread=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -81721,7 +81741,7 @@ #include main() { - char buf[3]; + char buf[3]; int fd = open("conftest_in", O_RDONLY); if (fd < 0) exit(1); if (pread(fd, buf, 2, 0) != 2) exit(1); @@ -81729,37 +81749,33 @@ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); exit(0); } - -EOF -if { (eval echo configure:81735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pread=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_pread=no - + +else + + ac_cv_pread=no + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f conftest_in if test "$ac_cv_pread" = "no"; then - + echo test > conftest_in - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + ac_cv_pread=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -81768,7 +81784,7 @@ #include ssize_t pread(int, void *, size_t, off64_t); main() { - char buf[3]; + char buf[3]; int fd = open("conftest_in", O_RDONLY); if (fd < 0) exit(1); if (pread(fd, buf, 2, 0) != 2) exit(1); @@ -81776,22 +81792,19 @@ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); exit(0); } - -EOF -if { (eval echo configure:81782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pread=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + ac_cv_pread=no + +else + ac_cv_pread=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f conftest_in @@ -81800,25 +81813,23 @@ ac_cv_pread=64 fi fi - -fi -echo "$ac_t""$ac_cv_pread" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5 +$as_echo "$ac_cv_pread" >&6; } if test "$ac_cv_pread" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_PREAD 1 -EOF + +$as_echo "#define HAVE_PREAD 1" >>confdefs.h if test "$ac_cv_pread" = "64"; then - cat >> confdefs.h <<\EOF -#define PHP_PREAD_64 1 -EOF + +$as_echo "#define PHP_PREAD_64 1" >>confdefs.h fi - fi + fi + - ext_builddir=ext/session ext_srcdir=$abs_srcdir/ext/session @@ -81826,15 +81837,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SESSION_SHARED=no - - + + case ext/session in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -81847,12 +81858,12 @@ old_IFS=$IFS for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -81876,14 +81887,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SESSION_SHARED=yes - + case ext/session in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -81896,12 +81907,12 @@ old_IFS=$IFS for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" case $ac_src in @@ -81919,7 +81930,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -81929,7 +81940,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(SESSION_SHARED_LIBADD)' ;; *) suffix=la @@ -81942,7 +81953,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SESSION 1 -EOF +_ACEOF fi fi @@ -82004,15 +82016,15 @@ PHP_SESSION_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/session in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -82025,12 +82037,12 @@ old_IFS=$IFS for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -82050,15 +82062,15 @@ EXT_STATIC="$EXT_STATIC session" ;; *) - - + + case ext/session in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -82071,12 +82083,12 @@ old_IFS=$IFS for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -82097,83 +82109,82 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC session" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=session - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + am_i_shared=$PHP_SESSION_SHARED is_it_shared=$PHP_HASH_SHARED is_it_enabled=$PHP_HASH if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + am_i_shared=$PHP_SESSION_SHARED is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" - - + + header_path=ext/session for header_file in php_session.h mod_files.h mod_user.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done - cat >> confdefs.h <<\EOF -#define HAVE_PHP_SESSION 1 -EOF + + +$as_echo "#define HAVE_PHP_SESSION 1" >>confdefs.h fi @@ -82183,97 +82194,97 @@ done if test -z "$MM_DIR" ; then - { echo "configure: error: cannot find mm library" 1>&2; exit 1; } + as_fn_error $? "cannot find mm library" "$LINENO" 5 fi - - + + if test "$ext_shared" = "yes"; then SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" if test -n "$MM_DIR/$PHP_LIBDIR"; then - + if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$MM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$MM_DIR/$PHP_LIBDIR"; then - + if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$MM_DIR/$PHP_LIBDIR else - + ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MM_DIR/$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 mm in c|c_r|pthread*) ;; - *) - LIBS="-lmm $LIBS" + *) + LIBS="-lmm $LIBS" ;; esac @@ -82283,72 +82294,70 @@ fi - + if test "$MM_DIR/include" != "/usr/include"; then - + if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then ai_p=$MM_DIR/include else - + ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" 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 - - + + for header_file in ext/session/mod_mm.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done - cat >> confdefs.h <<\EOF -#define HAVE_LIBMM 1 -EOF + + +$as_echo "#define HAVE_LIBMM 1" >>confdefs.h fi php_enable_shmop=no -echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 -echo "configure:82346: checking whether to enable shmop support" >&5 -# Check whether --enable-shmop or --disable-shmop was given. -if test "${enable_shmop+set}" = set; then - enableval="$enable_shmop" - PHP_SHMOP=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5 +$as_echo_n "checking whether to enable shmop support... " >&6; } +# Check whether --enable-shmop was given. +if test "${enable_shmop+set}" = set; then : + enableval=$enable_shmop; PHP_SHMOP=$enableval else - + PHP_SHMOP=no test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL @@ -82377,17 +82386,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SHMOP" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_SHMOP 1 -EOF - +$as_echo "#define HAVE_SHMOP 1" >>confdefs.h + + ext_builddir=ext/shmop ext_srcdir=$abs_srcdir/ext/shmop @@ -82395,15 +82404,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SHMOP_SHARED=no - - + + case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -82416,12 +82425,12 @@ old_IFS=$IFS for ac_src in shmop.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -82445,14 +82454,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SHMOP_SHARED=yes - + case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -82465,12 +82474,12 @@ old_IFS=$IFS for ac_src in shmop.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" case $ac_src in @@ -82488,7 +82497,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -82498,7 +82507,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(SHMOP_SHARED_LIBADD)' ;; *) suffix=la @@ -82511,7 +82520,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SHMOP 1 -EOF +_ACEOF fi fi @@ -82573,15 +82583,15 @@ PHP_SHMOP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -82594,12 +82604,12 @@ old_IFS=$IFS for ac_src in shmop.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -82619,15 +82629,15 @@ EXT_STATIC="$EXT_STATIC shmop" ;; *) - - + + case ext/shmop in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -82640,12 +82650,12 @@ old_IFS=$IFS for ac_src in shmop.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -82666,15 +82676,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=shmop - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -82685,14 +82695,13 @@ php_enable_simplexml=yes -echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 -echo "configure:82690: checking whether to enable SimpleXML support" >&5 -# Check whether --enable-simplexml or --disable-simplexml was given. -if test "${enable_simplexml+set}" = set; then - enableval="$enable_simplexml" - PHP_SIMPLEXML=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5 +$as_echo_n "checking whether to enable SimpleXML support... " >&6; } +# Check whether --enable-simplexml was given. +if test "${enable_simplexml+set}" = set; then : + enableval=$enable_simplexml; PHP_SIMPLEXML=$enableval else - + PHP_SIMPLEXML=yes test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL @@ -82721,31 +82730,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:82735: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -82753,17 +82764,17 @@ if test "$PHP_SIMPLEXML" != "no"; then - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + if test "$PHP_LIBXML" = "no"; then + as_fn_error $? "SimpleXML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:82763: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -82772,8 +82783,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -82786,17 +82797,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -82807,20 +82818,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" + SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -82833,80 +82844,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -82916,74 +82927,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:82921: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $SIMPLEXML_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:82948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_SIMPLEXML 1 -EOF - + +$as_echo "#define HAVE_SIMPLEXML 1" >>confdefs.h + + ext_builddir=ext/simplexml ext_srcdir=$abs_srcdir/ext/simplexml @@ -82991,15 +82997,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SIMPLEXML_SHARED=no - - + + case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -83012,12 +83018,12 @@ old_IFS=$IFS for ac_src in simplexml.c sxe.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -83041,14 +83047,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SIMPLEXML_SHARED=yes - + case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -83061,12 +83067,12 @@ old_IFS=$IFS for ac_src in simplexml.c sxe.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" case $ac_src in @@ -83084,7 +83090,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -83094,7 +83100,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(SIMPLEXML_SHARED_LIBADD)' ;; *) suffix=la @@ -83107,7 +83113,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SIMPLEXML 1 -EOF +_ACEOF fi fi @@ -83169,15 +83176,15 @@ PHP_SIMPLEXML_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -83190,12 +83197,12 @@ old_IFS=$IFS for ac_src in simplexml.c sxe.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -83215,15 +83222,15 @@ EXT_STATIC="$EXT_STATIC simplexml" ;; *) - - + + case ext/simplexml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -83236,12 +83243,12 @@ old_IFS=$IFS for ac_src in simplexml.c sxe.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -83262,83 +83269,83 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=simplexml - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD" - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + fi - + am_i_shared=$PHP_SIMPLEXML_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + am_i_shared=$PHP_SIMPLEXML_SHARED is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + fi php_with_snmp=no -echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 -echo "configure:83336: checking for SNMP support" >&5 -# Check whether --with-snmp or --without-snmp was given. -if test "${with_snmp+set}" = set; then - withval="$with_snmp" - PHP_SNMP=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5 +$as_echo_n "checking for SNMP support... " >&6; } + +# Check whether --with-snmp was given. +if test "${with_snmp+set}" = set; then : + withval=$with_snmp; PHP_SNMP=$withval else - + PHP_SNMP=no test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL @@ -83367,7 +83374,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -83375,22 +83383,23 @@ php_with_openssl_dir=no -echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 -echo "configure:83380: checking OpenSSL dir for SNMP" >&5 -# Check whether --with-openssl-dir or --without-openssl-dir was given. -if test "${with_openssl_dir+set}" = set; then - withval="$with_openssl_dir" - PHP_OPENSSL_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL dir for SNMP" >&5 +$as_echo_n "checking OpenSSL dir for SNMP... " >&6; } + +# Check whether --with-openssl-dir was given. +if test "${with_openssl_dir+set}" = set; then : + withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval else - + PHP_OPENSSL_DIR=no - + fi ext_output=$PHP_OPENSSL_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -83398,22 +83407,22 @@ php_enable_ucd_snmp_hack=no -echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 -echo "configure:83403: checking whether to enable UCD SNMP hack" >&5 -# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. -if test "${enable_ucd_snmp_hack+set}" = set; then - enableval="$enable_ucd_snmp_hack" - PHP_UCD_SNMP_HACK=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable UCD SNMP hack" >&5 +$as_echo_n "checking whether to enable UCD SNMP hack... " >&6; } +# Check whether --enable-ucd-snmp-hack was given. +if test "${enable_ucd_snmp_hack+set}" = set; then : + enableval=$enable_ucd_snmp_hack; PHP_UCD_SNMP_HACK=$enableval else - + PHP_UCD_SNMP_HACK=no - + fi ext_output=$PHP_UCD_SNMP_HACK -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -83423,39 +83432,45 @@ if test "$PHP_SNMP" = "yes"; then # Extract the first word of "net-snmp-config", so it can be a program name with args. set dummy net-snmp-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:83428: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SNMP_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - case "$SNMP_CONFIG" in - /*) + case $SNMP_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/local/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/usr/local/bin:$PATH" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + ;; esac fi -SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG" +SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG if test -n "$SNMP_CONFIG"; then - echo "$ac_t""$SNMP_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5 +$as_echo "$SNMP_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + else SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" fi @@ -83466,48 +83481,48 @@ SNMP_PREFIX=`$SNMP_CONFIG --prefix` if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - + if test "${SNMP_PREFIX}/include" != "/usr/include"; then - + if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then ai_p=${SNMP_PREFIX}/include else - + ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" 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 - + for ac_i in $SNMP_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -83518,20 +83533,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -83544,59 +83559,58 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - cat >> confdefs.h <<\EOF -#define HAVE_NET_SNMP 1 -EOF + +$as_echo "#define HAVE_NET_SNMP 1" >>confdefs.h SNMP_LIBNAME=netsnmp else - { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } + as_fn_error $? "Could not find the required paths. Please check your net-snmp installation." "$LINENO" 5 fi - else + else + - if test "$PHP_SNMP" = "yes"; then for i in /usr/include /usr/local/include; do test -f $i/snmp.h && SNMP_INCDIR=$i @@ -83614,95 +83628,65 @@ fi if test -z "$SNMP_INCDIR"; then - { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } + as_fn_error $? "snmp.h not found. Check your SNMP installation." "$LINENO" 5 elif test -z "$SNMP_LIBDIR"; then - { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } + as_fn_error $? "libsnmp not found. Check your SNMP installation." "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$SNMP_INCDIR - for ac_hdr in default_store.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:83629: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:83639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + for ac_header in default_store.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "default_store.h" "ac_cv_header_default_store_h" "$ac_includes_default" +if test "x$ac_cv_header_default_store_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DEFAULT_STORE_H 1 +_ACEOF + fi + done if test "$ac_cv_header_default_store_h" = "yes"; then - echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 -echo "configure:83667: checking for OpenSSL support in SNMP libraries" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for OpenSSL support in SNMP libraries... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if USE_OPENSSL yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + SNMP_SSL=yes - + else - rm -rf conftest* - + SNMP_SSL=no - + fi rm -f conftest* fi CPPFLAGS=$old_CPPFLAGS - echo "$ac_t""$SNMP_SSL" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_SSL" >&5 +$as_echo "$SNMP_SSL" >&6; } + if test "$SNMP_SSL" = "yes"; then if test "$PHP_OPENSSL_DIR" != "no"; then PHP_OPENSSL=$PHP_OPENSSL_DIR fi - + if test "$PHP_OPENSSL" = "no"; then - { echo "configure: error: The UCD-SNMP in this system is built with SSL support. + as_fn_error $? "The UCD-SNMP in this system is built with SSL support. - Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } + Add --with-openssl-dir=DIR to your configure line." "$LINENO" 5 else - + found_openssl=no unset OPENSSL_INCDIR unset OPENSSL_LIBDIR @@ -83719,40 +83703,45 @@ 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 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:83724: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_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="$ac_save_ifs" +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" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then @@ -83762,21 +83751,21 @@ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 fi if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then - + for ac_i in $OPENSSL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -83787,20 +83776,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -83813,80 +83802,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $OPENSSL_INCS; 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 @@ -83899,7 +83888,7 @@ fi if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -83915,94 +83904,92 @@ done if test -z "$OPENSSL_INCDIR"; then - { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's " "$LINENO" 5 fi if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } + as_fn_error $? "Cannot find OpenSSL's libraries" "$LINENO" 5 fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:83929: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for OpenSSL version... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #if OPENSSL_VERSION_NUMBER >= 0x0090600fL yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - - echo "$ac_t"">= 0.9.6" 1>&6 - + $EGREP "yes" >/dev/null 2>&1; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5 +$as_echo ">= 0.9.6" >&6; } + else - rm -rf conftest* - - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - + + as_fn_error $? "OpenSSL version 0.9.6 or greater required." "$LINENO" 5 + fi rm -f conftest* CPPFLAGS=$old_CPPFLAGS - + if test "$OPENSSL_INCDIR" != "/usr/include"; then - + if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_INCDIR else - + ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 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 - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -84013,20 +84000,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -84039,146 +84026,123 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:84086: checking for CRYPTO_free in -lcrypto" >&5 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_crypto_CRYPTO_free+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -CRYPTO_free() -; return 0; } -EOF -if { (eval echo configure:84105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char CRYPTO_free (); +int +main () +{ +return CRYPTO_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_CRYPTO_free=yes +else + ac_cv_lib_crypto_CRYPTO_free=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 +$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; } +if test "x$ac_cv_lib_crypto_CRYPTO_free" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - - case crypto in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" - else - - - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; - esac - - - fi - ;; - esac - + : - - else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_crypto_CRYPTO_free - - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libcrypto not found!" "$LINENO" 5 + + fi old_LIBS=$LIBS LIBS="$LIBS -lcrypto" - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$OPENSSL_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -84189,20 +84153,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -84215,117 +84179,141 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:84262: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -SSL_CTX_set_ssl_version() -; return 0; } -EOF -if { (eval echo configure:84281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_ssl_version (); +int +main () +{ +return SSL_CTX_set_ssl_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes +else + ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_openssl=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version - - { echo "configure: error: libssl not found!" 1>&2; exit 1; } - - + + as_fn_error $? "libssl not found!" "$LINENO" 5 + + fi LIBS=$old_LIBS - - + + case ssl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" + SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" else - - + + case ssl in c|c_r|pthread*) ;; - *) - LIBS="-lssl $LIBS" + *) + LIBS="-lssl $LIBS" + ;; + esac + + + fi + ;; + esac + + + + + case crypto in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" + else + + + case crypto in + c|c_r|pthread*) ;; + *) + LIBS="-lcrypto $LIBS" ;; esac @@ -84336,108 +84324,110 @@ - + if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then - + if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$OPENSSL_LIBDIR else - + ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" else - - - + + + 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 fi if test "$found_openssl" = "yes"; then OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - + : -else - { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } - +else + as_fn_error $? "SNMP: OpenSSL check failed. Please check config.log for more information." "$LINENO" 5 + fi fi fi - echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -echo "configure:84394: checking for kstat_read in -lkstat" >&5 -ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_read in -lkstat" >&5 +$as_echo_n "checking for kstat_read in -lkstat... " >&6; } +if ${ac_cv_lib_kstat_kstat_read+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lkstat $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char kstat_read (); +int +main () +{ +return kstat_read (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_kstat_kstat_read=yes +else + ac_cv_lib_kstat_kstat_read=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_read" >&5 +$as_echo "$ac_cv_lib_kstat_kstat_read" >&6; } +if test "x$ac_cv_lib_kstat_kstat_read" = xyes; then : -int main() { -kstat_read() -; return 0; } -EOF -if { (eval echo configure:84413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - case kstat in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" + SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" else - - + + case kstat in c|c_r|pthread*) ;; - *) - LIBS="-lkstat $LIBS" + *) + LIBS="-lkstat $LIBS" ;; esac @@ -84446,130 +84436,128 @@ ;; esac - -else - echo "$ac_t""no" 1>&6 + fi - + if test "$SNMP_INCDIR" != "/usr/include"; then - + if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then ai_p=$SNMP_INCDIR else - + ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" 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 - + if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" if test -n "$SNMP_LIBDIR"; then - + if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then - + if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SNMP_LIBDIR else - + ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$SNMP_LIBDIR"; then - + if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then - + if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SNMP_LIBDIR else - + ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SNMP_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 + + + + + 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 snmp in c|c_r|pthread*) ;; - *) - LIBS="-lsnmp $LIBS" + *) + LIBS="-lsnmp $LIBS" ;; esac @@ -84582,25 +84570,25 @@ SNMP_LIBNAME=snmp fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $SNMP_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -84611,20 +84599,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -84637,123 +84625,125 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:84684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 -ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_snmp_parse_oid" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 +$as_echo_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$SNMP_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -snmp_parse_oid() -; return 0; } -EOF -if { (eval echo configure:84703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snmp_parse_oid (); +int +main () +{ +return snmp_parse_oid (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_SNMP_PARSE_OID 1 -EOF - - + +$as_echo "#define HAVE_SNMP_PARSE_OID 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" $SNMP_SHARED_LIBADD " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -84764,20 +84754,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -84790,114 +84780,115 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:84837: checking for init_snmp in -l$SNMP_LIBNAME" >&5 -ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$SNMP_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -init_snmp() -; return 0; } -EOF -if { (eval echo configure:84856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char init_snmp (); +int +main () +{ +return init_snmp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "$as_ac_Lib=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_SNMP 1 -EOF - - + +$as_echo "#define HAVE_SNMP 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$SNMP_LIBNAME_init_snmp - - { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } - - + + as_fn_error $? "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5 + + fi if test "$PHP_UCD_SNMP_HACK" = "yes" ; then - cat >> confdefs.h <<\EOF -#define UCD_SNMP_HACK 1 -EOF + +$as_echo "#define UCD_SNMP_HACK 1" >>confdefs.h fi - - + + ext_builddir=ext/snmp ext_srcdir=$abs_srcdir/ext/snmp @@ -84905,15 +84896,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SNMP_SHARED=no - - + + case ext/snmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -84926,12 +84917,12 @@ old_IFS=$IFS for ac_src in snmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -84955,14 +84946,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SNMP_SHARED=yes - + case ext/snmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -84975,12 +84966,12 @@ old_IFS=$IFS for ac_src in snmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" case $ac_src in @@ -84998,7 +84989,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -85008,7 +84999,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(SNMP_SHARED_LIBADD)' ;; *) suffix=la @@ -85021,7 +85012,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SNMP 1 -EOF +_ACEOF fi fi @@ -85083,15 +85075,15 @@ PHP_SNMP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/snmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -85104,12 +85096,12 @@ old_IFS=$IFS for ac_src in snmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -85129,15 +85121,15 @@ EXT_STATIC="$EXT_STATIC snmp" ;; *) - - + + case ext/snmp in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -85150,12 +85142,12 @@ old_IFS=$IFS for ac_src in snmp.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -85176,20 +85168,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=snmp - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD" fi @@ -85198,14 +85190,13 @@ php_enable_soap=no -echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 -echo "configure:85203: checking whether to enable SOAP support" >&5 -# Check whether --enable-soap or --disable-soap was given. -if test "${enable_soap+set}" = set; then - enableval="$enable_soap" - PHP_SOAP=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5 +$as_echo_n "checking whether to enable SOAP support... " >&6; } +# Check whether --enable-soap was given. +if test "${enable_soap+set}" = set; then : + enableval=$enable_soap; PHP_SOAP=$enableval else - + PHP_SOAP=no test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL @@ -85234,31 +85225,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:85248: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -85266,17 +85259,17 @@ if test "$PHP_SOAP" != "no"; then - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + if test "$PHP_LIBXML" = "no"; then + as_fn_error $? "SOAP extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:85276: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -85285,8 +85278,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -85299,17 +85292,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -85320,20 +85313,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" + SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -85346,80 +85339,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -85429,74 +85422,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:85434: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $SOAP_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:85461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_SOAP 1 -EOF - + +$as_echo "#define HAVE_SOAP 1" >>confdefs.h + + ext_builddir=ext/soap ext_srcdir=$abs_srcdir/ext/soap @@ -85504,15 +85492,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SOAP_SHARED=no - - + + case ext/soap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -85525,12 +85513,12 @@ old_IFS=$IFS for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -85554,14 +85542,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SOAP_SHARED=yes - + case ext/soap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -85574,12 +85562,12 @@ old_IFS=$IFS for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" case $ac_src in @@ -85597,7 +85585,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -85607,7 +85595,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(SOAP_SHARED_LIBADD)' ;; *) suffix=la @@ -85620,7 +85608,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SOAP 1 -EOF +_ACEOF fi fi @@ -85682,15 +85671,15 @@ PHP_SOAP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/soap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -85703,12 +85692,12 @@ old_IFS=$IFS for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -85728,15 +85717,15 @@ EXT_STATIC="$EXT_STATIC soap" ;; *) - - + + case ext/soap in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -85749,12 +85738,12 @@ old_IFS=$IFS for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -85775,29 +85764,29 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC soap" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=soap - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD" - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + fi fi @@ -85806,14 +85795,13 @@ php_enable_sockets=no -echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -echo "configure:85811: checking whether to enable sockets support" >&5 -# Check whether --enable-sockets or --disable-sockets was given. -if test "${enable_sockets+set}" = set; then - enableval="$enable_sockets" - PHP_SOCKETS=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5 +$as_echo_n "checking whether to enable sockets support... " >&6; } +# Check whether --enable-sockets was given. +if test "${enable_sockets+set}" = set; then : + enableval=$enable_sockets; PHP_SOCKETS=$enableval else - + PHP_SOCKETS=no test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL @@ -85842,175 +85830,102 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SOCKETS" != "no"; then - echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 -echo "configure:85853: checking for struct cmsghdr" >&5 -if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for struct cmsghdr... " >&6; } +if ${ac_cv_cmsghdr+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ struct cmsghdr s; s -; return 0; } -EOF -if { (eval echo configure:85868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_cmsghdr=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_cmsghdr=no fi -rm -f conftest* - -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$ac_cv_cmsghdr" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsghdr" >&5 +$as_echo "$ac_cv_cmsghdr" >&6; } if test "$ac_cv_cmsghdr" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_CMSGHDR 1 -EOF - fi - - for ac_func in hstrerror socketpair -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:85893: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { +$as_echo "#define HAVE_CMSGHDR 1" >>confdefs.h -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif + fi -; return 0; } -EOF -if { (eval echo configure:85921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + for ac_func in hstrerror socketpair +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:85949: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:85959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + for ac_header in netdb.h netinet/tcp.h sys/un.h errno.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include - -int main() { + +int +main () +{ static struct msghdr tp; int n = (int) tp.msg_flags; return n -; return 0; } -EOF -if { (eval echo configure:85996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cat >> confdefs.h <<\EOF -#define MISSING_MSGHDR_MSGFLAGS 1 -EOF - +$as_echo "#define MISSING_MSGHDR_MSGFLAGS 1" >>confdefs.h + + fi -rm -f conftest* - cat >> confdefs.h <<\EOF -#define HAVE_SOCKETS 1 -EOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h + - ext_builddir=ext/sockets ext_srcdir=$abs_srcdir/ext/sockets @@ -86018,15 +85933,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SOCKETS_SHARED=no - - + + case ext/sockets in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86039,12 +85954,12 @@ old_IFS=$IFS for ac_src in sockets.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86068,14 +85983,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SOCKETS_SHARED=yes - + case ext/sockets in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -86088,12 +86003,12 @@ old_IFS=$IFS for ac_src in sockets.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" case $ac_src in @@ -86111,7 +86026,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -86121,7 +86036,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(SOCKETS_SHARED_LIBADD)' ;; *) suffix=la @@ -86134,7 +86049,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SOCKETS 1 -EOF +_ACEOF fi fi @@ -86196,15 +86112,15 @@ PHP_SOCKETS_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sockets in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86217,12 +86133,12 @@ old_IFS=$IFS for ac_src in sockets.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86242,15 +86158,15 @@ EXT_STATIC="$EXT_STATIC sockets" ;; *) - - + + case ext/sockets in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86263,12 +86179,12 @@ old_IFS=$IFS for ac_src in sockets.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86289,90 +86205,89 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sockets - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + header_path=ext/sockets/ for header_file in php_sockets.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + fi - echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 -echo "configure:86330: checking whether zend_object_value is packed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zend_object_value is packed" >&5 +$as_echo_n "checking whether zend_object_value is packed... " >&6; } old_CPPFLAGS=$CPPFLAGS CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + ac_result=0 - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include "Zend/zend_types.h" int main(int argc, char **argv) { return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1; } - -EOF -if { (eval echo configure:86349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_result=1 - echo "$ac_t""yes" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_result=0 - echo "$ac_t""no" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi CPPFLAGS=$old_CPPFLAGS - cat >> confdefs.h <>confdefs.h <<_ACEOF #define HAVE_PACKED_OBJECT_VALUE $ac_result -EOF +_ACEOF + + +$as_echo "#define HAVE_SPL 1" >>confdefs.h + - cat >> confdefs.h <<\EOF -#define HAVE_SPL 1 -EOF - - ext_builddir=ext/spl ext_srcdir=$abs_srcdir/ext/spl @@ -86380,15 +86295,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_SPL_SHARED=no - - + + case ext/spl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86401,12 +86316,12 @@ old_IFS=$IFS for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86430,14 +86345,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_SPL_SHARED=yes - + case ext/spl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -86450,12 +86365,12 @@ old_IFS=$IFS for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" case $ac_src in @@ -86473,7 +86388,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -86483,7 +86398,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(SPL_SHARED_LIBADD)' ;; *) suffix=la @@ -86496,7 +86411,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SPL 1 -EOF +_ACEOF fi fi @@ -86558,15 +86474,15 @@ PHP_SPL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/spl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86579,12 +86495,12 @@ old_IFS=$IFS for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86604,15 +86520,15 @@ EXT_STATIC="$EXT_STATIC spl" ;; *) - - + + case ext/spl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -86625,12 +86541,12 @@ old_IFS=$IFS for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -86651,71 +86567,71 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC spl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=spl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + header_path=ext/spl for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do hp_hf="$header_path/$header_file" - - + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - + fi - done - + done + + - am_i_shared=$PHP_SPL_SHARED is_it_shared=$PHP_PCRE_SHARED is_it_enabled=$PHP_PCRE if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + php_with_sqlite=yes -echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 -echo "configure:86713: checking for sqlite support" >&5 -# Check whether --with-sqlite or --without-sqlite was given. -if test "${with_sqlite+set}" = set; then - withval="$with_sqlite" - PHP_SQLITE=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite support" >&5 +$as_echo_n "checking for sqlite support... " >&6; } + +# Check whether --with-sqlite was given. +if test "${with_sqlite+set}" = set; then : + withval=$with_sqlite; PHP_SQLITE=$withval else - + PHP_SQLITE=yes test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL @@ -86744,7 +86660,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -86752,22 +86669,22 @@ php_enable_sqlite_utf8=no -echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -echo "configure:86757: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 -# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. -if test "${enable_sqlite_utf8+set}" = set; then - enableval="$enable_sqlite_utf8" - PHP_SQLITE_UTF8=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 +$as_echo_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)... " >&6; } +# Check whether --enable-sqlite-utf8 was given. +if test "${enable_sqlite_utf8+set}" = set; then : + enableval=$enable_sqlite_utf8; PHP_SQLITE_UTF8=$enableval else - + PHP_SQLITE_UTF8=no - + fi ext_output=$PHP_SQLITE_UTF8 -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -86779,15 +86696,15 @@ if test "$PHP_SQLITE" != "no"; then if test "$PHP_PDO" != "no"; then - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:86785: checking for PDO includes" >&5 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:86791: checking for PDO includes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } +if ${pdo_inc_path+:} false; then : + $as_echo_n "(cached) " >&6 +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 +$as_echo_n "checking for PDO includes... " >&6; } if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -86795,24 +86712,24 @@ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$prefix/include/php/ext fi - -fi -echo "$ac_t""$pdo_inc_path" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_inc_path" >&5 +$as_echo "$pdo_inc_path" >&6; } if test -n "$pdo_inc_path"; then : else -echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find php_pdo_driver.h." >&5 +$as_echo "$as_me: WARNING: Cannot find php_pdo_driver.h." >&2;} fi if test -n "$pdo_inc_path"; then - cat >> confdefs.h <<\EOF -#define PHP_SQLITE2_HAVE_PDO 1 -EOF + +$as_echo "#define PHP_SQLITE2_HAVE_PDO 1" >>confdefs.h pdo_inc_path="-I$pdo_inc_path" fi - fi + fi if test "$PHP_SQLITE" != "yes"; then SEARCH_PATH="/usr/local /usr" @@ -86820,40 +86737,42 @@ if test -r $PHP_SQLITE/; then # path given as parameter SQLITE_DIR=$PHP_SQLITE else # search default path list - echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 -echo "configure:86825: checking for sqlite files in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite files in default path" >&5 +$as_echo_n "checking for sqlite files in default path... " >&6; } for i in $SEARCH_PATH ; do if test -r $i/$SEARCH_FOR; then SQLITE_DIR=$i - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } fi done fi - + if test -z "$SQLITE_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } + { $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 fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$SQLITE_DIR/$PHP_LIBDIR -lm " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -86864,20 +86783,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -86890,175 +86809,177 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 -echo "configure:86937: checking for sqlite_open in -lsqlite" >&5 -ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_open in -lsqlite" >&5 +$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_open+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -sqlite_open() -; return 0; } -EOF -if { (eval echo configure:86956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite_open (); +int +main () +{ +return sqlite_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sqlite_sqlite_open=yes +else + ac_cv_lib_sqlite_sqlite_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_open" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_open" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_open" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + if test "$ext_shared" = "yes"; then SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - + if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SQLITE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - + if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SQLITE_DIR/$PHP_LIBDIR else - + ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$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 sqlite in c|c_r|pthread*) ;; - *) - LIBS="-lsqlite $LIBS" + *) + LIBS="-lsqlite $LIBS" ;; esac @@ -87068,96 +86989,103 @@ fi - + if test "$SQLITE_DIR/include" != "/usr/include"; then - + if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then ai_p=$SQLITE_DIR/include else - + ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" 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 - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sqlite_sqlite_open - - { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } - - + + as_fn_error $? "wrong sqlite lib version or lib not found" "$LINENO" 5 + + fi SQLITE_MODULE_TYPE=external PHP_SQLITE_CFLAGS=$pdo_inc_path - sqlite_extra_sources="libsqlite/src/encode.c" + sqlite_extra_sources="" else # use bundled library - + # we only support certain lemon versions lemon_version_list="1.0" # Extract the first word of "lemon", so it can be a program name with args. set dummy lemon; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:87129: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LEMON+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$LEMON"; then ac_cv_prog_LEMON="$LEMON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LEMON="lemon" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LEMON="lemon" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + fi fi -LEMON="$ac_cv_prog_LEMON" +LEMON=$ac_cv_prog_LEMON if test -n "$LEMON"; then - echo "$ac_t""$LEMON" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEMON" >&5 +$as_echo "$LEMON" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$LEMON"; then - echo $ac_n "checking for lemon version""... $ac_c" 1>&6 -echo "configure:87157: checking for lemon version" >&5 -if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lemon version" >&5 +$as_echo_n "checking for lemon version... " >&6; } +if ${php_cv_lemon_version+:} false; then : + $as_echo_n "(cached) " >&6 else - + lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` php_cv_lemon_version=invalid for lemon_check_version in $lemon_version_list; do @@ -87165,21 +87093,22 @@ php_cv_lemon_version="$lemon_check_version (ok)" fi done - -fi -echo "$ac_t""$php_cv_lemon_version" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_lemon_version" >&5 +$as_echo "$php_cv_lemon_version" >&6; } else lemon_version=none fi case $php_cv_lemon_version in ""|invalid) lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." - echo "configure: warning: $lemon_msg" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $lemon_msg" >&5 +$as_echo "$as_me: WARNING: $lemon_msg" >&2;} LEMON="exit 0;" ;; esac - + PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" @@ -87199,8 +87128,8 @@ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ libsqlite/src/where.c libsqlite/src/trigger.c" fi - sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" - + sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" + ext_builddir=ext/sqlite ext_srcdir=$abs_srcdir/ext/sqlite @@ -87208,15 +87137,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SQLITE_SHARED=no - - + + case ext/sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -87229,12 +87158,12 @@ old_IFS=$IFS for ac_src in $sqlite_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -87258,14 +87187,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SQLITE_SHARED=yes - + case ext/sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -87278,12 +87207,12 @@ old_IFS=$IFS for ac_src in $sqlite_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" case $ac_src in @@ -87301,7 +87230,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -87311,7 +87240,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(SQLITE_SHARED_LIBADD)' ;; *) suffix=la @@ -87324,7 +87253,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SQLITE 1 -EOF +_ACEOF fi fi @@ -87386,15 +87316,15 @@ PHP_SQLITE_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -87407,12 +87337,12 @@ old_IFS=$IFS for ac_src in $sqlite_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -87432,15 +87362,15 @@ EXT_STATIC="$EXT_STATIC sqlite" ;; *) - - + + case ext/sqlite in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -87453,12 +87383,12 @@ old_IFS=$IFS for ac_src in $sqlite_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -87479,150 +87409,142 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sqlite - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + am_i_shared=$PHP_SQLITE_SHARED is_it_shared=$PHP_SPL_SHARED is_it_enabled=$PHP_SPL if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: error: + as_fn_error $? " You've configured extension sqlite to build statically, but it depends on extension spl, which you've configured to build shared. You either need to build sqlite shared or build spl statically for the build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: error: + as_fn_error $? " You've configured extension sqlite, which depends on extension spl, but you've either not enabled spl, or have disabled it. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + am_i_shared=$PHP_SQLITE_SHARED is_it_shared=$PHP_PDO_SHARED is_it_enabled=$PHP_PDO if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: error: + as_fn_error $? " You've configured extension sqlite to build statically, but it depends on extension pdo, which you've configured to build shared. You either need to build sqlite shared or build pdo statically for the build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: error: + as_fn_error $? " You've configured extension sqlite, which depends on extension pdo, but you've either not enabled pdo, or have disabled it. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" - - + + for header_file in $ext_builddir/libsqlite/src/sqlite.h; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - if test "$SQLITE_MODULE_TYPE" = "builtin"; then - - + + $php_shtool mkdir -p $ext_builddir/libsqlite/src - - echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:87570: checking size of char *" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_char_p=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(char *)); - return(0); -} -EOF -if { (eval echo configure:87589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_char_p=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_char_p=0 -fi -rm -fr conftest* + + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${ac_cv_sizeof_char_p+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_char_p" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (char *) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_char_p=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_char_p" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p -EOF +_ACEOF - cat >> confdefs.h <<\EOF -#define SQLITE_PTR_SZ SIZEOF_CHAR_P -EOF + +$as_echo "#define SQLITE_PTR_SZ SIZEOF_CHAR_P" >>confdefs.h if test "$PHP_SQLITE_UTF8" = "yes"; then SQLITE_ENCODING="UTF8" - cat >> confdefs.h <<\EOF -#define SQLITE_UTF8 1 -EOF + +$as_echo "#define SQLITE_UTF8 1" >>confdefs.h else SQLITE_ENCODING="ISO8859" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` - + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" @@ -87633,7 +87555,7 @@ else echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h fi - + cat >> $ext_builddir/libsqlite/src/config.h <&6 -echo "configure:87651: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -int main() { +fi +done -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TIME_H 1 +_ACEOF -; return 0; } -EOF -if { (eval echo configure:87679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi done - for ac_hdr in time.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:87707: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:87717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 fi -done -fi +{ $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 ${ac_cv_flush_io+:} false; then : + $as_echo_n "(cached) " >&6 +else + +if test "$cross_compiling" = yes; then : -echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -echo "configure:87748: checking whether flush should be called explicitly after a buffered io" >&5 -if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes; then - ac_cv_flush_io=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -87766,14 +87616,14 @@ char *filename = tmpnam(NULL); char buffer[64]; int result = 0; - + FILE *fp = fopen(filename, "wb"); if (NULL == fp) return 0; fputs("line 1\n", fp); fputs("line 2\n", fp); fclose(fp); - + fp = fopen(filename, "rb+"); if (NULL == fp) return 0; @@ -87792,96 +87642,211 @@ exit(result); } -EOF -if { (eval echo configure:87797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_flush_io=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_flush_io=yes fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_flush_io" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5 +$as_echo "$ac_cv_flush_io" >&6; } if test "$ac_cv_flush_io" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_FLUSHIO 1 -EOF + +$as_echo "#define HAVE_FLUSHIO 1" >>confdefs.h fi if test "$ac_cv_func_crypt" = "no"; then - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:87825: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +$as_echo_n "checking for crypt in -lcrypt... " >&6; } +if ${ac_cv_lib_crypt_crypt+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (); +int +main () +{ +return crypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypt_crypt=yes +else + ac_cv_lib_crypt_crypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +$as_echo "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes; then : + + LIBS="-lcrypt $LIBS -lcrypt" + +$as_echo "#define HAVE_CRYPT 1" >>confdefs.h + -int main() { -crypt() -; return 0; } -EOF -if { (eval echo configure:87844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - LIBS="-lcrypt $LIBS -lcrypt" - cat >> confdefs.h <<\EOF -#define HAVE_CRYPT 1 -EOF - +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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CRYPT_R 1 +_ACEOF + php_crypt_r="1" +else + php_crypt_r="0" +fi +done + +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 ${php_cv_crypt_r_style+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "$ac_t""no" 1>&6 + + php_cv_crypt_r_style=none + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _REENTRANT 1 +#include + +int +main () +{ + +CRYPTD buffer; +crypt_r("passwd", "hash", &buffer); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + php_cv_crypt_r_style=cryptd +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "$php_cv_crypt_r_style" = "none"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _REENTRANT 1 +#include + +int +main () +{ + +struct crypt_data buffer; +crypt_r("passwd", "hash", &buffer); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + php_cv_crypt_r_style=struct_crypt_data +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + if test "$php_cv_crypt_r_style" = "none"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _REENTRANT 1 +#define _GNU_SOURCE +#include + +int +main () +{ + +struct crypt_data buffer; +crypt_r("passwd", "hash", &buffer); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + php_cv_crypt_r_style=struct_crypt_data_gnu_source fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5 +$as_echo "$php_cv_crypt_r_style" >&6; } + + if test "$php_cv_crypt_r_style" = "cryptd"; then + +$as_echo "#define CRYPT_R_CRYPTD 1" >>confdefs.h + + fi + if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then + +$as_echo "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h + + fi + if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then + +$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 + fi + + +$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h fi - -echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -echo "configure:87873: checking for standard DES crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5 +$as_echo_n "checking for standard DES crypt... " >&6; } +if ${ac_cv_crypt_des+:} false; then : + $as_echo_n "(cached) " >&6 else - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + ac_cv_crypt_des=yes else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -87898,41 +87863,37 @@ exit(0); #endif } -EOF -if { (eval echo configure:87903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_des=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_des=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5 +$as_echo "$ac_cv_crypt_des" >&6; } -echo "$ac_t""$ac_cv_crypt_des" 1>&6 - -echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -echo "configure:87924: checking for extended DES crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5 +$as_echo_n "checking for extended DES crypt... " >&6; } +if ${ac_cv_crypt_ext_des+:} false; then : + $as_echo_n "(cached) " >&6 else - - if test "$cross_compiling" = yes; then - + + if test "$cross_compiling" = yes; then : + ac_cv_crypt_ext_des=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -87949,41 +87910,37 @@ exit(0); #endif } -EOF -if { (eval echo configure:87954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_ext_des=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_ext_des=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5 +$as_echo "$ac_cv_crypt_ext_des" >&6; } -echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5 +$as_echo_n "checking for MD5 crypt... " >&6; } +if ${ac_cv_crypt_md5+:} false; then : + $as_echo_n "(cached) " >&6 +else + +if test "$cross_compiling" = yes; then : -echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -echo "configure:87975: checking for MD5 crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes; then - ac_cv_crypt_md5=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -87997,7 +87954,7 @@ #if HAVE_CRYPT char salt[15], answer[40]; - salt[0]='$'; salt[1]='1'; salt[2]='$'; + salt[0]='$'; salt[1]='1'; salt[2]='$'; salt[3]='r'; salt[4]='a'; salt[5]='s'; salt[6]='m'; salt[7]='u'; salt[8]='s'; salt[9]='l'; salt[10]='e'; salt[11]='$'; @@ -88009,41 +87966,37 @@ exit(0); #endif } -EOF -if { (eval echo configure:88014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_md5=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_md5=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5 +$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 ${ac_cv_crypt_blowfish+:} false; then : + $as_echo_n "(cached) " >&6 +else -echo "$ac_t""$ac_cv_crypt_md5" 1>&6 +if test "$cross_compiling" = yes; then : -echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -echo "configure:88035: checking for Blowfish crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes; then - ac_cv_crypt_blowfish=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -88056,7 +88009,7 @@ main() { #if HAVE_CRYPT char salt[30], answer[70]; - + salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; strcat(salt,"rasmuslerd............"); strcpy(answer,salt); @@ -88066,41 +88019,37 @@ exit(0); #endif } -EOF -if { (eval echo configure:88071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_blowfish=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_blowfish=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5 +$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 ${ac_cv_crypt_SHA512+:} false; then : + $as_echo_n "(cached) " >&6 +else -echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 +if test "$cross_compiling" = yes; then : -echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 -echo "configure:88092: checking for SHA512 crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes; then - ac_cv_crypt_SHA512=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -88112,51 +88061,47 @@ main() { #if HAVE_CRYPT - char salt[30], answer[80]; - - salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; + char salt[21], answer[21+86]; + + 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 } -EOF -if { (eval echo configure:88127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_SHA512=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_SHA512=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_SHA512" >&5 +$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 ${ac_cv_crypt_SHA256+:} false; then : + $as_echo_n "(cached) " >&6 +else -echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 +if test "$cross_compiling" = yes; then : -echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 -echo "configure:88148: checking for SHA256 crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes; then - ac_cv_crypt_SHA256=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #if HAVE_UNISTD_H #include @@ -88168,161 +88113,205 @@ 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 } -EOF -if { (eval echo configure:88183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_crypt_SHA256=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_crypt_SHA256=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_SHA256" >&5 +$as_echo "$ac_cv_crypt_SHA256" >&6; } + +if test "$ac_cv_crypt_des" = "yes"; then + ac_result=1 + ac_crypt_des=1 +else + ac_result=0 + ac_crypt_des=0 fi -echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 +cat >>confdefs.h <<_ACEOF +#define PHP_STD_DES_CRYPT $ac_result +_ACEOF + +if test "$ac_cv_crypt_md5" = "yes"; then + ac_result=1 + ac_crypt_md5=1 +else + ac_result=0 + ac_crypt_md5=0 +fi + +cat >>confdefs.h <<_ACEOF +#define PHP_MD5_CRYPT $ac_result +_ACEOF -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then - echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 -echo "configure:88207: checking whether the compiler supports __alignof__" >&5 -if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "$ac_cv_crypt_blowfish" = "yes"; then + ac_result=1 + ac_crypt_blowfish=1 else - - cat > conftest.$ac_ext <>confdefs.h <<_ACEOF +#define PHP_BLOWFISH_CRYPT $ac_result +_ACEOF + + +if test "$ac_cv_crypt_ext_des" = "yes"; then + ac_result=1 + ac_crypt_edes=1 +else + ac_result=0 + ac_crypt_edes=0 +fi + +cat >>confdefs.h <<_ACEOF +#define PHP_EXT_DES_CRYPT $ac_result +_ACEOF + + +if test "$ac_cv_crypt_SHA512" = "yes"; then + ac_result=1 + ac_crypt_sha512=1 +else + ac_result=0 + ac_crypt_sha512=0 +fi + +cat >>confdefs.h <<_ACEOF +#define PHP_SHA512_CRYPT $ac_result +_ACEOF + + +if test "$ac_cv_crypt_SHA256" = "yes"; then + ac_result=1 + ac_crypt_sha256=1 +else + ac_result=0 + ac_crypt_sha256=0 +fi + +cat >>confdefs.h <<_ACEOF +#define PHP_SHA256_CRYPT $ac_result +_ACEOF + + +if test "$ac_cv_crypt_SHA512" = no || test "$ac_cv_crypt_SHA256" = "no" || test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then + + { $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 ${ac_cv_alignof_exists+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ int align = __alignof__(int); - -; return 0; } -EOF -if { (eval echo configure:88223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_alignof_exists=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_alignof_exists=no - + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_alignof_exists" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5 +$as_echo "$ac_cv_alignof_exists" >&6; } if test "$ac_cv_alignof_exists" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ALIGNOF 1 -EOF + +$as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h fi - echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 -echo "configure:88248: checking whether the compiler supports aligned attribute" >&5 -if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_attribute_aligned+:} false; then : + $as_echo_n "(cached) " >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int)))); - -; return 0; } -EOF -if { (eval echo configure:88264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_attribute_aligned=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_attribute_aligned=no - + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5 +$as_echo "$ac_cv_attribute_aligned" >&6; } if test "$ac_cv_attribute_aligned" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ATTRIBUTE_ALIGNED 1 -EOF - - fi - - - cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>confdefs.h - cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>confdefs.h <<_ACEOF +#define PHP_USE_PHP_CRYPT_R $ac_result +_ACEOF - if test "$ac_cv_crypt_ext_des" = "yes"; then - ac_result=1 - ac_crypt_edes=1 - else - ac_result=0 - ac_crypt_edes=0 - fi - cat >> confdefs.h <>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - if test "$ac_cv_crypt_md5" = "yes"; then - ac_result=1 - ac_crypt_md5=1 - else - ac_result=0 - ac_crypt_md5=0 - fi - cat >> confdefs.h <> confdefs.h <&5 +$as_echo_n "checking for working POSIX fnmatch... " >&6; } +if ${ac_cv_func_fnmatch_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Some versions of Solaris, SCO, and the GNU C Library + # have a broken or incompatible fnmatch. + # So we run a test program. If we are cross-compiling, take no chance. + # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test. + if test "$cross_compiling" = yes; then : + ac_cv_func_fnmatch_works=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +# define y(a, b, c) (fnmatch (a, b, c) == 0) +# define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH) - if test "$ac_cv_crypt_sha256" = "yes"; then - ac_result=1 - ac_crypt_sha256=1 - else - ac_result=0 - ac_crypt_sha256=0 - fi - cat >> confdefs.h <&5 +$as_echo "$ac_cv_func_fnmatch_works" >&6; } +if test $ac_cv_func_fnmatch_works = yes; then : - cat >> confdefs.h <>confdefs.h fi -for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:88443: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif -; return 0; } -EOF -if { (eval echo configure:88471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +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" +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 + + php_can_support_proc_open=yes + break -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 + + php_can_support_proc_open=no + fi done -echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:88496: checking for working fnmatch" >&5 -if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # Some versions of Solaris or SCO have a broken fnmatch function. -# So we run a test program. If we are cross-compiling, take no chance. -# Thanks to John Oleynick and Franc,ois Pinard for this test. -if test "$cross_compiling" = yes; then - ac_cv_func_fnmatch_works=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_fnmatch_works=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5 +$as_echo_n "checking if your OS can spawn processes with inherited handles... " >&6; } +if test "$php_can_support_proc_open" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_fnmatch_works=no -fi -rm -fr conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi +if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then -echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 -if test $ac_cv_func_fnmatch_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_FNMATCH 1 -EOF +$as_echo "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h fi - -for ac_func in fork CreateProcess -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:88538: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + unset ac_cv_func_res_nsearch + unset ac_cv_func___res_nsearch + unset found -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:88566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -php_can_support_proc_open=no - -fi -done - -echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 -echo "configure:88596: checking if your OS can spawn processes with inherited handles" >&5 -if test "$php_can_support_proc_open" = "yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define PHP_CAN_SUPPORT_PROC_OPEN 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - -if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then - cat >> confdefs.h <<\EOF -#define ENABLE_CHROOT_FUNC 1 -EOF - -fi - - - unset ac_cv_func_res_nsearch - unset ac_cv_func___res_nsearch - unset found - - echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 -echo "configure:88620: checking for res_nsearch" >&5 -if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_nsearch(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) -choke me -#else -res_nsearch(); -#endif - -; return 0; } -EOF -if { (eval echo configure:88648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_res_nsearch=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_res_nsearch=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch" +if test "x$ac_cv_func_res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 -echo "configure:88666: checking for __res_nsearch" >&5 -if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __res_nsearch(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) -choke me -#else -__res_nsearch(); -#endif - -; return 0; } -EOF -if { (eval echo configure:88694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___res_nsearch=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___res_nsearch=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch" +if test "x$ac_cv_func___res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF + yes) + +$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h ac_cv_func_res_nsearch=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_res_nsearch unset ac_cv_lib_resolv___res_nsearch unset found - echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 -echo "configure:88732: checking for res_nsearch in -lresolv" >&5 -ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_nsearch (); +int +main () +{ +return res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_res_nsearch=yes +else + ac_cv_lib_resolv_res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5 +$as_echo "$ac_cv_lib_resolv_res_nsearch" >&6; } +if test "x$ac_cv_lib_resolv_res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 -echo "configure:88771: checking for __res_nsearch in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_nsearch (); +int +main () +{ +return __res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___res_nsearch=yes +else + ac_cv_lib_resolv___res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5 +$as_echo "$ac_cv_lib_resolv___res_nsearch" >&6; } +if test "x$ac_cv_lib_resolv___res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:88826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_res_nsearch=yes else - - + + unset ac_cv_lib_bind_res_nsearch unset ac_cv_lib_bind___res_nsearch unset found - echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 -echo "configure:88868: checking for res_nsearch in -lbind" >&5 -ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_nsearch (); +int +main () +{ +return res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_res_nsearch=yes +else + ac_cv_lib_bind_res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5 +$as_echo "$ac_cv_lib_bind_res_nsearch" >&6; } +if test "x$ac_cv_lib_bind_res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 -echo "configure:88907: checking for __res_nsearch in -lbind" >&5 -ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_nsearch (); +int +main () +{ +return __res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___res_nsearch=yes +else + ac_cv_lib_bind___res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5 +$as_echo "$ac_cv_lib_bind___res_nsearch" >&6; } +if test "x$ac_cv_lib_bind___res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:88962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_res_nsearch=yes else - - + + unset ac_cv_lib_socket_res_nsearch unset ac_cv_lib_socket___res_nsearch unset found - echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 -echo "configure:89004: checking for res_nsearch in -lsocket" >&5 -ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket_res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_nsearch (); +int +main () +{ +return res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_res_nsearch=yes +else + ac_cv_lib_socket_res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5 +$as_echo "$ac_cv_lib_socket_res_nsearch" >&6; } +if test "x$ac_cv_lib_socket_res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 -echo "configure:89043: checking for __res_nsearch in -lsocket" >&5 -ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket___res_nsearch+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_nsearch (); +int +main () +{ +return __res_nsearch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___res_nsearch=yes +else + ac_cv_lib_socket___res_nsearch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5 +$as_echo "$ac_cv_lib_socket___res_nsearch" >&6; } +if test "x$ac_cv_lib_socket___res_nsearch" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:89098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_res_nsearch=yes else - + : fi - + fi - + fi - + ;; - + esac unset ac_cv_func_dns_search unset ac_cv_func___dns_search unset found - - echo $ac_n "checking for dns_search""... $ac_c" 1>&6 -echo "configure:89155: checking for dns_search" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dns_search(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dns_search) || defined (__stub___dns_search) -choke me -#else -dns_search(); -#endif - -; return 0; } -EOF -if { (eval echo configure:89183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dns_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dns_search=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search" +if test "x$ac_cv_func_dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 -echo "configure:89201: checking for __dns_search" >&5 -if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __dns_search(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___dns_search) || defined (__stub_____dns_search) -choke me -#else -__dns_search(); -#endif - -; return 0; } -EOF -if { (eval echo configure:89229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___dns_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___dns_search=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search" +if test "x$ac_cv_func___dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 -EOF + yes) + +$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h ac_cv_func_dns_search=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_dns_search unset ac_cv_lib_resolv___dns_search unset found - echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 -echo "configure:89267: checking for dns_search in -lresolv" >&5 -ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dns_search (); +int +main () +{ +return dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_dns_search=yes +else + ac_cv_lib_resolv_dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5 +$as_echo "$ac_cv_lib_resolv_dns_search" >&6; } +if test "x$ac_cv_lib_resolv_dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 -echo "configure:89306: checking for __dns_search in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dns_search (); +int +main () +{ +return __dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___dns_search=yes +else + ac_cv_lib_resolv___dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5 +$as_echo "$ac_cv_lib_resolv___dns_search" >&6; } +if test "x$ac_cv_lib_resolv___dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:89361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dns_search=yes else - - + + unset ac_cv_lib_bind_dns_search unset ac_cv_lib_bind___dns_search unset found - echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 -echo "configure:89403: checking for dns_search in -lbind" >&5 -ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dns_search (); +int +main () +{ +return dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_dns_search=yes +else + ac_cv_lib_bind_dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5 +$as_echo "$ac_cv_lib_bind_dns_search" >&6; } +if test "x$ac_cv_lib_bind_dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 -echo "configure:89442: checking for __dns_search in -lbind" >&5 -ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dns_search (); +int +main () +{ +return __dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___dns_search=yes +else + ac_cv_lib_bind___dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5 +$as_echo "$ac_cv_lib_bind___dns_search" >&6; } +if test "x$ac_cv_lib_bind___dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:89497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_dns_search=yes else - - + + unset ac_cv_lib_socket_dns_search unset ac_cv_lib_socket___dns_search unset found - echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 -echo "configure:89539: checking for dns_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket_dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dns_search (); +int +main () +{ +return dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_dns_search=yes +else + ac_cv_lib_socket_dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5 +$as_echo "$ac_cv_lib_socket_dns_search" >&6; } +if test "x$ac_cv_lib_socket_dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 -echo "configure:89578: checking for __dns_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket___dns_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dns_search (); +int +main () +{ +return __dns_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___dns_search=yes +else + ac_cv_lib_socket___dns_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5 +$as_echo "$ac_cv_lib_socket___dns_search" >&6; } +if test "x$ac_cv_lib_socket___dns_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:89633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DNS_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dns_search=yes else - + : fi - + fi - + fi - + ;; - + esac unset ac_cv_func_dn_expand unset ac_cv_func___dn_expand unset found - - echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 -echo "configure:89690: checking for dn_expand" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_expand(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dn_expand) || defined (__stub___dn_expand) -choke me -#else -dn_expand(); -#endif - -; return 0; } -EOF -if { (eval echo configure:89718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dn_expand=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dn_expand=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand" +if test "x$ac_cv_func_dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 -echo "configure:89736: checking for __dn_expand" >&5 -if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __dn_expand(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) -choke me -#else -__dn_expand(); -#endif - -; return 0; } -EOF -if { (eval echo configure:89764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___dn_expand=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___dn_expand=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand" +if test "x$ac_cv_func___dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_DN_EXPAND 1 -EOF + yes) + +$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h ac_cv_func_dn_expand=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_dn_expand unset ac_cv_lib_resolv___dn_expand unset found - echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:89802: checking for dn_expand in -lresolv" >&5 -ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_expand (); +int +main () +{ +return dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_dn_expand=yes +else + ac_cv_lib_resolv_dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5 +$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; } +if test "x$ac_cv_lib_resolv_dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:89841: checking for __dn_expand in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_expand (); +int +main () +{ +return __dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___dn_expand=yes +else + ac_cv_lib_resolv___dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5 +$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; } +if test "x$ac_cv_lib_resolv___dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:89896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_EXPAND 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dn_expand=yes else - - + + unset ac_cv_lib_bind_dn_expand unset ac_cv_lib_bind___dn_expand unset found - echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 -echo "configure:89938: checking for dn_expand in -lbind" >&5 -ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_expand (); +int +main () +{ +return dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_dn_expand=yes +else + ac_cv_lib_bind_dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5 +$as_echo "$ac_cv_lib_bind_dn_expand" >&6; } +if test "x$ac_cv_lib_bind_dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 -echo "configure:89977: checking for __dn_expand in -lbind" >&5 -ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_expand (); +int +main () +{ +return __dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___dn_expand=yes +else + ac_cv_lib_bind___dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5 +$as_echo "$ac_cv_lib_bind___dn_expand" >&6; } +if test "x$ac_cv_lib_bind___dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_EXPAND 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_dn_expand=yes else - - + + unset ac_cv_lib_socket_dn_expand unset ac_cv_lib_socket___dn_expand unset found - echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 -echo "configure:90074: checking for dn_expand in -lsocket" >&5 -ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket_dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_expand (); +int +main () +{ +return dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_dn_expand=yes +else + ac_cv_lib_socket_dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5 +$as_echo "$ac_cv_lib_socket_dn_expand" >&6; } +if test "x$ac_cv_lib_socket_dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 -echo "configure:90113: checking for __dn_expand in -lsocket" >&5 -ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket___dn_expand+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_expand (); +int +main () +{ +return __dn_expand (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___dn_expand=yes +else + ac_cv_lib_socket___dn_expand=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5 +$as_echo "$ac_cv_lib_socket___dn_expand" >&6; } +if test "x$ac_cv_lib_socket___dn_expand" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_EXPAND 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dn_expand=yes else - + : fi - + fi - + fi - + ;; - + esac unset ac_cv_func_dn_skipname unset ac_cv_func___dn_skipname unset found - - echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 -echo "configure:90225: checking for dn_skipname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dn_skipname(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname) -choke me -#else -dn_skipname(); -#endif - -; return 0; } -EOF -if { (eval echo configure:90253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dn_skipname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dn_skipname=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname" +if test "x$ac_cv_func_dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 -echo "configure:90271: checking for __dn_skipname" >&5 -if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __dn_skipname(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) -choke me -#else -__dn_skipname(); -#endif - -; return 0; } -EOF -if { (eval echo configure:90299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___dn_skipname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___dn_skipname=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname" +if test "x$ac_cv_func___dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -EOF + yes) + +$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h ac_cv_func_dn_skipname=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_dn_skipname unset ac_cv_lib_resolv___dn_skipname unset found - echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:90337: checking for dn_skipname in -lresolv" >&5 -ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_skipname (); +int +main () +{ +return dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_dn_skipname=yes +else + ac_cv_lib_resolv_dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5 +$as_echo "$ac_cv_lib_resolv_dn_skipname" >&6; } +if test "x$ac_cv_lib_resolv_dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:90376: checking for __dn_skipname in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_skipname (); +int +main () +{ +return __dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___dn_skipname=yes +else + ac_cv_lib_resolv___dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5 +$as_echo "$ac_cv_lib_resolv___dn_skipname" >&6; } +if test "x$ac_cv_lib_resolv___dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dn_skipname=yes else - - + + unset ac_cv_lib_bind_dn_skipname unset ac_cv_lib_bind___dn_skipname unset found - echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 -echo "configure:90473: checking for dn_skipname in -lbind" >&5 -ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_skipname (); +int +main () +{ +return dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_dn_skipname=yes +else + ac_cv_lib_bind_dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5 +$as_echo "$ac_cv_lib_bind_dn_skipname" >&6; } +if test "x$ac_cv_lib_bind_dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -echo "configure:90512: checking for __dn_skipname in -lbind" >&5 -ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_skipname (); +int +main () +{ +return __dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___dn_skipname=yes +else + ac_cv_lib_bind___dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5 +$as_echo "$ac_cv_lib_bind___dn_skipname" >&6; } +if test "x$ac_cv_lib_bind___dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_dn_skipname=yes else - - + + unset ac_cv_lib_socket_dn_skipname unset ac_cv_lib_socket___dn_skipname unset found - echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 -echo "configure:90609: checking for dn_skipname in -lsocket" >&5 -ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket_dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dn_skipname (); +int +main () +{ +return dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_dn_skipname=yes +else + ac_cv_lib_socket_dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5 +$as_echo "$ac_cv_lib_socket_dn_skipname" >&6; } +if test "x$ac_cv_lib_socket_dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 -echo "configure:90648: checking for __dn_skipname in -lsocket" >&5 -ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket___dn_skipname+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __dn_skipname (); +int +main () +{ +return __dn_skipname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___dn_skipname=yes +else + ac_cv_lib_socket___dn_skipname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5 +$as_echo "$ac_cv_lib_socket___dn_skipname" >&6; } +if test "x$ac_cv_lib_socket___dn_skipname" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_DN_SKIPNAME 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dn_skipname=yes else - + : fi - + fi - + fi - + ;; - + esac @@ -90756,552 +90218,454 @@ unset ac_cv_func_res_search unset ac_cv_func___res_search unset found - - echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:90762: checking for res_search" >&5 -if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_search(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_res_search) || defined (__stub___res_search) -choke me -#else -res_search(); -#endif - -; return 0; } -EOF -if { (eval echo configure:90790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_res_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_res_search=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search" +if test "x$ac_cv_func_res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_search""... $ac_c" 1>&6 -echo "configure:90808: checking for __res_search" >&5 -if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char __res_search(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub___res_search) || defined (__stub_____res_search) -choke me -#else -__res_search(); -#endif - -; return 0; } -EOF -if { (eval echo configure:90836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func___res_search=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func___res_search=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search" +if test "x$ac_cv_func___res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi case $found in - yes) - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF + yes) + +$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h ac_cv_func_res_search=yes ;; - - *) - + + *) + unset ac_cv_lib_resolv_res_search unset ac_cv_lib_resolv___res_search unset found - echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:90874: checking for res_search in -lresolv" >&5 -ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv_res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_search (); +int +main () +{ +return res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_res_search=yes +else + ac_cv_lib_resolv_res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 +$as_echo "$ac_cv_lib_resolv_res_search" >&6; } +if test "x$ac_cv_lib_resolv_res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:90913: checking for __res_search in -lresolv" >&5 -ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_resolv___res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_search (); +int +main () +{ +return __res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___res_search=yes +else + ac_cv_lib_resolv___res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5 +$as_echo "$ac_cv_lib_resolv___res_search" >&6; } +if test "x$ac_cv_lib_resolv___res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:90968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case resolv in c|c_r|pthread*) ;; - *) - LIBS="-lresolv $LIBS" + *) + LIBS="-lresolv $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBRESOLV 1 -EOF +$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_res_search=yes else - - + + unset ac_cv_lib_bind_res_search unset ac_cv_lib_bind___res_search unset found - echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -echo "configure:91010: checking for res_search in -lbind" >&5 -ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind_res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_search (); +int +main () +{ +return res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind_res_search=yes +else + ac_cv_lib_bind_res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5 +$as_echo "$ac_cv_lib_bind_res_search" >&6; } +if test "x$ac_cv_lib_bind_res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -echo "configure:91049: checking for __res_search in -lbind" >&5 -ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_bind___res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_search (); +int +main () +{ +return __res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bind___res_search=yes +else + ac_cv_lib_bind___res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5 +$as_echo "$ac_cv_lib_bind___res_search" >&6; } +if test "x$ac_cv_lib_bind___res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:91104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case bind in c|c_r|pthread*) ;; - *) - LIBS="-lbind $LIBS" + *) + LIBS="-lbind $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBBIND 1 -EOF +$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h ac_cv_func_res_search=yes else - - + + unset ac_cv_lib_socket_res_search unset ac_cv_lib_socket___res_search unset found - echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:91146: checking for res_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket_res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_search (); +int +main () +{ +return res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_res_search=yes +else + ac_cv_lib_socket_res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5 +$as_echo "$ac_cv_lib_socket_res_search" >&6; } +if test "x$ac_cv_lib_socket_res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:91185: checking for __res_search in -lsocket" >&5 -ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_socket___res_search+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_search (); +int +main () +{ +return __res_search (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket___res_search=yes +else + ac_cv_lib_socket___res_search=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5 +$as_echo "$ac_cv_lib_socket___res_search" >&6; } +if test "x$ac_cv_lib_socket___res_search" = xyes; then : found=yes else - echo "$ac_t""no" 1>&6 -found=no + found=no fi - + fi if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -lsocket" - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : found=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() { return (0); } -EOF -if { (eval echo configure:91240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* found=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LIBS=$ac_libs fi if test "$found" = "yes"; then - - + + case socket in c|c_r|pthread*) ;; - *) - LIBS="-lsocket $LIBS" + *) + LIBS="-lsocket $LIBS" ;; esac - cat >> confdefs.h <<\EOF -#define HAVE_RES_SEARCH 1 -EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBSOCKET 1 -EOF +$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_res_search=yes else - + : fi - + fi - + fi - + ;; - + esac -echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -echo "configure:91293: checking whether atof() accepts NAN" >&5 -if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts NAN" >&5 +$as_echo_n "checking whether atof() accepts NAN... " >&6; } +if ${ac_cv_atof_accept_nan+:} false; then : + $as_echo_n "(cached) " >&6 else - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + ac_cv_atof_accept_nan=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -91319,47 +90683,42 @@ return zend_isnan(atof("NAN")) ? 0 : 1; } -EOF -if { (eval echo configure:91324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_atof_accept_nan=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_atof_accept_nan=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atof_accept_nan" >&5 +$as_echo "$ac_cv_atof_accept_nan" >&6; } if test "$ac_cv_atof_accept_nan" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ATOF_ACCEPTS_NAN 1 -EOF + +$as_echo "#define HAVE_ATOF_ACCEPTS_NAN 1" >>confdefs.h fi -echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 -echo "configure:91351: checking whether atof() accepts INF" >&5 -if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts INF" >&5 +$as_echo_n "checking whether atof() accepts INF... " >&6; } +if ${ac_cv_atof_accept_inf+:} false; then : + $as_echo_n "(cached) " >&6 else - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + ac_cv_atof_accept_inf=no else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -91380,47 +90739,42 @@ return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; } -EOF -if { (eval echo configure:91385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_atof_accept_inf=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_atof_accept_inf=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atof_accept_inf" >&5 +$as_echo "$ac_cv_atof_accept_inf" >&6; } if test "$ac_cv_atof_accept_inf" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ATOF_ACCEPTS_INF 1 -EOF + +$as_echo "#define HAVE_ATOF_ACCEPTS_INF 1" >>confdefs.h fi -echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 -echo "configure:91412: checking whether HUGE_VAL == INF" >&5 -if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL == INF" >&5 +$as_echo_n "checking whether HUGE_VAL == INF... " >&6; } +if ${ac_cv_huge_val_inf+:} false; then : + $as_echo_n "(cached) " >&6 else - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + ac_cv_huge_val_inf=yes else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -91441,47 +90795,42 @@ return zend_isinf(HUGE_VAL) ? 0 : 1; } -EOF -if { (eval echo configure:91446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_huge_val_inf=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_huge_val_inf=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_huge_val_inf" >&5 +$as_echo "$ac_cv_huge_val_inf" >&6; } if test "$ac_cv_huge_val_inf" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_HUGE_VAL_INF 1 -EOF + +$as_echo "#define HAVE_HUGE_VAL_INF 1" >>confdefs.h fi -echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -echo "configure:91473: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 -if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_huge_val_nan+:} false; then : + $as_echo_n "(cached) " >&6 else - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + ac_cv_huge_val_nan=yes else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -91504,46 +90853,43 @@ #endif } -EOF -if { (eval echo configure:91509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_huge_val_nan=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_huge_val_nan=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_huge_val_nan" >&5 +$as_echo "$ac_cv_huge_val_nan" >&6; } if test "$ac_cv_huge_val_nan" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_HUGE_VAL_NAN 1 -EOF + +$as_echo "#define HAVE_HUGE_VAL_NAN 1" >>confdefs.h fi -echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 -echo "configure:91536: checking whether strptime() declaration fails" >&5 -if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5 +$as_echo_n "checking whether strptime() declaration fails... " >&6; } +if ${ac_cv_strptime_decl_fails+:} false; then : + $as_echo_n "(cached) " >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ #ifndef HAVE_STRPTIME #error no strptime() on this platform @@ -91552,264 +90898,116 @@ int strptime(const char *s, const char *format, struct tm *tm); #endif -; return 0; } -EOF -if { (eval echo configure:91558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_strptime_decl_fails=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_strptime_decl_fails=yes fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5 +$as_echo "$ac_cv_strptime_decl_fails" >&6; } if test "$ac_cv_strptime_decl_fails" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_STRPTIME_DECL_FAILS 1 -EOF -fi +$as_echo "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h -for ac_hdr in wchar.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:91586: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:91596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done -for ac_func in mblen -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:91625: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); +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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WCHAR_H 1 +_ACEOF -int main() { +fi -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +done -; return 0; } -EOF -if { (eval echo configure:91653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +for ac_func in mblen +do : + ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen" +if test "x$ac_cv_func_mblen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MBLEN 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done for ac_func in mbrlen mbsinit -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:91680: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -; return 0; } -EOF -if { (eval echo configure:91708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* fi +done -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&5 +$as_echo_n "checking for mbstate_t... " >&6; } +if ${ac_cv_type_mbstate_t+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "$ac_t""no" 1>&6 -fi -done -echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:91733: checking for mbstate_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #ifdef HAVE_WCHAR_H # include #endif -int main() { +int +main () +{ int __tmp__() { mbstate_t a; } -; return 0; } -EOF -if { (eval echo configure:91752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_mbstate_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_type_mbstate_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +$as_echo "$ac_cv_type_mbstate_t" >&6; } if test "$ac_cv_type_mbstate_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_MBSTATE_T 1 -EOF -fi +$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h -for ac_hdr in atomic.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:91780: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:91790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + +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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ATOMIC_H 1 +_ACEOF + fi + done @@ -91821,15 +91019,15 @@ if test "" != "shared" && test "" != "yes" && test "" != "cli"; then PHP_STANDARD_SHARED=no - - + + case ext/standard in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -91852,12 +91050,12 @@ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ filters.c proc_open.c streamsfuncs.c http.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -91881,14 +91079,14 @@ else if test "" = "shared" || test "" = "yes"; then PHP_STANDARD_SHARED=yes - + case ext/standard in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -91911,12 +91109,12 @@ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ filters.c proc_open.c streamsfuncs.c http.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" case $ac_src in @@ -91934,7 +91132,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -91944,7 +91142,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(STANDARD_SHARED_LIBADD)' ;; *) suffix=la @@ -91957,7 +91155,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_STANDARD 1 -EOF +_ACEOF fi fi @@ -92019,15 +91218,15 @@ PHP_STANDARD_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/standard in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -92050,12 +91249,12 @@ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ filters.c proc_open.c streamsfuncs.c http.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -92075,15 +91274,15 @@ EXT_STATIC="$EXT_STATIC standard" ;; *) - - + + case ext/standard in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -92106,12 +91305,12 @@ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ filters.c proc_open.c streamsfuncs.c http.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -92132,15 +91331,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC standard" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=standard - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -92153,36 +91352,36 @@ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - + for header_file in ext/standard/; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + php_with_sybase_ct=no -echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -echo "configure:92180: checking for Sybase-CT support" >&5 -# Check whether --with-sybase-ct or --without-sybase-ct was given. -if test "${with_sybase_ct+set}" = set; then - withval="$with_sybase_ct" - PHP_SYBASE_CT=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sybase-CT support" >&5 +$as_echo_n "checking for Sybase-CT support... " >&6; } + +# Check whether --with-sybase-ct was given. +if test "${with_sybase_ct+set}" = set; then : + withval=$with_sybase_ct; PHP_SYBASE_CT=$withval else - + PHP_SYBASE_CT=no test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL @@ -92211,7 +91410,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -92219,14 +91419,13 @@ if test "$PHP_SYBASE_CT" != "no"; then if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then - { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } + as_fn_error $? "You can not use both --with-sybase and --with-sybase-ct in same build!" "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define HAVE_SYBASE_CT 1 -EOF - +$as_echo "#define HAVE_SYBASE_CT 1" >>confdefs.h + + ext_builddir=ext/sybase_ct ext_srcdir=$abs_srcdir/ext/sybase_ct @@ -92234,15 +91433,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SYBASE_CT_SHARED=no - - + + case ext/sybase_ct in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -92255,12 +91454,12 @@ old_IFS=$IFS for ac_src in php_sybase_ct.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -92284,14 +91483,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SYBASE_CT_SHARED=yes - + case ext/sybase_ct in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -92304,12 +91503,12 @@ old_IFS=$IFS for ac_src in php_sybase_ct.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" case $ac_src in @@ -92327,7 +91526,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -92337,7 +91536,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(SYBASE_CT_SHARED_LIBADD)' ;; *) suffix=la @@ -92350,7 +91549,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SYBASE_CT 1 -EOF +_ACEOF fi fi @@ -92412,15 +91612,15 @@ PHP_SYBASE_CT_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sybase_ct in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -92433,12 +91633,12 @@ old_IFS=$IFS for ac_src in php_sybase_ct.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -92458,15 +91658,15 @@ EXT_STATIC="$EXT_STATIC sybase_ct" ;; *) - - + + case ext/sybase_ct in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -92479,12 +91679,12 @@ old_IFS=$IFS for ac_src in php_sybase_ct.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -92505,23 +91705,23 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sybase_ct - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" - + if test "$PHP_SYBASE_CT" = "yes"; then SYBASE_CT_INCDIR=/home/sybase/include SYBASE_CT_LIBDIR=/home/sybase/lib @@ -92531,94 +91731,94 @@ fi if test -f $SYBASE_CT_INCDIR/ctpublic.h; then - + if test "$SYBASE_CT_INCDIR" != "/usr/include"; then - + if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then ai_p=$SYBASE_CT_INCDIR else - + ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" 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 else - { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } + as_fn_error $? "ctpublic.h missing!" "$LINENO" 5 fi - - + + if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then - + if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$SYBASE_CT_LIBDIR else - + ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" else - - - + + + 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 if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then - - + + case ct in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" else - - + + case ct in c|c_r|pthread*) ;; - *) - LIBS="-lct $LIBS" + *) + LIBS="-lct $LIBS" ;; esac @@ -92630,20 +91830,20 @@ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" elif test -f $SYBASE_CT_INCDIR/libsybct64.so; then - - + + case sybcs64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybcs64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybcs64 $LIBS" + *) + LIBS="-lsybcs64 $LIBS" ;; esac @@ -92653,20 +91853,20 @@ esac - - + + case sybct64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybct64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybct64 $LIBS" + *) + LIBS="-lsybct64 $LIBS" ;; esac @@ -92676,20 +91876,20 @@ esac - - + + case sybcomn64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybcomn64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybcomn64 $LIBS" + *) + LIBS="-lsybcomn64 $LIBS" ;; esac @@ -92699,20 +91899,20 @@ esac - - + + case sybintl64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybintl64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybintl64 $LIBS" + *) + LIBS="-lsybintl64 $LIBS" ;; esac @@ -92726,29 +91926,29 @@ ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define - *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # + *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # esac SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" - - + + save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - $SYBASE_CT_LIBS + ac_stuff=" + $SYBASE_CT_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -92759,20 +91959,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -92785,101 +91985,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 -echo "configure:92832: checking for netg_errstr in -lsybtcl64" >&5 -ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_sybtcl64_netg_errstr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsybtcl64 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -netg_errstr() -; return 0; } -EOF -if { (eval echo configure:92851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char netg_errstr (); +int +main () +{ +return netg_errstr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sybtcl64_netg_errstr=yes +else + ac_cv_lib_sybtcl64_netg_errstr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5 +$as_echo "$ac_cv_lib_sybtcl64_netg_errstr" >&6; } +if test "x$ac_cv_lib_sybtcl64_netg_errstr" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case sybtcl64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybtcl64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl64 $LIBS" + *) + LIBS="-lsybtcl64 $LIBS" ;; esac @@ -92889,29 +92091,28 @@ esac - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sybtcl64_netg_errstr - - - + + + case sybtcl64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" else - - + + case sybtcl64 in c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl64 $LIBS" + *) + LIBS="-lsybtcl64 $LIBS" ;; esac @@ -92921,28 +92122,28 @@ esac - - + + fi - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -92953,20 +92154,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -92979,100 +92180,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 -echo "configure:93026: checking for insck__getVdate in -linsck64" >&5 -ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck64_insck__getVdate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck64 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -insck__getVdate() -; return 0; } -EOF -if { (eval echo configure:93045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char insck__getVdate (); +int +main () +{ +return insck__getVdate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck64_insck__getVdate=yes +else + ac_cv_lib_insck64_insck__getVdate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_insck__getVdate" >&5 +$as_echo "$ac_cv_lib_insck64_insck__getVdate" >&6; } +if test "x$ac_cv_lib_insck64_insck__getVdate" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" else - - + + case insck64 in c|c_r|pthread*) ;; - *) - LIBS="-linsck64 $LIBS" + *) + LIBS="-linsck64 $LIBS" ;; esac @@ -93082,34 +92285,33 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck64_insck__getVdate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -93120,20 +92322,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -93146,100 +92348,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 -echo "configure:93193: checking for bsd_tcp in -linsck64" >&5 -ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck64_bsd_tcp+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck64 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bsd_tcp() -; return 0; } -EOF -if { (eval echo configure:93212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bsd_tcp (); +int +main () +{ +return bsd_tcp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck64_bsd_tcp=yes +else + ac_cv_lib_insck64_bsd_tcp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_bsd_tcp" >&5 +$as_echo "$ac_cv_lib_insck64_bsd_tcp" >&6; } +if test "x$ac_cv_lib_insck64_bsd_tcp" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck64 in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" else - - + + case insck64 in c|c_r|pthread*) ;; - *) - LIBS="-linsck64 $LIBS" + *) + LIBS="-linsck64 $LIBS" ;; esac @@ -93249,32 +92453,31 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck64_bsd_tcp - - + + fi elif test -f $SYBASE_CT_INCDIR/libsybct.so; then - - + + case sybcs in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" else - - + + case sybcs in c|c_r|pthread*) ;; - *) - LIBS="-lsybcs $LIBS" + *) + LIBS="-lsybcs $LIBS" ;; esac @@ -93284,20 +92487,20 @@ esac - - + + case sybct in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" else - - + + case sybct in c|c_r|pthread*) ;; - *) - LIBS="-lsybct $LIBS" + *) + LIBS="-lsybct $LIBS" ;; esac @@ -93307,20 +92510,20 @@ esac - - + + case sybcomn in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" else - - + + case sybcomn in c|c_r|pthread*) ;; - *) - LIBS="-lsybcomn $LIBS" + *) + LIBS="-lsybcomn $LIBS" ;; esac @@ -93330,20 +92533,20 @@ esac - - + + case sybintl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" else - - + + case sybintl in c|c_r|pthread*) ;; - *) - LIBS="-lsybintl $LIBS" + *) + LIBS="-lsybintl $LIBS" ;; esac @@ -93353,28 +92556,28 @@ esac - + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" - - + + save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - $SYBASE_CT_LIBS + ac_stuff=" + $SYBASE_CT_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -93385,20 +92588,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -93411,101 +92614,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 -echo "configure:93458: checking for netg_errstr in -lsybtcl" >&5 -ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_sybtcl_netg_errstr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsybtcl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -netg_errstr() -; return 0; } -EOF -if { (eval echo configure:93477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char netg_errstr (); +int +main () +{ +return netg_errstr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sybtcl_netg_errstr=yes +else + ac_cv_lib_sybtcl_netg_errstr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl_netg_errstr" >&5 +$as_echo "$ac_cv_lib_sybtcl_netg_errstr" >&6; } +if test "x$ac_cv_lib_sybtcl_netg_errstr" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case sybtcl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" else - - + + case sybtcl in c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl $LIBS" + *) + LIBS="-lsybtcl $LIBS" ;; esac @@ -93515,29 +92720,28 @@ esac - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sybtcl_netg_errstr - - - + + + case sybtcl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" else - - + + case sybtcl in c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl $LIBS" + *) + LIBS="-lsybtcl $LIBS" ;; esac @@ -93547,28 +92751,28 @@ esac - - + + fi - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -93579,20 +92783,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - - case $ac_ii in + + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -93605,100 +92809,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -echo "configure:93652: checking for insck__getVdate in -linsck" >&5 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck_insck__getVdate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -insck__getVdate() -; return 0; } -EOF -if { (eval echo configure:93671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char insck__getVdate (); +int +main () +{ +return insck__getVdate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck_insck__getVdate=yes +else + ac_cv_lib_insck_insck__getVdate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5 +$as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; } +if test "x$ac_cv_lib_insck_insck__getVdate" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" else - - + + case insck in c|c_r|pthread*) ;; - *) - LIBS="-linsck $LIBS" + *) + LIBS="-linsck $LIBS" ;; esac @@ -93708,34 +92914,33 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck_insck__getVdate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -93746,20 +92951,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -93772,100 +92977,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -echo "configure:93819: checking for bsd_tcp in -linsck" >&5 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck_bsd_tcp+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bsd_tcp() -; return 0; } -EOF -if { (eval echo configure:93838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bsd_tcp (); +int +main () +{ +return bsd_tcp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck_bsd_tcp=yes +else + ac_cv_lib_insck_bsd_tcp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5 +$as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; } +if test "x$ac_cv_lib_insck_bsd_tcp" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" else - - + + case insck in c|c_r|pthread*) ;; - *) - LIBS="-linsck $LIBS" + *) + LIBS="-linsck $LIBS" ;; esac @@ -93875,32 +93082,31 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck_bsd_tcp - - + + fi else - - + + case cs in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" else - - + + case cs in c|c_r|pthread*) ;; - *) - LIBS="-lcs $LIBS" + *) + LIBS="-lcs $LIBS" ;; esac @@ -93910,20 +93116,20 @@ esac - - + + case ct in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" else - - + + case ct in c|c_r|pthread*) ;; - *) - LIBS="-lct $LIBS" + *) + LIBS="-lct $LIBS" ;; esac @@ -93933,20 +93139,20 @@ esac - - + + case comn in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" else - - + + case comn in c|c_r|pthread*) ;; - *) - LIBS="-lcomn $LIBS" + *) + LIBS="-lcomn $LIBS" ;; esac @@ -93956,20 +93162,20 @@ esac - - + + case intl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" else - - + + case intl in c|c_r|pthread*) ;; - *) - LIBS="-lintl $LIBS" + *) + LIBS="-lintl $LIBS" ;; esac @@ -93979,28 +93185,28 @@ esac - + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" - - + + save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - $SYBASE_CT_LIBS + ac_stuff=" + $SYBASE_CT_LIBS " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -94011,20 +93217,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -94037,101 +93243,103 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -echo "configure:94084: checking for netg_errstr in -ltcl" >&5 -ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 ${ac_cv_lib_tcl_netg_errstr+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltcl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -netg_errstr() -; return 0; } -EOF -if { (eval echo configure:94103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char netg_errstr (); +int +main () +{ +return netg_errstr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tcl_netg_errstr=yes +else + ac_cv_lib_tcl_netg_errstr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcl_netg_errstr" >&5 +$as_echo "$ac_cv_lib_tcl_netg_errstr" >&6; } +if test "x$ac_cv_lib_tcl_netg_errstr" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - - + + + case tcl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" else - - + + case tcl in c|c_r|pthread*) ;; - *) - LIBS="-ltcl $LIBS" + *) + LIBS="-ltcl $LIBS" ;; esac @@ -94141,29 +93349,28 @@ esac - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_tcl_netg_errstr - - - + + + case sybtcl in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" else - - + + case sybtcl in c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl $LIBS" + *) + LIBS="-lsybtcl $LIBS" ;; esac @@ -94173,28 +93380,28 @@ esac - - + + fi - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -94205,20 +93412,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -94231,100 +93438,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -echo "configure:94278: checking for insck__getVdate in -linsck" >&5 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck_insck__getVdate+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -insck__getVdate() -; return 0; } -EOF -if { (eval echo configure:94297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char insck__getVdate (); +int +main () +{ +return insck__getVdate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck_insck__getVdate=yes +else + ac_cv_lib_insck_insck__getVdate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5 +$as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; } +if test "x$ac_cv_lib_insck_insck__getVdate" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" else - - + + case insck in c|c_r|pthread*) ;; - *) - LIBS="-linsck $LIBS" + *) + LIBS="-linsck $LIBS" ;; esac @@ -94334,34 +93543,33 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck_insck__getVdate - - + + fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff="-L$SYBASE_CT_LIBDIR" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -94372,20 +93580,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -94398,100 +93606,102 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -echo "configure:94445: checking for bsd_tcp in -linsck" >&5 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $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 ${ac_cv_lib_insck_bsd_tcp+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -bsd_tcp() -; return 0; } -EOF -if { (eval echo configure:94464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bsd_tcp (); +int +main () +{ +return bsd_tcp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_insck_bsd_tcp=yes +else + ac_cv_lib_insck_bsd_tcp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5 +$as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; } +if test "x$ac_cv_lib_insck_bsd_tcp" = xyes; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - + + case insck in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" else - - + + case insck in c|c_r|pthread*) ;; - *) - LIBS="-linsck $LIBS" + *) + LIBS="-linsck $LIBS" ;; esac @@ -94501,15 +93711,14 @@ esac - + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_insck_bsd_tcp - - + + fi fi @@ -94519,14 +93728,13 @@ php_enable_sysvmsg=no -echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 -echo "configure:94524: checking whether to enable System V IPC support" >&5 -# Check whether --enable-sysvmsg or --disable-sysvmsg was given. -if test "${enable_sysvmsg+set}" = set; then - enableval="$enable_sysvmsg" - PHP_SYSVMSG=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5 +$as_echo_n "checking whether to enable System V IPC support... " >&6; } +# Check whether --enable-sysvmsg was given. +if test "${enable_sysvmsg+set}" = set; then : + enableval=$enable_sysvmsg; PHP_SYSVMSG=$enableval else - + PHP_SYSVMSG=no test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL @@ -94555,53 +93763,27 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SYSVMSG" != "no"; then - ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:94567: checking for sys/msg.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:94577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : + ac_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" = xyes; then : + else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } - + as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5 + fi - cat >> confdefs.h <<\EOF -#define HAVE_SYSVMSG 1 -EOF - + +$as_echo "#define HAVE_SYSVMSG 1" >>confdefs.h + + ext_builddir=ext/sysvmsg ext_srcdir=$abs_srcdir/ext/sysvmsg @@ -94609,15 +93791,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SYSVMSG_SHARED=no - - + + case ext/sysvmsg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -94630,12 +93812,12 @@ old_IFS=$IFS for ac_src in sysvmsg.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -94659,14 +93841,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SYSVMSG_SHARED=yes - + case ext/sysvmsg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -94679,12 +93861,12 @@ old_IFS=$IFS for ac_src in sysvmsg.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" case $ac_src in @@ -94702,7 +93884,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -94712,7 +93894,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(SYSVMSG_SHARED_LIBADD)' ;; *) suffix=la @@ -94725,7 +93907,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SYSVMSG 1 -EOF +_ACEOF fi fi @@ -94787,15 +93970,15 @@ PHP_SYSVMSG_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sysvmsg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -94808,12 +93991,12 @@ old_IFS=$IFS for ac_src in sysvmsg.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -94833,15 +94016,15 @@ EXT_STATIC="$EXT_STATIC sysvmsg" ;; *) - - + + case ext/sysvmsg in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -94854,12 +94037,12 @@ old_IFS=$IFS for ac_src in sysvmsg.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -94880,15 +94063,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sysvmsg - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -94899,14 +94082,13 @@ php_enable_sysvsem=no -echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -echo "configure:94904: checking whether to enable System V semaphore support" >&5 -# Check whether --enable-sysvsem or --disable-sysvsem was given. -if test "${enable_sysvsem+set}" = set; then - enableval="$enable_sysvsem" - PHP_SYSVSEM=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5 +$as_echo_n "checking whether to enable System V semaphore support... " >&6; } +# Check whether --enable-sysvsem was given. +if test "${enable_sysvsem+set}" = set; then : + enableval=$enable_sysvsem; PHP_SYSVSEM=$enableval else - + PHP_SYSVSEM=no test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL @@ -94935,13 +94117,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SYSVSEM" != "no"; then - + ext_builddir=ext/sysvsem ext_srcdir=$abs_srcdir/ext/sysvsem @@ -94949,15 +94132,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SYSVSEM_SHARED=no - - + + case ext/sysvsem in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -94970,12 +94153,12 @@ old_IFS=$IFS for ac_src in sysvsem.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -94999,14 +94182,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SYSVSEM_SHARED=yes - + case ext/sysvsem in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -95019,12 +94202,12 @@ old_IFS=$IFS for ac_src in sysvsem.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" case $ac_src in @@ -95042,7 +94225,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -95052,7 +94235,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(SYSVSEM_SHARED_LIBADD)' ;; *) suffix=la @@ -95065,7 +94248,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SYSVSEM 1 -EOF +_ACEOF fi fi @@ -95127,15 +94311,15 @@ PHP_SYSVSEM_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sysvsem in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -95148,12 +94332,12 @@ old_IFS=$IFS for ac_src in sysvsem.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -95173,15 +94357,15 @@ EXT_STATIC="$EXT_STATIC sysvsem" ;; *) - - + + case ext/sysvsem in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -95194,12 +94378,12 @@ old_IFS=$IFS for ac_src in sysvsem.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -95220,67 +94404,63 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sysvsem - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - cat >> confdefs.h <<\EOF -#define HAVE_SYSVSEM 1 -EOF - echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:95242: checking for union semun" >&5 -if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +$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 ${php_cv_semun+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include - -int main() { + +int +main () +{ union semun x; -; return 0; } -EOF -if { (eval echo configure:95258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + php_cv_semun=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + php_cv_semun=no - -fi -rm -f conftest* - + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$php_cv_semun" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5 +$as_echo "$php_cv_semun" >&6; } if test "$php_cv_semun" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_SEMUN 1 -EOF + +$as_echo "#define HAVE_SEMUN 1" >>confdefs.h else - cat >> confdefs.h <<\EOF -#define HAVE_SEMUN 0 -EOF + +$as_echo "#define HAVE_SEMUN 0" >>confdefs.h fi fi @@ -95289,14 +94469,13 @@ php_enable_sysvshm=no -echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -echo "configure:95294: checking whether to enable System V shared memory support" >&5 -# Check whether --enable-sysvshm or --disable-sysvshm was given. -if test "${enable_sysvshm+set}" = set; then - enableval="$enable_sysvshm" - PHP_SYSVSHM=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5 +$as_echo_n "checking whether to enable System V shared memory support... " >&6; } +# Check whether --enable-sysvshm was given. +if test "${enable_sysvshm+set}" = set; then : + enableval=$enable_sysvshm; PHP_SYSVSHM=$enableval else - + PHP_SYSVSHM=no test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL @@ -95325,17 +94504,17 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_SYSVSHM" != "no"; then - cat >> confdefs.h <<\EOF -#define HAVE_SYSVSHM 1 -EOF - +$as_echo "#define HAVE_SYSVSHM 1" >>confdefs.h + + ext_builddir=ext/sysvshm ext_srcdir=$abs_srcdir/ext/sysvshm @@ -95343,15 +94522,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_SYSVSHM_SHARED=no - - + + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -95364,12 +94543,12 @@ old_IFS=$IFS for ac_src in sysvshm.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -95393,14 +94572,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_SYSVSHM_SHARED=yes - + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -95413,12 +94592,12 @@ old_IFS=$IFS for ac_src in sysvshm.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" case $ac_src in @@ -95436,7 +94615,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -95446,7 +94625,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(SYSVSHM_SHARED_LIBADD)' ;; *) suffix=la @@ -95459,7 +94638,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_SYSVSHM 1 -EOF +_ACEOF fi fi @@ -95521,15 +94701,15 @@ PHP_SYSVSHM_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -95542,12 +94722,12 @@ old_IFS=$IFS for ac_src in sysvshm.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -95567,15 +94747,15 @@ EXT_STATIC="$EXT_STATIC sysvshm" ;; *) - - + + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -95588,12 +94768,12 @@ old_IFS=$IFS for ac_src in sysvshm.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -95614,15 +94794,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=sysvshm - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -95633,14 +94813,14 @@ php_with_tidy=no -echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 -echo "configure:95638: checking for TIDY support" >&5 -# Check whether --with-tidy or --without-tidy was given. -if test "${with_tidy+set}" = set; then - withval="$with_tidy" - PHP_TIDY=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5 +$as_echo_n "checking for TIDY support... " >&6; } + +# Check whether --with-tidy was given. +if test "${with_tidy+set}" = set; then : + withval=$with_tidy; PHP_TIDY=$withval else - + PHP_TIDY=no test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL @@ -95669,7 +94849,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -95693,99 +94874,99 @@ done if test -z "$TIDY_DIR"; then - { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } + as_fn_error $? "Cannot find libtidy" "$LINENO" 5 fi TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR - + if test "$ext_shared" = "yes"; then TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" if test -n "$TIDY_LIBDIR"; then - + if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then - + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$TIDY_LIBDIR else - + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$TIDY_LIBDIR"; then - + if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then - + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$TIDY_LIBDIR else - + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$TIDY_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 tidy in c|c_r|pthread*) ;; - *) - LIBS="-ltidy $LIBS" + *) + LIBS="-ltidy $LIBS" ;; esac @@ -95795,55 +94976,55 @@ fi - + if test "$TIDY_INCDIR" != "/usr/include"; then - + if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then ai_p=$TIDY_INCDIR else - + ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" 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 - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -95854,20 +95035,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -95880,106 +95061,106 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 -echo "configure:95927: checking for tidyOptGetDoc in -ltidy" >&5 -ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy" >&5 +$as_echo_n "checking for tidyOptGetDoc in -ltidy... " >&6; } +if ${ac_cv_lib_tidy_tidyOptGetDoc+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltidy $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -tidyOptGetDoc() -; return 0; } -EOF -if { (eval echo configure:95946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tidyOptGetDoc (); +int +main () +{ +return tidyOptGetDoc (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tidy_tidyOptGetDoc=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_lib_tidy_tidyOptGetDoc=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - +{ $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" = xyes; then : + LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - - cat >> confdefs.h <<\EOF -#define HAVE_TIDYOPTGETDOC 1 -EOF - - + +$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_tidy_tidyOptGetDoc - - + + fi - + ext_builddir=ext/tidy ext_srcdir=$abs_srcdir/ext/tidy @@ -95987,15 +95168,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_TIDY_SHARED=no - - + + case ext/tidy in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96008,12 +95189,12 @@ old_IFS=$IFS for ac_src in tidy.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96037,14 +95218,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_TIDY_SHARED=yes - + case ext/tidy in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -96057,12 +95238,12 @@ old_IFS=$IFS for ac_src in tidy.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" case $ac_src in @@ -96080,7 +95261,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -96090,7 +95271,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(TIDY_SHARED_LIBADD)' ;; *) suffix=la @@ -96103,7 +95284,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_TIDY 1 -EOF +_ACEOF fi fi @@ -96165,15 +95347,15 @@ PHP_TIDY_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/tidy in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96186,12 +95368,12 @@ old_IFS=$IFS for ac_src in tidy.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96211,15 +95393,15 @@ EXT_STATIC="$EXT_STATIC tidy" ;; *) - - + + case ext/tidy in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96232,12 +95414,12 @@ old_IFS=$IFS for ac_src in tidy.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96258,25 +95440,24 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=tidy - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" - cat >> confdefs.h <<\EOF -#define HAVE_TIDY 1 -EOF + +$as_echo "#define HAVE_TIDY 1" >>confdefs.h fi @@ -96285,14 +95466,13 @@ php_enable_tokenizer=yes -echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 -echo "configure:96290: checking whether to enable tokenizer support" >&5 -# Check whether --enable-tokenizer or --disable-tokenizer was given. -if test "${enable_tokenizer+set}" = set; then - enableval="$enable_tokenizer" - PHP_TOKENIZER=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5 +$as_echo_n "checking whether to enable tokenizer support... " >&6; } +# Check whether --enable-tokenizer was given. +if test "${enable_tokenizer+set}" = set; then : + enableval=$enable_tokenizer; PHP_TOKENIZER=$enableval else - + PHP_TOKENIZER=yes test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL @@ -96321,13 +95501,14 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_TOKENIZER" != "no"; then - + ext_builddir=ext/tokenizer ext_srcdir=$abs_srcdir/ext/tokenizer @@ -96335,15 +95516,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_TOKENIZER_SHARED=no - - + + case ext/tokenizer in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96356,12 +95537,12 @@ old_IFS=$IFS for ac_src in tokenizer.c tokenizer_data.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96385,14 +95566,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_TOKENIZER_SHARED=yes - + case ext/tokenizer in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -96405,12 +95586,12 @@ old_IFS=$IFS for ac_src in tokenizer.c tokenizer_data.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" case $ac_src in @@ -96428,7 +95609,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -96438,7 +95619,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(TOKENIZER_SHARED_LIBADD)' ;; *) suffix=la @@ -96451,7 +95632,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_TOKENIZER 1 -EOF +_ACEOF fi fi @@ -96513,15 +95695,15 @@ PHP_TOKENIZER_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/tokenizer in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96534,12 +95716,12 @@ old_IFS=$IFS for ac_src in tokenizer.c tokenizer_data.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96559,15 +95741,15 @@ EXT_STATIC="$EXT_STATIC tokenizer" ;; *) - - + + case ext/tokenizer in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96580,12 +95762,12 @@ old_IFS=$IFS for ac_src in tokenizer.c tokenizer_data.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96606,20 +95788,20 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=tokenizer - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -96631,14 +95813,13 @@ php_enable_wddx=no -echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -echo "configure:96636: checking whether to enable WDDX support" >&5 -# Check whether --enable-wddx or --disable-wddx was given. -if test "${enable_wddx+set}" = set; then - enableval="$enable_wddx" - PHP_WDDX=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable WDDX support" >&5 +$as_echo_n "checking whether to enable WDDX support... " >&6; } +# Check whether --enable-wddx was given. +if test "${enable_wddx+set}" = set; then : + enableval=$enable_wddx; PHP_WDDX=$enableval else - + PHP_WDDX=no test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL @@ -96667,31 +95848,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:96681: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -96700,22 +95883,23 @@ php_with_libexpat_dir=no -echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 -echo "configure:96705: checking libexpat dir for WDDX" >&5 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -if test "${with_libexpat_dir+set}" = set; then - withval="$with_libexpat_dir" - PHP_LIBEXPAT_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat dir for WDDX" >&5 +$as_echo_n "checking libexpat dir for WDDX... " >&6; } + +# Check whether --with-libexpat-dir was given. +if test "${with_libexpat_dir+set}" = set; then : + withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval else - + PHP_LIBEXPAT_DIR=no - + fi ext_output=$PHP_LIBEXPAT_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -96724,16 +95908,16 @@ if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "WDDX extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:96733: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -96742,8 +95926,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -96756,17 +95940,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -96777,20 +95961,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" + WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -96803,80 +95987,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -96886,79 +96070,75 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:96891: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $WDDX_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:96918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - + if test "$PHP_XML" = "no"; then - - + + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -96971,12 +96151,12 @@ old_IFS=$IFS for ac_src in compat.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -96993,19 +96173,19 @@ done - - + + BUILD_DIR="$BUILD_DIR ext/xml" - + fi - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=" "$LINENO" 5 + fi fi @@ -97019,128 +96199,128 @@ done if test -z "$EXPAT_DIR"; then - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } + as_fn_error $? "not found. Please reinstall the expat distribution." "$LINENO" 5 fi - + if test "$EXPAT_DIR/include" != "/usr/include"; then - + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/include else - + ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$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 expat in c|c_r|pthread*) ;; - *) - LIBS="-lexpat $LIBS" + *) + LIBS="-lexpat $LIBS" ;; esac @@ -97150,17 +96330,15 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 -EOF + +$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h fi - cat >> confdefs.h <<\EOF -#define HAVE_WDDX 1 -EOF - +$as_echo "#define HAVE_WDDX 1" >>confdefs.h + + ext_builddir=ext/wddx ext_srcdir=$abs_srcdir/ext/wddx @@ -97168,15 +96346,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_WDDX_SHARED=no - - + + case ext/wddx in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -97189,12 +96367,12 @@ old_IFS=$IFS for ac_src in wddx.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -97218,14 +96396,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_WDDX_SHARED=yes - + case ext/wddx in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -97238,12 +96416,12 @@ old_IFS=$IFS for ac_src in wddx.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" case $ac_src in @@ -97261,7 +96439,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -97271,7 +96449,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(WDDX_SHARED_LIBADD)' ;; *) suffix=la @@ -97284,7 +96462,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_WDDX 1 -EOF +_ACEOF fi fi @@ -97346,15 +96525,15 @@ PHP_WDDX_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/wddx in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -97367,12 +96546,12 @@ old_IFS=$IFS for ac_src in wddx.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -97392,15 +96571,15 @@ EXT_STATIC="$EXT_STATIC wddx" ;; *) - - + + case ext/wddx in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -97413,12 +96592,12 @@ old_IFS=$IFS for ac_src in wddx.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -97439,39 +96618,39 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=wddx - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + am_i_shared=$PHP_WDDX_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" fi @@ -97480,14 +96659,13 @@ php_enable_xml=yes -echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -echo "configure:97485: checking whether to enable XML support" >&5 -# Check whether --enable-xml or --disable-xml was given. -if test "${enable_xml+set}" = set; then - enableval="$enable_xml" - PHP_XML=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5 +$as_echo_n "checking whether to enable XML support... " >&6; } +# Check whether --enable-xml was given. +if test "${enable_xml+set}" = set; then : + enableval=$enable_xml; PHP_XML=$enableval else - + PHP_XML=yes test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL @@ -97516,31 +96694,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:97530: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -97549,22 +96729,23 @@ php_with_libexpat_dir=no -echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -echo "configure:97554: checking libexpat install dir" >&5 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -if test "${with_libexpat_dir+set}" = set; then - withval="$with_libexpat_dir" - PHP_LIBEXPAT_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat install dir" >&5 +$as_echo_n "checking libexpat install dir... " >&6; } + +# Check whether --with-libexpat-dir was given. +if test "${with_libexpat_dir+set}" = set; then : + withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval else - + PHP_LIBEXPAT_DIR=no - + fi ext_output=$PHP_LIBEXPAT_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -97574,16 +96755,16 @@ if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "XML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:97583: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -97592,8 +96773,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -97606,17 +96787,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -97627,20 +96808,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" + XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -97653,80 +96834,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -97736,100 +96917,96 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:97741: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $XML_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:97768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - + xml_extra_sources="compat.c" - + am_i_shared=$PHP_XML_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=" "$LINENO" 5 + fi fi - + if test "$PHP_LIBEXPAT_DIR" != "no"; then for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then @@ -97839,128 +97016,128 @@ done if test -z "$EXPAT_DIR"; then - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } + as_fn_error $? "not found. Please reinstall the expat distribution." "$LINENO" 5 fi - + if test "$EXPAT_DIR/include" != "/usr/include"; then - + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/include else - + ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" 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 - + if test "$ext_shared" = "yes"; then XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$EXPAT_DIR/$PHP_LIBDIR else - + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$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 expat in c|c_r|pthread*) ;; - *) - LIBS="-lexpat $LIBS" + *) + LIBS="-lexpat $LIBS" ;; esac @@ -97970,13 +97147,12 @@ fi - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 -EOF + +$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h fi - + ext_builddir=ext/xml ext_srcdir=$abs_srcdir/ext/xml @@ -97984,15 +97160,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XML_SHARED=no - - + + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98005,12 +97181,12 @@ old_IFS=$IFS for ac_src in xml.c $xml_extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98034,14 +97210,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XML_SHARED=yes - + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -98054,12 +97230,12 @@ old_IFS=$IFS for ac_src in xml.c $xml_extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" case $ac_src in @@ -98077,7 +97253,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -98087,7 +97263,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(XML_SHARED_LIBADD)' ;; *) suffix=la @@ -98100,7 +97276,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XML 1 -EOF +_ACEOF fi fi @@ -98162,15 +97339,15 @@ PHP_XML_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98183,12 +97360,12 @@ old_IFS=$IFS for ac_src in xml.c $xml_extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98208,15 +97385,15 @@ EXT_STATIC="$EXT_STATIC xml" ;; *) - - + + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98229,12 +97406,12 @@ old_IFS=$IFS for ac_src in xml.c $xml_extra_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98255,43 +97432,42 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xml" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xml - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD" - - + + for header_file in ext/xml/; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done - cat >> confdefs.h <<\EOF -#define HAVE_XML 1 -EOF + + +$as_echo "#define HAVE_XML 1" >>confdefs.h fi @@ -98299,14 +97475,13 @@ php_enable_xmlreader=yes -echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -echo "configure:98304: checking whether to enable XMLReader support" >&5 -# Check whether --enable-xmlreader or --disable-xmlreader was given. -if test "${enable_xmlreader+set}" = set; then - enableval="$enable_xmlreader" - PHP_XMLREADER=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5 +$as_echo_n "checking whether to enable XMLReader support... " >&6; } +# Check whether --enable-xmlreader was given. +if test "${enable_xmlreader+set}" = set; then : + enableval=$enable_xmlreader; PHP_XMLREADER=$enableval else - + PHP_XMLREADER=yes test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL @@ -98335,31 +97510,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:98349: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -98368,16 +97545,16 @@ if test "$PHP_XMLREADER" != "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "XMLReader extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:98377: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -98386,8 +97563,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -98400,17 +97577,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -98421,20 +97598,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" + XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -98447,80 +97624,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -98530,74 +97707,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:98535: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $XMLREADER_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:98562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_XMLREADER 1 -EOF - + +$as_echo "#define HAVE_XMLREADER 1" >>confdefs.h + + ext_builddir=ext/xmlreader ext_srcdir=$abs_srcdir/ext/xmlreader @@ -98605,15 +97777,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XMLREADER_SHARED=no - - + + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98626,12 +97798,12 @@ old_IFS=$IFS for ac_src in php_xmlreader.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98655,14 +97827,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XMLREADER_SHARED=yes - + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -98675,12 +97847,12 @@ old_IFS=$IFS for ac_src in php_xmlreader.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" case $ac_src in @@ -98698,7 +97870,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -98708,7 +97880,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(XMLREADER_SHARED_LIBADD)' ;; *) suffix=la @@ -98721,7 +97893,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XMLREADER 1 -EOF +_ACEOF fi fi @@ -98783,15 +97956,15 @@ PHP_XMLREADER_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98804,12 +97977,12 @@ old_IFS=$IFS for ac_src in php_xmlreader.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98829,15 +98002,15 @@ EXT_STATIC="$EXT_STATIC xmlreader" ;; *) - - + + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -98850,12 +98023,12 @@ old_IFS=$IFS for ac_src in php_xmlreader.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -98876,48 +98049,48 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xmlreader - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + am_i_shared=$PHP_XMLREADER_SHARED is_it_shared=$PHP_DOM_SHARED is_it_enabled=$PHP_DOM if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + fi fi @@ -98939,14 +98112,14 @@ php_with_xmlrpc=no -echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 -echo "configure:98944: checking for XMLRPC-EPI support" >&5 -# Check whether --with-xmlrpc or --without-xmlrpc was given. -if test "${with_xmlrpc+set}" = set; then - withval="$with_xmlrpc" - PHP_XMLRPC=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLRPC-EPI support" >&5 +$as_echo_n "checking for XMLRPC-EPI support... " >&6; } + +# Check whether --with-xmlrpc was given. +if test "${with_xmlrpc+set}" = set; then : + withval=$with_xmlrpc; PHP_XMLRPC=$withval else - + PHP_XMLRPC=no test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL @@ -98975,31 +98148,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:98989: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -99008,22 +98183,23 @@ php_with_libexpat_dir=no -echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 -echo "configure:99013: checking libexpat dir for XMLRPC-EPI" >&5 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -if test "${with_libexpat_dir+set}" = set; then - withval="$with_libexpat_dir" - PHP_LIBEXPAT_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat dir for XMLRPC-EPI" >&5 +$as_echo_n "checking libexpat dir for XMLRPC-EPI... " >&6; } + +# Check whether --with-libexpat-dir was given. +if test "${with_libexpat_dir+set}" = set; then : + withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval else - + PHP_LIBEXPAT_DIR=no - + fi ext_output=$PHP_LIBEXPAT_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -99031,68 +98207,68 @@ php_with_iconv_dir=no -echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 -echo "configure:99036: checking iconv dir for XMLRPC-EPI" >&5 -# Check whether --with-iconv-dir or --without-iconv-dir was given. -if test "${with_iconv_dir+set}" = set; then - withval="$with_iconv_dir" - PHP_ICONV_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking iconv dir for XMLRPC-EPI" >&5 +$as_echo_n "checking iconv dir for XMLRPC-EPI... " >&6; } + +# Check whether --with-iconv-dir was given. +if test "${with_iconv_dir+set}" = set; then : + withval=$with_iconv_dir; PHP_ICONV_DIR=$withval else - + PHP_ICONV_DIR=no - + fi ext_output=$PHP_ICONV_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test "$PHP_XMLRPC" != "no"; then - + am_i_shared=$PHP_XMLRPC_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" - cat >> confdefs.h <<\EOF -#define HAVE_XMLRPC 1 -EOF + +$as_echo "#define HAVE_XMLRPC 1" >>confdefs.h if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "XML-RPC extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:99092: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -99101,8 +98277,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -99115,17 +98291,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -99136,20 +98312,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" + XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -99162,80 +98338,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -99245,79 +98421,75 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:99250: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $XMLRPC_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:99277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - + if test "$PHP_XML" = "no"; then - - + + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -99330,12 +98502,12 @@ old_IFS=$IFS for ac_src in compat.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -99352,117 +98524,116 @@ done - - + + BUILD_DIR="$BUILD_DIR ext/xml" - + fi - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Use --with-libxml-dir=" "$LINENO" 5 + fi else testval=no for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBEXPAT 1 -EOF - +$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h + + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" if test -n "$i/$PHP_LIBDIR"; then - + if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$i/$PHP_LIBDIR else - + ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$i/$PHP_LIBDIR"; then - + if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$i/$PHP_LIBDIR else - + ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$i/$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 expat in c|c_r|pthread*) ;; - *) - LIBS="-lexpat $LIBS" + *) + LIBS="-lexpat $LIBS" ;; esac @@ -99472,33 +98643,33 @@ fi - + if test "$i/include" != "/usr/include"; then - + if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then ai_p=$i/include else - + ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$i/include\"`" 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 @@ -99509,7 +98680,7 @@ done if test "$testval" = "no"; then - { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } + as_fn_error $? "XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" "$LINENO" 5 fi fi @@ -99518,12 +98689,12 @@ if test "$PHP_ICONV_DIR" != "no"; then PHP_ICONV=$PHP_ICONV_DIR fi - + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then PHP_ICONV=yes fi - - + + found_iconv=no unset ICONV_DIR @@ -99541,113 +98712,27 @@ echo > ext/iconv/php_iconv_supports_errno.h if test "$PHP_ICONV" = "yes"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:99546: checking for iconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char iconv(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_iconv) || defined (__stub___iconv) -choke me -#else -iconv(); -#endif - -; return 0; } -EOF -if { (eval echo configure:99574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_iconv=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_iconv=no" -fi -rm -f conftest* -fi + ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" +if test "x$ac_cv_func_iconv" = xyes; then : -if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found_iconv=yes - -else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:99595: checking for libiconv" >&5 -if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char libiconv(); -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_libiconv) || defined (__stub___libiconv) -choke me -#else -libiconv(); -#endif + ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv" +if test "x$ac_cv_func_libiconv" = xyes; then : -; return 0; } -EOF -if { (eval echo configure:99623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_libiconv=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_libiconv=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF + +$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h found_iconv=yes - -else - echo "$ac_t""no" 1>&6 + fi - + fi fi @@ -99656,9 +98741,8 @@ for i in $PHP_ICONV /usr/local /usr; do if test -r $i/include/giconv.h; then - cat >> confdefs.h <<\EOF -#define HAVE_GICONV_H 1 -EOF + +$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h ICONV_DIR=$i iconv_lib_name=giconv @@ -99671,31 +98755,31 @@ done if test -z "$ICONV_DIR"; then - { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } + as_fn_error $? "Please specify the install prefix of iconv with --with-iconv=" "$LINENO" 5 fi - + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$ICONV_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -99706,20 +98790,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -99732,130 +98816,131 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:99779: checking for libiconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$iconv_lib_name $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -libiconv() -; return 0; } -EOF -if { (eval echo configure:99798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char libiconv (); +int +main () +{ +return libiconv (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_iconv=yes - + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - cat >> confdefs.h <<\EOF -#define HAVE_LIBICONV 1 -EOF - +$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h + + echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h - cat >> confdefs.h <<\EOF -#define ICONV_ALIASED_LIBICONV 1 -EOF - - +$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h + + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$iconv_lib_name_libiconv - - + + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$ICONV_DIR/$PHP_LIBDIR " - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -99866,20 +98951,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -99892,204 +98977,206 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:99939: checking for iconv in -l$iconv_lib_name" >&5 -ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$iconv_lib_name $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -iconv() -; return 0; } -EOF -if { (eval echo configure:99958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iconv (); +int +main () +{ +return iconv (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + found_iconv=yes - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$iconv_lib_name_iconv - - + + fi - - + + fi fi fi if test "$found_iconv" = "yes"; then - + echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h - cat >> confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h if test -n "$ICONV_DIR"; then - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/$PHP_LIBDIR else - + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$ICONV_DIR/$PHP_LIBDIR"; then - + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/$PHP_LIBDIR else - + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/$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 $iconv_lib_name in c|c_r|pthread*) ;; - *) - LIBS="-l$iconv_lib_name $LIBS" + *) + LIBS="-l$iconv_lib_name $LIBS" ;; esac @@ -100099,170 +99186,231 @@ fi - + if test "$ICONV_DIR/include" != "/usr/include"; then - + if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then ai_p=$ICONV_DIR/include else - + ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" 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 fi - -else - { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } - + +else + as_fn_error $? "iconv not found, in order to build xmlrpc you need the iconv library" "$LINENO" 5 + fi fi fi if test "$PHP_XMLRPC" = "yes"; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:100148: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +IFS=$as_save_IFS + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - echo "$ac_t""no" 1>&6 + RANLIB="$ac_cv_prog_RANLIB" fi -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:100176: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:100190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +case $ac_cv_c_inline in inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >> confdefs.h <>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; esac - -cat >> confdefs.h <<\EOF -#define UNDEF_THREADS_HACK -EOF + + +$as_echo "#define UNDEF_THREADS_HACK /**/" >>confdefs.h -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:100228: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:100241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -100271,16 +99419,15 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -100289,82 +99436,66 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -EOF -if { (eval echo configure:100308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF -fi +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:100335: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:100345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 + +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" +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 + fi + done @@ -100372,262 +99503,212 @@ -echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:100377: checking size of char" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_char=1 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(char)); - return(0); -} -EOF -if { (eval echo configure:100396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_char=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_char=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# 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 ${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 : + +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_error 77 "cannot compute sizeof (char) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_char=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_char" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_char" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR $ac_cv_sizeof_char -EOF +_ACEOF -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:100417: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if ${ac_cv_sizeof_int+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); -} -EOF -if { (eval echo configure:100436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF -echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:100456: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=4 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); -} -EOF -if { (eval echo configure:100475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if ${ac_cv_sizeof_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF +_ACEOF -echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:100495: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long=8 -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long long)); - return(0); -} -EOF -if { (eval echo configure:100514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long=0 -fi -rm -fr conftest* +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if ${ac_cv_sizeof_long_long+:} false; then : + $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 : + +else + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long=0 + fi fi fi -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long -EOF +_ACEOF -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:100534: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned -EOF +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:100567: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:100581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_time=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 -EOF + +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:100602: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if ${ac_cv_type_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "uid_t" >/dev/null 2>&1; then : ac_cv_type_uid_t=yes else - rm -rf conftest* ac_cv_type_uid_t=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF -#define uid_t int -EOF - cat >> confdefs.h <<\EOF -#define gid_t int -EOF +$as_echo "#define uid_t int" >>confdefs.h + + +$as_echo "#define gid_t int" >>confdefs.h fi @@ -100641,64 +99722,21 @@ strtoul strtoull snprintf \ strstr strpbrk strerror\ memcpy memmove -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:100647: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:100675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - + ext_builddir=ext/xmlrpc ext_srcdir=$abs_srcdir/ext/xmlrpc @@ -100706,15 +99744,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XMLRPC_SHARED=no - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -100732,12 +99770,12 @@ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ libxmlrpc/xml_to_soap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -100761,14 +99799,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XMLRPC_SHARED=yes - + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -100786,12 +99824,12 @@ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ libxmlrpc/xml_to_soap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" case $ac_src in @@ -100809,7 +99847,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -100819,7 +99857,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_SHARED_LIBADD)' ;; *) suffix=la @@ -100832,7 +99870,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XMLRPC 1 -EOF +_ACEOF fi fi @@ -100894,15 +99933,15 @@ PHP_XMLRPC_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -100920,12 +99959,12 @@ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ libxmlrpc/xml_to_soap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -100945,15 +99984,15 @@ EXT_STATIC="$EXT_STATIC xmlrpc" ;; *) - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -100971,12 +100010,12 @@ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ libxmlrpc/xml_to_soap.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -100997,23 +100036,23 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xmlrpc - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" - + XMLRPC_MODULE_TYPE=builtin @@ -101024,141 +100063,143 @@ elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi else - echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 -echo "configure:101029: checking for XMLRPC-EPI in default path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLRPC-EPI in default path" >&5 +$as_echo_n "checking for XMLRPC-EPI in default path... " >&6; } for i in /usr/local /usr; do if test -r $i/include/xmlrpc.h; then XMLRPC_DIR=$i/include - echo "$ac_t""found in $i" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5 +$as_echo "found in $i" >&6; } break fi done fi if test -z "$XMLRPC_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } + { $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 fi - + if test "$XMLRPC_DIR" != "/usr/include"; then - + if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then ai_p=$XMLRPC_DIR else - + ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" 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 - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - + if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$XMLRPC_DIR/$PHP_LIBDIR else - + ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - + if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$XMLRPC_DIR/$PHP_LIBDIR else - + ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$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 xmlrpc in c|c_r|pthread*) ;; - *) - LIBS="-lxmlrpc $LIBS" + *) + LIBS="-lxmlrpc $LIBS" ;; esac @@ -101168,7 +100209,7 @@ fi - + ext_builddir=ext/xmlrpc ext_srcdir=$abs_srcdir/ext/xmlrpc @@ -101176,15 +100217,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XMLRPC_SHARED=no - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -101197,12 +100238,12 @@ old_IFS=$IFS for ac_src in xmlrpc-epi-php.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -101226,14 +100267,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XMLRPC_SHARED=yes - + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -101246,12 +100287,12 @@ old_IFS=$IFS for ac_src in xmlrpc-epi-php.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" case $ac_src in @@ -101269,7 +100310,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -101279,7 +100320,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_SHARED_LIBADD)' ;; *) suffix=la @@ -101292,7 +100333,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XMLRPC 1 -EOF +_ACEOF fi fi @@ -101354,15 +100396,15 @@ PHP_XMLRPC_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -101375,12 +100417,12 @@ old_IFS=$IFS for ac_src in xmlrpc-epi-php.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -101400,15 +100442,15 @@ EXT_STATIC="$EXT_STATIC xmlrpc" ;; *) - - + + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -101421,12 +100463,12 @@ old_IFS=$IFS for ac_src in xmlrpc-epi-php.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -101447,15 +100489,15 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xmlrpc - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi @@ -101467,14 +100509,13 @@ php_enable_xmlwriter=yes -echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 -echo "configure:101472: checking whether to enable XMLWriter support" >&5 -# Check whether --enable-xmlwriter or --disable-xmlwriter was given. -if test "${enable_xmlwriter+set}" = set; then - enableval="$enable_xmlwriter" - PHP_XMLWRITER=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5 +$as_echo_n "checking whether to enable XMLWriter support... " >&6; } +# Check whether --enable-xmlwriter was given. +if test "${enable_xmlwriter+set}" = set; then : + enableval=$enable_xmlwriter; PHP_XMLWRITER=$enableval else - + PHP_XMLWRITER=yes test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL @@ -101503,31 +100544,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_LIBXML_DIR"; then - + php_with_libxml_dir=no -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:101517: checking libxml2 install dir" >&5 -# Check whether --with-libxml-dir or --without-libxml-dir was given. -if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" - PHP_LIBXML_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5 +$as_echo_n "checking libxml2 install dir... " >&6; } + +# Check whether --with-libxml-dir was given. +if test "${with_libxml_dir+set}" = set; then : + withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval else - + PHP_LIBXML_DIR=no - + fi ext_output=$PHP_LIBXML_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -101536,16 +100579,16 @@ if test "$PHP_XMLWRITER" != "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "XMLWriter extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:101545: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5 +$as_echo_n "checking for xml2-config path... " >&6; } +if ${ac_cv_php_xml2_config_path+:} false; then : + $as_echo_n "(cached) " >&6 else - + for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -101554,8 +100597,8 @@ done fi - -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5 +$as_echo "$ac_cv_php_xml2_config_path" >&6; } if test -x "$ac_cv_php_xml2_config_path"; then XML2_CONFIG="$ac_cv_php_xml2_config_path" @@ -101568,17 +100611,17 @@ if test "$LIBXML_VERSION" -ge "2006011"; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` - + for ac_i in $LIBXML_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -101589,20 +100632,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" + XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -101615,80 +100658,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $LIBXML_INCS; 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 @@ -101698,74 +100741,69 @@ done - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:101703: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5 +$as_echo_n "checking whether libxml build works... " >&6; } +if ${php_cv_libxml_build_works+:} false; then : + $as_echo_n "(cached) " >&6 else - - + + old_LIBS=$LIBS LIBS=" $XMLWRITER_SHARED_LIBADD $LIBS" - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + LIBS=$old_LIBS - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ + - char xmlInitParser(); int main() { xmlInitParser(); return 0; } - -EOF -if { (eval echo configure:101730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBS=$old_LIBS - + php_cv_libxml_build_works=yes - - + + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - + + { $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 + + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5 +$as_echo "$php_cv_libxml_build_works" >&6; } if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF + +$as_echo "#define HAVE_LIBXML 1" >>confdefs.h fi - - cat >> confdefs.h <<\EOF -#define HAVE_XMLWRITER 1 -EOF - + +$as_echo "#define HAVE_XMLWRITER 1" >>confdefs.h + + ext_builddir=ext/xmlwriter ext_srcdir=$abs_srcdir/ext/xmlwriter @@ -101773,15 +100811,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XMLWRITER_SHARED=no - - + + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -101794,12 +100832,12 @@ old_IFS=$IFS for ac_src in php_xmlwriter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -101823,14 +100861,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XMLWRITER_SHARED=yes - + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -101843,12 +100881,12 @@ old_IFS=$IFS for ac_src in php_xmlwriter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" case $ac_src in @@ -101866,7 +100904,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -101876,7 +100914,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(XMLWRITER_SHARED_LIBADD)' ;; *) suffix=la @@ -101889,7 +100927,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XMLWRITER 1 -EOF +_ACEOF fi fi @@ -101951,15 +100990,15 @@ PHP_XMLWRITER_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -101972,12 +101011,12 @@ old_IFS=$IFS for ac_src in php_xmlwriter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -101997,15 +101036,15 @@ EXT_STATIC="$EXT_STATIC xmlwriter" ;; *) - - + + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -102018,12 +101057,12 @@ old_IFS=$IFS for ac_src in php_xmlwriter.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -102044,29 +101083,29 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xmlwriter - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD" - + else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxml2 version 2.6.11 or greater required." "$LINENO" 5 fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - +else + as_fn_error $? "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5 + fi fi @@ -102075,14 +101114,14 @@ php_with_xsl=no -echo $ac_n "checking for XSL support""... $ac_c" 1>&6 -echo "configure:102080: checking for XSL support" >&5 -# Check whether --with-xsl or --without-xsl was given. -if test "${with_xsl+set}" = set; then - withval="$with_xsl" - PHP_XSL=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSL support" >&5 +$as_echo_n "checking for XSL support... " >&6; } + +# Check whether --with-xsl was given. +if test "${with_xsl+set}" = set; then : + withval=$with_xsl; PHP_XSL=$withval else - + PHP_XSL=no test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL @@ -102111,7 +101150,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -102119,11 +101159,11 @@ if test "$PHP_XSL" != "no"; then if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + as_fn_error $? "XSL extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5 fi - + if test "$PHP_DOM" = "no"; then - { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } + as_fn_error $? "XSL extension requires DOM extension, add --enable-dom" "$LINENO" 5 fi for i in $PHP_XSL /usr/local /usr; do @@ -102134,7 +101174,7 @@ done if test -z "$XSLT_CONFIG"; then - { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } + 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 @@ -102145,17 +101185,17 @@ if test "$LIBXSLT_VERSION" -ge "1001000"; then XSL_LIBS=`$XSLT_CONFIG --libs` XSL_INCS=`$XSLT_CONFIG --cflags` - + for ac_i in $XSL_LIBS; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -102166,20 +101206,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" + XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -102192,80 +101232,80 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" else - - - + + + 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 ;; esac done - + for ac_i in $XSL_INCS; 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 @@ -102274,9 +101314,9 @@ esac done - - echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 -echo "configure:102280: checking for EXSLT support" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXSLT support" >&5 +$as_echo_n "checking for EXSLT support... " >&6; } for i in $PHP_XSL /usr/local /usr; do if test -r "$i/include/libexslt/exslt.h"; then PHP_XSL_EXSL_DIR=$i @@ -102284,97 +101324,99 @@ fi done if test -z "$PHP_XSL_EXSL_DIR"; then - echo "$ac_t""not found" 1>&6 - else - echo "$ac_t""found" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + if test "$ext_shared" = "yes"; then XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then - + if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then - + if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$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 exslt in c|c_r|pthread*) ;; - *) - LIBS="-lexslt $LIBS" + *) + LIBS="-lexslt $LIBS" ;; esac @@ -102384,54 +101426,52 @@ fi - + if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then - + if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then ai_p=$PHP_XSL_EXSL_DIR/include else - + ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" 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 - cat >> confdefs.h <<\EOF -#define HAVE_XSL_EXSLT 1 -EOF + +$as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h fi else - { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } + as_fn_error $? "libxslt version 1.1.0 or greater required." "$LINENO" 5 fi - - + + fi - - cat >> confdefs.h <<\EOF -#define HAVE_XSL 1 -EOF - + +$as_echo "#define HAVE_XSL 1" >>confdefs.h + + ext_builddir=ext/xsl ext_srcdir=$abs_srcdir/ext/xsl @@ -102439,15 +101479,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_XSL_SHARED=no - - + + case ext/xsl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -102460,12 +101500,12 @@ old_IFS=$IFS for ac_src in php_xsl.c xsltprocessor.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -102489,14 +101529,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_XSL_SHARED=yes - + case ext/xsl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -102509,12 +101549,12 @@ old_IFS=$IFS for ac_src in php_xsl.c xsltprocessor.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo" case $ac_src in @@ -102532,7 +101572,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -102542,7 +101582,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(XSL_SHARED_LIBADD)' ;; *) suffix=la @@ -102555,7 +101595,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_XSL 1 -EOF +_ACEOF fi fi @@ -102617,15 +101658,15 @@ PHP_XSL_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/xsl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -102638,12 +101679,12 @@ old_IFS=$IFS for ac_src in php_xsl.c xsltprocessor.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -102663,15 +101704,15 @@ EXT_STATIC="$EXT_STATIC xsl" ;; *) - - + + case ext/xsl in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -102684,12 +101725,12 @@ old_IFS=$IFS for ac_src in php_xsl.c xsltprocessor.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -102710,55 +101751,54 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC xsl" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=xsl - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD" - + am_i_shared=$PHP_XSL_SHARED is_it_shared=$PHP_LIBXML_SHARED is_it_enabled=$PHP_LIBXML if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then - { echo "configure: 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 build to be successful. -" 1>&2; exit 1; } +" "$LINENO" 5 fi if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: 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. -" 1>&2; exit 1; } +" "$LINENO" 5 fi - + fi php_enable_zip=no -echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 -echo "configure:102756: checking for zip archive read/writesupport" >&5 -# Check whether --enable-zip or --disable-zip was given. -if test "${enable_zip+set}" = set; then - enableval="$enable_zip" - PHP_ZIP=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip archive read/writesupport" >&5 +$as_echo_n "checking for zip archive read/writesupport... " >&6; } +# Check whether --enable-zip was given. +if test "${enable_zip+set}" = set; then : + enableval=$enable_zip; PHP_ZIP=$enableval else - + PHP_ZIP=no test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL @@ -102787,31 +101827,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_ZLIB_DIR"; then - + php_with_zlib_dir=no -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:102801: checking for the location of libz" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5 +$as_echo_n "checking for the location of libz... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -102820,22 +101862,23 @@ php_with_pcre_dir=no -echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -echo "configure:102825: checking pcre install prefix" >&5 -# Check whether --with-pcre-dir or --without-pcre-dir was given. -if test "${with_pcre_dir+set}" = set; then - withval="$with_pcre_dir" - PHP_PCRE_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre install prefix" >&5 +$as_echo_n "checking pcre install prefix... " >&6; } + +# Check whether --with-pcre-dir was given. +if test "${with_pcre_dir+set}" = set; then : + withval=$with_pcre_dir; PHP_PCRE_DIR=$withval else - + PHP_PCRE_DIR=no - + fi ext_output=$PHP_PCRE_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -102850,7 +101893,7 @@ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" else - { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } + as_fn_error $? "Can not find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5 fi else for i in /usr/local /usr; do @@ -102864,100 +101907,101 @@ done fi - echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 -echo "configure:102869: checking for the location of zlib" >&5 + { $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 - { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } + as_fn_error $? "zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" "$LINENO" 5 else - echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_ZLIB_DIR" >&5 +$as_echo "$PHP_ZLIB_DIR" >&6; } + if test "$ext_shared" = "yes"; then ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" fi - + if test "$ext_shared" = "yes"; then ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -102967,33 +102011,33 @@ fi - + if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then - + if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_INCDIR else - + ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" 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 @@ -103002,50 +102046,44 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$INCLUDES - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include
#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + PHP_PCRE_REGEX=yes - + else - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include
#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) yes #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - + $EGREP "yes" >/dev/null 2>&1; then : + PHP_PCRE_REGEX=pecl - + else - rm -rf conftest* - + PHP_PCRE_REGEX=no - + fi rm -f conftest* - + fi rm -f conftest* @@ -103071,11 +102109,10 @@ lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ lib/zip_error_clear.c lib/zip_file_error_clear.c" - cat >> confdefs.h <<\EOF -#define HAVE_ZIP 1 -EOF - +$as_echo "#define HAVE_ZIP 1" >>confdefs.h + + ext_builddir=ext/zip ext_srcdir=$abs_srcdir/ext/zip @@ -103083,15 +102120,15 @@ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_ZIP_SHARED=no - - + + case ext/zip in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103104,12 +102141,12 @@ old_IFS=$IFS for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103133,14 +102170,14 @@ else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then PHP_ZIP_SHARED=yes - + case ext/zip in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -103153,12 +102190,12 @@ old_IFS=$IFS for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo" case $ac_src in @@ -103176,7 +102213,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -103186,7 +102223,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(ZIP_SHARED_LIBADD)' ;; *) suffix=la @@ -103199,7 +102236,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_ZIP 1 -EOF +_ACEOF fi fi @@ -103261,15 +102299,15 @@ PHP_ZIP_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/zip in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103282,12 +102320,12 @@ old_IFS=$IFS for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103307,15 +102345,15 @@ EXT_STATIC="$EXT_STATIC zip" ;; *) - - + + case ext/zip in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103328,12 +102366,12 @@ old_IFS=$IFS for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103354,29 +102392,29 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC zip" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=zip - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + $php_shtool mkdir -p $ext_builddir/lib - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD" - + src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir @@ -103389,14 +102427,13 @@ php_enable_disable_mysqlnd_compression_support=yes -echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6 -echo "configure:103394: checking whether to disable compressed protocol support in mysqlnd" >&5 -# Check whether --enable-disable_mysqlnd_compression_support or --disable-disable_mysqlnd_compression_support was given. -if test "${enable_disable_mysqlnd_compression_support+set}" = set; then - enableval="$enable_disable_mysqlnd_compression_support" - PHP_DISABLE_MYSQLND_COMPRESSION_SUPPORT=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable compressed protocol support in mysqlnd" >&5 +$as_echo_n "checking whether to disable compressed protocol support in mysqlnd... " >&6; } +# Check whether --enable-disable_mysqlnd_compression_support was given. +if test "${enable_disable_mysqlnd_compression_support+set}" = set; then : + enableval=$enable_disable_mysqlnd_compression_support; PHP_DISABLE_MYSQLND_COMPRESSION_SUPPORT=$enableval else - + PHP_DISABLE_MYSQLND_COMPRESSION_SUPPORT=yes test "$PHP_ENABLE_ALL" && PHP_DISABLE_MYSQLND_COMPRESSION_SUPPORT=$PHP_ENABLE_ALL @@ -103425,31 +102462,33 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } if test -z "$PHP_ZLIB_DIR"; then - + php_with_zlib_dir=no -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:103439: checking for the location of libz" >&5 -# Check whether --with-zlib-dir or --without-zlib-dir was given. -if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" - PHP_ZLIB_DIR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5 +$as_echo_n "checking for the location of libz... " >&6; } + +# Check whether --with-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then : + withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval else - + PHP_ZLIB_DIR=no - + fi ext_output=$PHP_ZLIB_DIR -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -103462,7 +102501,7 @@ mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_debug.c\ mysqlnd_block_alloc.c php_mysqlnd.c" - + ext_builddir=ext/mysqlnd ext_srcdir=$abs_srcdir/ext/mysqlnd @@ -103470,15 +102509,15 @@ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then PHP_MYSQLND_SHARED=no - - + + case ext/mysqlnd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103491,12 +102530,12 @@ old_IFS=$IFS for ac_src in $mysqlnd_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103520,14 +102559,14 @@ else if test "no" = "shared" || test "no" = "yes"; then PHP_MYSQLND_SHARED=yes - + case ext/mysqlnd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$shared_c_pre b_cxx_pre=$shared_cxx_pre @@ -103540,12 +102579,12 @@ old_IFS=$IFS for ac_src in $mysqlnd_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + shared_objects_mysqlnd="$shared_objects_mysqlnd $ac_bdir$ac_obj.lo" case $ac_src in @@ -103563,7 +102602,7 @@ case $host_alias in *netware*) - + install_modules="install-modules" case $host_alias in @@ -103573,7 +102612,7 @@ ;; *netware*) suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLND, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(MYSQLND_SHARED_LIBADD)' ;; *) suffix=la @@ -103586,7 +102625,7 @@ else PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqlnd.$suffix" fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqlnd" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>confdefs.h <<_ACEOF #define COMPILE_DL_MYSQLND 1 -EOF +_ACEOF fi fi @@ -103648,15 +102688,15 @@ PHP_MYSQLND_SHARED=no case "$PHP_SAPI" in cgi|embed) - - + + case ext/mysqlnd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103669,12 +102709,12 @@ old_IFS=$IFS for ac_src in $mysqlnd_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103694,15 +102734,15 @@ EXT_STATIC="$EXT_STATIC mysqlnd" ;; *) - - + + case ext/mysqlnd in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -103715,12 +102755,12 @@ old_IFS=$IFS for ac_src in $mysqlnd_sources; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -103741,138 +102781,137 @@ esac EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd" fi - - + + BUILD_DIR="$BUILD_DIR $ext_builddir" - + if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=mysqlnd - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - - + + $php_shtool mkdir -p ext/mysqlnd - - - - for header_file in ext/mysqlnd/; do - - - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - + + + + for header_file in ext/mysqlnd/; do + + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "INSTALLHEADERS$unique=set" - + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - + fi - done - + done + + - if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then if test -z "$PHP_ZLIB_DIR"; then - cat >> confdefs.h <<\EOF -#define MYSQLND_COMPRESSION_ENABLED 1 -EOF - +$as_echo "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h + + if test "$ext_shared" = "yes"; then MYSQLND_SHARED_LIBADD="-lz $MYSQLND_SHARED_LIBADD" if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" fi - + if test "$ext_shared" = "yes"; then MYSQLND_SHARED_LIBADD="-L$ai_p $MYSQLND_SHARED_LIBADD" test -n "$ld_runpath_switch" && MYSQLND_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLND_SHARED_LIBADD" else - - - + + + 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 fi else - + if test -n "$PHP_ZLIB_DIR"; then - + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then - + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then ai_p=$PHP_ZLIB_DIR else - + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - + ep_realdir="`(cd \"$ep_dir\" && pwd)`" ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 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 z in c|c_r|pthread*) ;; - *) - LIBS="-lz $LIBS" + *) + LIBS="-lz $LIBS" ;; esac @@ -103885,41 +102924,39 @@ MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" fi fi - cat >> confdefs.h <<\EOF -#define MYSQLND_SSL_SUPPORTED 1 -EOF + +$as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h fi if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then - - + + $php_shtool mkdir -p ext/mysqlnd - - + + for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do - echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 -echo "configure:103905: checking whether $php_typename exists" >&5 - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $php_typename exists" >&5 +$as_echo_n "checking whether $php_typename exists... " >&6; } + php_cache_value=php_cv_sizeof_$php_typename - if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if eval \${php_cv_sizeof_$php_typename+:} false; then : + $as_echo_n "(cached) " >&6 else - + old_LIBS=$LIBS LIBS= old_LDFLAGS=$LDFLAGS LDFLAGS= - if test "$cross_compiling" = yes; then - + if test "$cross_compiling" = yes; then : + eval $php_cache_value=0 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #if STDC_HEADERS #include @@ -103937,7 +102974,7 @@ #ifdef HAVE_STDINT_H #include #endif - + int main() { @@ -103946,22 +102983,19 @@ fprintf(fp, "%d\n", sizeof($php_typename)); return(0); } - -EOF -if { (eval echo configure:103952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + eval $php_cache_value=`cat conftestval` - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + eval $php_cache_value=0 - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi LDFLAGS=$old_LDFLAGS @@ -103971,16 +103005,18 @@ if eval test "\$$php_cache_value" != "0"; then - + php_def_have_what=HAVE_`echo $php_typename | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' ` echo "#define $php_def_have_what 1" >> ext/mysqlnd/php_mysqlnd_config.h - - echo "$ac_t""yes" 1>&6 - -else - echo "$ac_t""no" 1>&6 - + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi done @@ -103992,23 +103028,23 @@ test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" if test -n "$MYSQL_LIBNAME"; then - + save_old_LDFLAGS=$LDFLAGS ac_stuff="" - + save_ext_shared=$ext_shared ext_shared=yes - + for ac_i in $ac_stuff; do case $ac_i in -pthread) if test "$ext_shared" = "yes"; then LDFLAGS="$LDFLAGS -pthread" else - - + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "EXTRA_LDFLAGS$unique=set" @@ -104019,20 +103055,20 @@ ;; -l*) ac_ii=`echo $ac_i|cut -c 3-` - - + + case $ac_ii in c|c_r|pthread*) ;; - *) + *) if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" + LDFLAGS="$LDFLAGS -l$ac_ii" else - - + + case $ac_ii in c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" + *) + LIBS="$LIBS -l$ac_ii" ;; esac @@ -104045,104 +103081,108 @@ ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; 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 - + if test "$ext_shared" = "yes"; then LDFLAGS="-L$ai_p $LDFLAGS" test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else - - - + + + 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 ;; esac done - echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:104092: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 -ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + 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 eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$MYSQL_LIBNAME $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ -int main() { -hash_insert() -; return 0; } -EOF -if { (eval echo configure:104111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char hash_insert (); +int +main () +{ +return hash_insert (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - + recode_conflict="$recode_conflict mysql" - - + + else - echo "$ac_t""no" 1>&6 LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$MYSQL_LIBNAME_hash_insert - - + + fi fi if test -n "$recode_conflict"; then - { echo "configure: error: recode extension can not be configured together with:$recode_conflict" 1>&2; exit 1; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: recode extension can not be used together with:$recode_conflict" >&5 +$as_echo "$as_me: WARNING: recode extension can not be used together with:$recode_conflict" >&2;} fi fi @@ -104183,16 +103223,17 @@ -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring PEAR${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5 +$as_echo "${T_MD}Configuring PEAR${T_ME}" >&6; } # compatibility @@ -104208,14 +103249,14 @@ php_with_pear=DEFAULT -echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 -echo "configure:104213: checking whether to install PEAR" >&5 -# Check whether --with-pear or --without-pear was given. -if test "${with_pear+set}" = set; then - withval="$with_pear" - PHP_PEAR=$withval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5 +$as_echo_n "checking whether to install PEAR... " >&6; } + +# Check whether --with-pear was given. +if test "${with_pear+set}" = set; then : + withval=$with_pear; PHP_PEAR=$withval else - + PHP_PEAR=DEFAULT test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL @@ -104244,7 +103285,8 @@ -echo "$ac_t""$ext_output" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +$as_echo "$ext_output" >&6; } @@ -104252,13 +103294,13 @@ if test "$PHP_PEAR" != "no"; then if test "$PHP_XML" = "no"; then - pear_error_msg="$pear_error_msg + pear_error_msg="$pear_error_msg PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" fi if test "$pear_error_msg"; then - { echo "configure: error: $pear_error_msg" 1>&2; exit 1; } + as_fn_error $? "$pear_error_msg" "$LINENO" 5 fi install_pear="install-pear" @@ -104267,11 +103309,11 @@ if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then case $PHP_LAYOUT in GNU) PEAR_INSTALLDIR=$datadir/pear;; - *) PEAR_INSTALLDIR=$libdir/php;; + *) PEAR_INSTALLDIR=$libdir/php5;; esac fi - + src=$abs_srcdir/pear/Makefile.frag ac_srcdir=$abs_srcdir/pear ac_builddir=pear @@ -104282,16 +103324,17 @@ -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring Zend${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5 +$as_echo "${T_MD}Configuring Zend${T_ME}" >&6; } @@ -104310,12 +103353,12 @@ bison_version=none if test "$YACC"; then - echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:104315: checking for bison version" >&5 -if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5 +$as_echo_n "checking for bison version... " >&6; } +if ${php_cv_bison_version+:} false; then : + $as_echo_n "(cached) " >&6 else - + bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z` php_cv_bison_version=invalid if test -n "$bison_version_vars"; then @@ -104328,15 +103371,16 @@ fi done fi - -fi -echo "$ac_t""$php_cv_bison_version" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_bison_version" >&5 +$as_echo "$php_cv_bison_version" >&6; } fi case $php_cv_bison_version in ""|invalid) bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)." - echo "configure: warning: $bison_msg" 1>&2 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $bison_msg" >&5 +$as_echo "$as_me: WARNING: $bison_msg" >&2;} YACC="exit 0;" ;; esac @@ -104347,11 +103391,11 @@ CFLAGS=`echo $CFLAGS | sed -e 's/-g//'` fi -if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then +if test "$ac_cv_c_compiler_gnu" = "yes" -a "`uname -s`" = "Rhapsody"; then CPPFLAGS="$CPPFLAGS -traditional-cpp" fi -for ac_hdr in inttypes.h \ +for ac_header in inttypes.h \ stdint.h \ limits.h \ malloc.h \ @@ -104364,118 +103408,61 @@ unix.h \ stdlib.h \ dlfcn.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:104371: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:104381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi + done -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:104409: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned -EOF +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:104442: checking return type of signal handlers" >&5 -if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if ${ac_cv_type_signal+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include -#ifdef signal -#undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif -int main() { -int i; -; return 0; } -EOF -if { (eval echo configure:104464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +int +main () +{ +return *(signal (0, 0)) (0) == 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int +else + ac_cv_type_signal=void fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -EOF +_ACEOF @@ -104483,339 +103470,237 @@ -echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:104488: checking for uint" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])uint[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_uint=yes +ac_fn_c_check_type "$LINENO" "uint" "ac_cv_type_uint" "$ac_includes_default" +if test "x$ac_cv_type_uint" = xyes; then : + else - rm -rf conftest* - ac_cv_type_uint=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_type_uint" 1>&6 -if test $ac_cv_type_uint = no; then - cat >> confdefs.h <<\EOF -#define uint unsigned int -EOF +cat >>confdefs.h <<_ACEOF +#define uint unsigned int +_ACEOF fi -echo $ac_n "checking for ulong""... $ac_c" 1>&6 -echo "configure:104521: checking for ulong" >&5 -if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])ulong[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_ulong=yes +ac_fn_c_check_type "$LINENO" "ulong" "ac_cv_type_ulong" "$ac_includes_default" +if test "x$ac_cv_type_ulong" = xyes; then : + else - rm -rf conftest* - ac_cv_type_ulong=no -fi -rm -f conftest* -fi -echo "$ac_t""$ac_cv_type_ulong" 1>&6 -if test $ac_cv_type_ulong = no; then - cat >> confdefs.h <<\EOF -#define ulong unsigned long -EOF +cat >>confdefs.h <<_ACEOF +#define ulong unsigned long +_ACEOF fi -echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:104556: checking for int32_t" >&5 -cat > conftest.$ac_ext <&5 +$as_echo_n "checking for int32_t... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#if HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H #include #endif -#if HAVE_INTTYPES_H +#if HAVE_INTTYPES_H #include #elif HAVE_STDINT_H #include #endif -int main() { +int +main () +{ if ((int32_t *) 0) return 0; if (sizeof (int32_t)) return 0; -; return 0; } -EOF -if { (eval echo configure:104577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INT32_T 1 -EOF +_ACEOF - echo "$ac_t""yes" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:104596: checking for uint32_t" >&5 -cat > conftest.$ac_ext <&5 +$as_echo_n "checking for uint32_t... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#if HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H #include #endif -#if HAVE_INTTYPES_H +#if HAVE_INTTYPES_H #include #elif HAVE_STDINT_H #include #endif -int main() { +int +main () +{ if ((uint32_t *) 0) return 0; if (sizeof (uint32_t)) return 0; -; return 0; } -EOF -if { (eval echo configure:104617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT32_T 1 +_ACEOF -fi -rm -f conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:104636: checking for vprintf" >&5 -if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char vprintf(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_vprintf) || defined (__stub___vprintf) -choke me -#else -vprintf(); -#endif + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -; return 0; } -EOF -if { (eval echo configure:104664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vprintf=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_vprintf=no" -fi -rm -f conftest* fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +for ac_func in vprintf +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF #define HAVE_VPRINTF 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - -if test "$ac_cv_func_vprintf" != yes; then -echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:104688: checking for _doprnt" >&5 -if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _doprnt(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub__doprnt) || defined (__stub____doprnt) -choke me -#else -_doprnt(); -#endif +_ACEOF -; return 0; } -EOF -if { (eval echo configure:104716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func__doprnt=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func__doprnt=no" -fi -rm -f conftest* -fi +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = xyes; then : -if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DOPRNT 1 -EOF +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -else - echo "$ac_t""no" 1>&6 fi fi +done -echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:104741: checking for 8-bit clean memcmp" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_clean=no -else - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for working memcmp... " >&6; } +if ${ac_cv_func_memcmp_working+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_memcmp_working=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () { - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); -} -EOF -if { (eval echo configure:104759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_memcmp_clean=yes + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = '\100', c1 = '\200', c2 = '\201'; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) + return 1; + + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. + William Lewis provided this test program. */ + { + char foo[21]; + char bar[21]; + int i; + for (i = 0; i < 4; i++) + { + char *a = foo + i; + char *b = bar + i; + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) + return 1; + } + return 0; + } + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_memcmp_working=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_memcmp_clean=no + ac_cv_func_memcmp_working=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 +$as_echo "$ac_cv_func_memcmp_working" >&6; } +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in + *" memcmp.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" + ;; +esac -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:104779: checking for working alloca.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if ${ac_cv_working_alloca_h+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:104791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_working_alloca_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no + ac_cv_working_alloca_h=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:104812: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if ${ac_cv_func_alloca_works+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -104823,151 +103708,108 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:104845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ +char *p = (char *) alloca (1); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF -fi +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext + +$as_echo "#define C_ALLOCA 1" >>confdefs.h -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:104877: checking whether alloca needs Cray hooks" >&5 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_os_cray+:} false; then : + $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:104907: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:104935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi + 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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF - break -else - echo "$ac_t""no" 1>&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:104962: checking stack direction for C alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $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 ${ac_cv_c_stack_direction+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int find_stack_direction () { static char *addr = 0; @@ -104980,245 +103822,155 @@ else return (&dummy > addr) ? 1 : -1; } + +int main () { - exit (find_stack_direction() < 0); + return find_stack_direction () < 0; } -EOF -if { (eval echo configure:104989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi - -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:105013: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:105041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* fi +done -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&5 +$as_echo_n "checking whether sprintf is broken... " >&6; } +if ${ac_cv_broken_sprintf+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "$ac_t""no" 1>&6 -fi -done + if test "$cross_compiling" = yes; then : - echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 -echo "configure:105067: checking whether sprintf is broken" >&5 -if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - if test "$cross_compiling" = yes; then - ac_cv_broken_sprintf=no - + else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); } -EOF -if { (eval echo configure:105082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_sprintf=no - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + ac_cv_broken_sprintf=yes - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -echo "$ac_t""$ac_cv_broken_sprintf" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sprintf" >&5 +$as_echo "$ac_cv_broken_sprintf" >&6; } if test "$ac_cv_broken_sprintf" = "yes"; then ac_result=1 else ac_result=0 fi - cat >> confdefs.h <>confdefs.h <<_ACEOF #define ZEND_BROKEN_SPRINTF $ac_result -EOF +_ACEOF for ac_func in finite isfinite isinf isnan -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:105116: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:105144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 -echo "configure:105171: checking whether fp_except is defined" >&5 -if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +$as_echo_n "checking whether fp_except is defined... " >&6; } +if ${ac_cv_type_fp_except+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include -int main() { +int +main () +{ fp_except x = (fp_except) 0; -; return 0; } -EOF -if { (eval echo configure:105188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_fp_except=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + ac_cv_type_fp_except=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_type_fp_except" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_fp_except" >&5 +$as_echo "$ac_cv_type_fp_except" >&6; } if test "$ac_cv_type_fp_except" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_FP_EXCEPT 1 -EOF + +$as_echo "#define HAVE_FP_EXCEPT 1" >>confdefs.h fi - echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 -echo "configure:105215: checking for usable _FPU_SETCW" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for usable _FPU_SETCW... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ fpu_control_t fpu_oldcw, fpu_cw; volatile double result; @@ -105230,38 +103982,39 @@ _FPU_SETCW(fpu_cw); result = a / b; _FPU_SETCW(fpu_oldcw); - -; return 0; } -EOF -if { (eval echo configure:105237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cfp_have__fpu_setcw=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cfp_have__fpu_setcw=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cfp_have__fpu_setcw" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE__FPU_SETCW 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE__FPU_SETCW 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 -echo "configure:105258: checking for usable fpsetprec" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for usable fpsetprec... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ fp_prec_t fpu_oldprec; volatile double result; @@ -105272,38 +104025,39 @@ fpsetprec(FP_PD); result = a / b; fpsetprec(fpu_oldprec); - -; return 0; } -EOF -if { (eval echo configure:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cfp_have_fpsetprec=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cfp_have_fpsetprec=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cfp_have_fpsetprec" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_FPSETPREC 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 -echo "configure:105300: checking for usable _controlfp" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for usable _controlfp... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ unsigned int fpu_oldcw; volatile double result; @@ -105314,38 +104068,39 @@ _controlfp(_PC_53, _MCW_PC); result = a / b; _controlfp(fpu_oldcw, _MCW_PC); - -; return 0; } -EOF -if { (eval echo configure:105321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cfp_have__controlfp=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cfp_have__controlfp=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cfp_have__controlfp" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE__CONTROLFP 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE__CONTROLFP 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 -echo "configure:105342: checking for usable _controlfp_s" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking for usable _controlfp_s... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include - -int main() { + +int +main () +{ unsigned int fpu_oldcw, fpu_cw; volatile double result; @@ -105357,38 +104112,39 @@ _controlfp_s(&fpu_cw, _PC_53, _MCW_PC); result = a / b; _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); - -; return 0; } -EOF -if { (eval echo configure:105364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cfp_have__controlfp_s=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cfp_have__controlfp_s=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cfp_have__controlfp_s" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE__CONTROLFP_S 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE__CONTROLFP_S 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 -echo "configure:105385: checking whether FPU control word can be manipulated by inline assembler" >&5 - cat > conftest.$ac_ext <&5 +$as_echo_n "checking whether FPU control word can be manipulated by inline assembler... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ /* nothing */ - -int main() { + +int +main () +{ unsigned int oldcw, cw; volatile double result; @@ -105402,41 +104158,41 @@ result = a / b; __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw)); - -; return 0; } -EOF -if { (eval echo configure:105409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cfp_have_fpu_inline_asm_x86=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cfp_have_fpu_inline_asm_x86=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_FPU_INLINE_ASM_X86 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 -echo "configure:105431: checking whether double cast to long preserves least significant bits" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether double cast to long preserves least significant bits" >&5 +$as_echo_n "checking whether double cast to long preserves least significant bits... " >&6; } -if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 +if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include @@ -105458,269 +104214,130 @@ exit(1); } -EOF -if { (eval echo configure:105463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cat >> confdefs.h <<\EOF -#define ZEND_DVAL_TO_LVAL_CAST_OK 1 -EOF - - echo "$ac_t""yes" 1>&6 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 - -fi -rm -fr conftest* -fi +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : - -for ac_hdr in dlfcn.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:105489: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:105499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done +$as_echo "#define ZEND_DVAL_TO_LVAL_CAST_OK 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 -echo "configure:105527: checking whether dlsym() requires a leading underscore in symbol names" >&5 -if test "$cross_compiling" = yes; then : - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -#ifdef __cplusplus -extern "C" void exit (int); -#endif +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - exit (status); -} -EOF - if { (eval echo configure:105597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) - echo "$ac_t""no" 1>&6 - ;; - x$lt_dlneed_uscore) - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define DLSYM_NEEDS_UNDERSCORE 1 -EOF - ;; - x$lt_dlunknown|x*) - echo "$ac_t""no" 1>&6 - ;; - esac - else : - # compilation failed - - echo "$ac_t""no" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5 +$as_echo_n "checking whether dlsym() requires a leading underscore in symbol names... " >&6; } - fi -fi -rm -fr conftest* -# Check whether --with-zend-vm or --without-zend-vm was given. -if test "${with_zend_vm+set}" = set; then - withval="$with_zend_vm" - +# Check whether --with-zend-vm was given. +if test "${with_zend_vm+set}" = set; then : + withval=$with_zend_vm; PHP_ZEND_VM=$withval else - + PHP_ZEND_VM=CALL fi -# Check whether --enable-maintainer-zts or --disable-maintainer-zts was given. -if test "${enable_maintainer_zts+set}" = set; then - enableval="$enable_maintainer_zts" - +# Check whether --enable-maintainer-zts was given. +if test "${enable_maintainer_zts+set}" = set; then : + enableval=$enable_maintainer_zts; ZEND_MAINTAINER_ZTS=$enableval else - + ZEND_MAINTAINER_ZTS=no fi - -# Check whether --enable-inline-optimization or --disable-inline-optimization was given. -if test "${enable_inline_optimization+set}" = set; then - enableval="$enable_inline_optimization" - + +# Check whether --enable-inline-optimization was given. +if test "${enable_inline_optimization+set}" = set; then : + enableval=$enable_inline_optimization; ZEND_INLINE_OPTIMIZATION=$enableval else - + ZEND_INLINE_OPTIMIZATION=yes fi -# Check whether --enable-zend-multibyte or --disable-zend-multibyte was given. -if test "${enable_zend_multibyte+set}" = set; then - enableval="$enable_zend_multibyte" - +# Check whether --enable-zend-multibyte was given. +if test "${enable_zend_multibyte+set}" = set; then : + enableval=$enable_zend_multibyte; ZEND_MULTIBYTE=$enableval else - + ZEND_MULTIBYTE=no fi -echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 -echo "configure:105680: checking virtual machine dispatch method" >&5 -echo "$ac_t""$PHP_ZEND_VM" 1>&6 - -echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 -echo "configure:105684: checking whether to enable thread-safety" >&5 -echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 - -echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 -echo "configure:105688: checking whether to enable inline optimization for GCC" >&5 -echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 - -echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 -echo "configure:105692: checking whether to enable Zend debugging" >&5 -echo "$ac_t""$ZEND_DEBUG" 1>&6 - -echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 -echo "configure:105696: checking whether to enable Zend multibyte" >&5 -echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking virtual machine dispatch method" >&5 +$as_echo_n "checking virtual machine dispatch method... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_ZEND_VM" >&5 +$as_echo "$PHP_ZEND_VM" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5 +$as_echo_n "checking whether to enable thread-safety... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAINTAINER_ZTS" >&5 +$as_echo "$ZEND_MAINTAINER_ZTS" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable inline optimization for GCC" >&5 +$as_echo_n "checking whether to enable inline optimization for GCC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_INLINE_OPTIMIZATION" >&5 +$as_echo "$ZEND_INLINE_OPTIMIZATION" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5 +$as_echo_n "checking whether to enable Zend debugging... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5 +$as_echo "$ZEND_DEBUG" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend multibyte" >&5 +$as_echo_n "checking whether to enable Zend multibyte... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MULTIBYTE" >&5 +$as_echo "$ZEND_MULTIBYTE" >&6; } case $PHP_ZEND_VM in SWITCH) - cat >> confdefs.h <<\EOF -#define ZEND_VM_KIND ZEND_VM_KIND_SWITCH -EOF + +$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_SWITCH" >>confdefs.h ;; GOTO) - cat >> confdefs.h <<\EOF -#define ZEND_VM_KIND ZEND_VM_KIND_GOTO -EOF + +$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_GOTO" >>confdefs.h ;; *) PHP_ZEND_VM=CALL - cat >> confdefs.h <<\EOF -#define ZEND_VM_KIND ZEND_VM_KIND_CALL -EOF + +$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_CALL" >>confdefs.h ;; esac if test "$ZEND_DEBUG" = "yes"; then - cat >> confdefs.h <<\EOF -#define ZEND_DEBUG 1 -EOF + +$as_echo "#define ZEND_DEBUG 1" >>confdefs.h echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g" if test "$CFLAGS" = "-g -O2"; then @@ -105730,29 +104347,26 @@ test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations" else - cat >> confdefs.h <<\EOF -#define ZEND_DEBUG 0 -EOF + +$as_echo "#define ZEND_DEBUG 0" >>confdefs.h fi test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" if test "$ZEND_MAINTAINER_ZTS" = "yes"; then - cat >> confdefs.h <<\EOF -#define ZTS 1 -EOF + +$as_echo "#define ZTS 1" >>confdefs.h CFLAGS="$CFLAGS -DZTS" - -fi + +fi if test "$ZEND_MULTIBYTE" = "yes"; then - cat >> confdefs.h <<\EOF -#define ZEND_MULTIBYTE 1 -EOF + +$as_echo "#define ZEND_MULTIBYTE 1" >>confdefs.h fi @@ -105764,72 +104378,74 @@ fi -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:105769: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:105783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +case $ac_cv_c_inline in inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >> confdefs.h <>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; esac -echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 -echo "configure:105812: checking target system is Darwin" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5 +$as_echo_n "checking target system is Darwin... " >&6; } if echo "$target" | grep "darwin" > /dev/null; then - cat >> confdefs.h <<\EOF -#define DARWIN 1 -EOF - echo "$ac_t""yes" 1>&6 +$as_echo "#define DARWIN 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 -echo "configure:105824: checking for MM alignment and log values" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5 +$as_echo_n "checking for MM alignment and log values... " >&6; } + +if test "$cross_compiling" = yes; then : -if test "$cross_compiling" = yes; then - LIBZEND_MM_ALIGN=8 else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include @@ -105857,48 +104473,48 @@ } fp = fopen("conftest.zend", "w"); - fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); + fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); fclose(fp); exit(0); } -EOF -if { (eval echo configure:105868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2` - cat >> confdefs.h <>confdefs.h <<_ACEOF #define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN -EOF +_ACEOF - cat >> confdefs.h <>confdefs.h <<_ACEOF #define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2 -EOF - +_ACEOF + -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -echo "$ac_t""done" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory allocation using mmap(MAP_ANON)" >&5 +$as_echo_n "checking for memory allocation using mmap(MAP_ANON)... " >&6; } -echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 -echo "configure:105893: checking for memory allocation using mmap(MAP_ANON)" >&5 +if test "$cross_compiling" = yes; then : -if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -105932,39 +104548,37 @@ return 0; } -EOF -if { (eval echo configure:105937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cat >> confdefs.h <<\EOF -#define HAVE_MEM_MMAP_ANON 1 -EOF +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + - echo "$ac_t""yes" 1>&6 +$as_echo "#define HAVE_MEM_MMAP_ANON 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 -echo "configure:105959: checking for memory allocation using mmap("/dev/zero")" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory allocation using mmap(\"/dev/zero\")" >&5 +$as_echo_n "checking for memory allocation using mmap(\"/dev/zero\")... " >&6; } + +if test "$cross_compiling" = yes; then : -if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -106008,80 +104622,34 @@ return 0; } -EOF -if { (eval echo configure:106013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cat >> confdefs.h <<\EOF -#define HAVE_MEM_MMAP_ZERO 1 -EOF - - echo "$ac_t""yes" 1>&6 +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - echo "$ac_t""no" 1>&6 -fi -rm -fr conftest* -fi +$as_echo "#define HAVE_MEM_MMAP_ZERO 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -for ac_func in mremap -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:106037: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -; return 0; } -EOF -if { (eval echo configure:106065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 + +for ac_func in mremap +do : + ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap" +if test "x$ac_cv_func_mremap" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MREMAP 1 +_ACEOF + fi done @@ -106089,9 +104657,8 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then - cat >> confdefs.h <<\EOF -#define ZTS 1 -EOF + +$as_echo "#define ZTS 1" >>confdefs.h PHP_THREAD_SAFETY=yes else @@ -106110,100 +104677,73 @@ unset LIBS LDFLAGS -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring TSRM${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5 +$as_echo "${T_MD}Configuring TSRM${T_ME}" >&6; } -for ac_hdr in stdarg.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:106132: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:106142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDARG_H 1 +_ACEOF + fi + done if test "$PHP_THREAD_SAFETY" = "yes"; then - -# Check whether --with-tsrm-pth or --without-tsrm-pth was given. -if test "${with_tsrm_pth+set}" = set; then - withval="$with_tsrm_pth" - + + +# Check whether --with-tsrm-pth was given. +if test "${with_tsrm_pth+set}" = set; then : + withval=$with_tsrm_pth; TSRM_PTH=$withval else - + TSRM_PTH=no fi -# Check whether --with-tsrm-st or --without-tsrm-st was given. -if test "${with_tsrm_st+set}" = set; then - withval="$with_tsrm_st" - + +# Check whether --with-tsrm-st was given. +if test "${with_tsrm_st+set}" = set; then : + withval=$with_tsrm_st; TSRM_ST=$withval else - + TSRM_ST=no fi -# Check whether --with-tsrm-pthreads or --without-tsrm-pthreads was given. -if test "${with_tsrm_pthreads+set}" = set; then - withval="$with_tsrm_pthreads" - + +# Check whether --with-tsrm-pthreads was given. +if test "${with_tsrm_pthreads+set}" = set; then : + withval=$with_tsrm_pthreads; TSRM_PTHREADS=$withval else - + TSRM_PTHREADS=yes fi @@ -106212,28 +104752,29 @@ test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config if test "$TSRM_PTH" != "no"; then - -echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 -echo "configure:106219: checking for GNU Pth" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Pth" >&5 +$as_echo_n "checking for GNU Pth... " >&6; } PTH_PREFIX="`$TSRM_PTH --prefix`" if test -z "$PTH_PREFIX"; then - echo "$ac_t""Please check your Pth installation" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Please check your Pth installation" >&5 +$as_echo "Please check your Pth installation" >&6; } fi CPPFLAGS="$CPPFLAGS `$TSRM_PTH --cflags`" LDFLAGS="$LDFLAGS `$TSRM_PTH --ldflags`" LIBS="$LIBS `$TSRM_PTH --libs`" -cat >> confdefs.h <<\EOF -#define GNUPTH 1 -EOF -echo "$ac_t""yes - installed in $PTH_PREFIX" 1>&6 +$as_echo "#define GNUPTH 1" >>confdefs.h + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - installed in $PTH_PREFIX" >&5 +$as_echo "yes - installed in $PTH_PREFIX" >&6; } elif test "$TSRM_ST" != "no"; then - + if test -r "$TSRM_ST/include/st.h"; then CPPFLAGS="$CPPFLAGS -I$TSRM_ST/include" LDFLAGS="$LDFLAGS -L$TSRM_ST/lib" @@ -106241,60 +104782,34 @@ CPPFLAGS="$CPPFLAGS -I$TSRM_ST" LDFLAGS="$LDFLAGS -L$TSRM_ST" fi - for ac_hdr in st.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:106249: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:106259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ST_H 1 +_ACEOF + else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -{ echo "configure: error: Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" 1>&2; exit 1; } - + + 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 + done LIBS="$LIBS -lst" - echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 -echo "configure:106289: checking for SGI's State Threads" >&5 - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define TSRM_ST 1 -EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI's State Threads" >&5 +$as_echo_n "checking for SGI's State Threads... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define TSRM_ST 1" >>confdefs.h elif test "$TSRM_PTHREADS" != "no"; then - - + + if test "$beos_threads" = "1"; then @@ -106303,7 +104818,7 @@ else save_CFLAGS=$CFLAGS save_LIBS=$LIBS - + if test -n "$ac_cv_pthreads_lib"; then LIBS="$LIBS -l$ac_cv_pthreads_lib" fi @@ -106312,9 +104827,9 @@ CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" fi - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + pthreads_working=no case $host_alias in *netware*) @@ -106323,9 +104838,8 @@ else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -106340,41 +104854,38 @@ int data = 1; pthread_mutexattr_init(&mattr); return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:106346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + pthreads_working=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + pthreads_working=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + LIBS=$save_LIBS CFLAGS=$save_CFLAGS - echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:106366: checking for pthreads_cflags" >&5 -if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 +$as_echo_n "checking for pthreads_cflags... " >&6; } +if ${ac_cv_pthreads_cflags+:} false; then : + $as_echo_n "(cached) " >&6 else - + ac_cv_pthreads_cflags= if test "$pthreads_working" != "yes"; then - for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do + for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do ac_save=$CFLAGS CFLAGS="$CFLAGS $flag" - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + pthreads_working=no case $host_alias in *netware*) @@ -106383,9 +104894,8 @@ else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -106400,24 +104910,21 @@ int data = 1; pthread_mutexattr_init(&mattr); return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:106406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + pthreads_working=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + pthreads_working=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + CFLAGS=$ac_save if test "$pthreads_working" = "yes"; then ac_cv_pthreads_cflags=$flag @@ -106428,23 +104935,23 @@ fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5 +$as_echo "$ac_cv_pthreads_cflags" >&6; } -echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 - -echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:106436: checking for pthreads_lib" >&5 -if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5 +$as_echo_n "checking for pthreads_lib... " >&6; } +if ${ac_cv_pthreads_lib+:} false; then : + $as_echo_n "(cached) " >&6 else - + ac_cv_pthreads_lib= if test "$pthreads_working" != "yes"; then for lib in pthread pthreads c_r; do ac_save=$LIBS LIBS="$LIBS -l$lib" - -if test "$cross_compiling" = yes; then - + +if test "$cross_compiling" = yes; then : + pthreads_working=no case $host_alias in *netware*) @@ -106453,9 +104960,8 @@ else - cat > conftest.$ac_ext <conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -106470,24 +104976,21 @@ int data = 1; pthread_mutexattr_init(&mattr); return pthread_create(&thd, NULL, thread_routine, &data); -} -EOF -if { (eval echo configure:106476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + pthreads_working=yes - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - + pthreads_working=no - + fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - + LIBS=$ac_save if test "$pthreads_working" = "yes"; then ac_cv_pthreads_lib=$lib @@ -106497,8 +105000,8 @@ fi fi - -echo "$ac_t""$ac_cv_pthreads_lib" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5 +$as_echo "$ac_cv_pthreads_lib" >&6; } if test "$pthreads_working" = "yes"; then threads_result="POSIX-Threads found" @@ -106507,24 +105010,23 @@ fi -if test "$beos_threads" = "1"; then - cat >> confdefs.h <<\EOF -#define BETHREADS 1 -EOF +if test "$beos_threads" = "1"; then + +$as_echo "#define BETHREADS 1" >>confdefs.h -else +else if test "$pthreads_working" != "yes"; then - { echo "configure: error: Your system seems to lack POSIX threads." 1>&2; exit 1; } + as_fn_error $? "Your system seems to lack POSIX threads." "$LINENO" 5 fi - cat >> confdefs.h <<\EOF -#define PTHREADS 1 -EOF +$as_echo "#define PTHREADS 1" >>confdefs.h - echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 -echo "configure:106527: checking for POSIX threads" >&5 - echo "$ac_t""yes" 1>&6 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5 +$as_echo_n "checking for POSIX threads... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi @@ -106544,12 +105046,12 @@ case $libdir in '${exec_prefix}/lib') - libdir=$libdir/php + libdir=$libdir/php5 ;; esac case $datadir in '${prefix}/share') - datadir=$datadir/php + datadir=$datadir/php5 ;; esac @@ -106567,8 +105069,13 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` +DEBIAN_PHP_API=`egrep -h '^#define ZEND_EXTENSION_API_NO|^#define ZEND_MODULE_API_NO|#define PHP_API_VERSION' $srcdir/Zend/zend_extensions.h $srcdir/Zend/zend_modules.h $srcdir/main/php.h | awk '{print $3}' | sed -e 's/^2200/200/' | sort -n | tail -n 1` +if echo "$CPPFLAGS $CFLAGS" | grep -q -- -D_FILE_OFFSET_BITS=64; then + DEBIAN_PHP_API="${DEBIAN_PHP_API}+lfs" +fi + if test -z "$EXTENSION_DIR"; then - extbasedir=$ZEND_MODULE_API_NO + extbasedir=$DEBIAN_PHP_API if test "$oldstyleextdir" = "yes"; then if test "$PHP_DEBUG" = "1"; then part1=debug @@ -106586,7 +105093,7 @@ if test "$enable_maintainer_zts" = "yes"; then extbasedir=$extbasedir-zts fi - + if test "$PHP_DEBUG" = "1"; then extbasedir=$extbasedir-debug fi @@ -106613,7 +105120,7 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR +INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:/usr/share/pear exec_prefix=$old_exec_prefix libdir=$old_libdir @@ -106652,7 +105159,7 @@ if test -z "$php_ldflags_add_usr_lib"; then - + unset ac_new_flags for i in $PHP_LDFLAGS; do case $i in @@ -106662,7 +105169,7 @@ done PHP_LDFLAGS=$ac_new_flags - + unset ac_new_flags for i in $LDFLAGS; do case $i in @@ -106678,34 +105185,39 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" PHP_BUILD_DATE=`date '+%Y-%m-%d'` -cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_BUILD_DATE "$PHP_BUILD_DATE" -EOF +_ACEOF case $host_alias in *netware*) PHP_OS="NetWare" PHP_UNAME="NetWare" - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_OS "$PHP_OS" -EOF +_ACEOF - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_UNAME "$PHP_UNAME" -EOF +_ACEOF ;; *) PHP_UNAME=`uname -a | xargs` - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_UNAME "$PHP_UNAME" -EOF +_ACEOF PHP_OS=`uname | xargs` - cat >> confdefs.h <>confdefs.h <<_ACEOF #define PHP_OS "$PHP_OS" -EOF +_ACEOF ;; esac @@ -106713,15 +105225,15 @@ if test "$PHP_CLI" != "no"; then PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" PHP_INSTALL_CLI_TARGET="install-cli" - - + + case sapi/cli in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - - + + b_c_pre=$php_c_pre b_cxx_pre=$php_cxx_pre @@ -106734,12 +105246,12 @@ old_IFS=$IFS for ac_src in php_cli.c php_cli_readline.c; do - + IFS=. set $ac_src ac_obj=$1 IFS=$old_IFS - + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -106763,10 +105275,10 @@ fi - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_INSTALLED_SAPIS" - + @@ -106797,28 +105309,28 @@ - + PHP_VAR_SUBST="$PHP_VAR_SUBST abs_builddir" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST abs_srcdir" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_builddir" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_srcdir" - + @@ -106831,16 +105343,16 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST exec_prefix" - + PHP_VAR_SUBST="$PHP_VAR_SUBST program_prefix" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST program_suffix" - + PHP_VAR_SUBST="$PHP_VAR_SUBST includedir" @@ -106901,64 +105413,70 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST CXXFLAGS_CLEAN" - + PHP_VAR_SUBST="$PHP_VAR_SUBST DEBUG_CFLAGS" - - + + + PHP_VAR_SUBST="$PHP_VAR_SUBST DEBIAN_PHP_API" + + + + + PHP_VAR_SUBST="$PHP_VAR_SUBST EXTENSION_DIR" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS_PROGRAM" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LIBS" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST ZEND_EXTRA_LIBS" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDES" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_INCLUDES" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDE_PATH" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_IT" - + PHP_VAR_SUBST="$PHP_VAR_SUBST LFLAGS" @@ -106970,31 +105488,31 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST LN_S" - + PHP_VAR_SUBST="$PHP_VAR_SUBST NATIVE_RPATHS" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PEAR_INSTALLDIR" - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BUILD_DATE" - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LDFLAGS" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LIBS" - + PHP_VAR_SUBST="$PHP_VAR_SUBST OVERALL_TARGET" @@ -107006,16 +105524,16 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI" - + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION" - - + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION_ID" - + PHP_VAR_SUBST="$PHP_VAR_SUBST SHELL" @@ -107060,16 +105578,17 @@ -# Check whether --enable- or --disable- was given. -if test "${enable_+set}" = set; then - enableval="$enable_" - : +# Check whether --enable- was given. +if test "${enable_+set}" = set; then : + enableval=$enable_; fi - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Configuring libtool${T_ME}" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5 +$as_echo "${T_MD}Configuring libtool${T_ME}" >&6; } LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" @@ -107081,117 +105600,286 @@ esac -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes + +macro_version='2.4' +macro_revision='1.3293' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} -# Check whether --enable-fast-install or --disable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $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 ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else - enable_fast_install=yes + ac_cv_path_SED=$SED fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:107161: checking build system type" >&5 +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - with_gnu_ld=no + ac_cv_path_FGREP=$FGREP fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:107190: checking for ld used by $CC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; esac case $ac_prog in @@ -107199,9 +105887,9 @@ [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -107215,14 +105903,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:107220: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:107223: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -107252,15 +105940,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:107262: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:107282: checking for $LD option to reload object files" >&5 -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_ld_reload_flag='-r' -fi -echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6 -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac -echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:107307: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -107348,17 +106020,578 @@ done IFS="$lt_save_ifs" done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" fi -echo "$ac_t""$lt_cv_path_NM" 1>&6 -NM="$lt_cv_path_NM" +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + -echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 -echo "configure:107360: checking how to recognize dependent libraries" >&5 -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + + +{ $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 ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -107399,21 +106632,29 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. @@ -107432,6 +106673,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -107440,11 +106685,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -107466,12 +106711,12 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' @@ -107484,12 +106729,12 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx*) - lt_cv_deplibs_check_method=unknown +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all ;; openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -107508,6 +106753,10 @@ lt_cv_deplibs_check_method=pass_all ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + sysv4 | sysv4.3*) case $host_vendor in motorola) @@ -107535,452 +106784,685 @@ esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +tpf*) lt_cv_deplibs_check_method=pass_all ;; esac fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:107552: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:107558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f conftest* fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:107578: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:107588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +done + done +IFS=$as_save_IFS + +fi fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi +test -z "$DLLTOOL" && DLLTOOL=dlltool -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -if test $host != $build; then - ac_tool_prefix=${host_alias}- + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_tool_prefix= + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -#AC_ARG_ENABLE([libtool-lock], -#[ --disable-libtool-lock avoid locking (might break parallel builds)]) -#test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 107648 "configure"' > conftest.$ac_ext - if { (eval echo configure:107649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -rf conftest* - ;; +done + done +IFS=$as_save_IFS -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -rf conftest* - ;; +done + done +IFS=$as_save_IFS -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:107733: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + fi -rm -f conftest* - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:107781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -rf conftest* - ;; +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi -need_locks="$enable_libtool_lock" +test -z "$STRIP" && STRIP=: -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:107810: checking how to run the C++ preprocessor" >&5 -if test -z "$CXXCPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:107828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CXXCPP=/lib/cpp +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f conftest* - ac_cv_prog_CXXCPP="$CXXCPP" -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 + fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -# find the maximum length of command line arguments -echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 -echo "configure:107858: checking the maximum length of command line arguments" >&5 -if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - i=0 - teststring="ABCD" + RANLIB="$ac_cv_prog_RANLIB" +fi - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; +test -z "$RANLIB" && RANLIB=: - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -if test -n $lt_cv_sys_max_cmd_len ; then - echo "$ac_t""$lt_cv_sys_max_cmd_len" 1>&6 +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - echo "$ac_t""none" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$AWK" && break +done + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 -echo "configure:107980: checking command to parse $NM output from $compiler object" >&5 -if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 else - + # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -107990,33 +107472,18 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - # Define system-specific variables. case $host_os in aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; -hpux*) # Its linker distinguishes data from code symbols +hpux*) if test "$host_cpu" = ia64; then symcode='[ABCDEGRST]' fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi ;; irix* | nonstopux*) symcode='[BCDEGRST]' @@ -108041,49 +107508,86 @@ ;; esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + # Handle CRLF in mingw tool chain opt_cr= case $build_os in mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ;; esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Try without a prefix undercore, then with it. +# Try without a prefix underscore, then with it. for ac_symprfx in "" "_"; do # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. symxfrm="\\1 $ac_symprfx\\2 \\2" # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no rm -f conftest* - cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { #endif char nm_test_var; -void nm_test_func(){} +void nm_test_func(void); +void nm_test_func(void){} #ifdef __cplusplus } #endif int main(){nm_test_var='a';nm_test_func();return(0);} -EOF +_LT_EOF - if { (eval echo configure:108084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:108087: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -108092,53 +107596,71 @@ fi # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif -EOF +_LT_EOF # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif + cat <<_LT_EOF >> conftest.$ac_ext -/* The mapping between symbol names and symbols. */ -const struct { +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { const char *name; - lt_ptr_t address; + void *address; } -lt_preloaded_symbols[] = +lt__PROGRAM__LTX_preloaded_symbols[] = { -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} }; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + #ifdef __cplusplus } #endif -EOF +_LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo configure:108138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -108168,8192 +107690,11431 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$ac_t""failed" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - echo "$ac_t""ok" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi -echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:108178: checking for objdir" >&5 -if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' fi -echo "$ac_t""$lt_cv_objdir" 1>&6 -objdir=$lt_cv_objdir -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -# Constants: -rm="rm -f" -# Global variables: -default_ofile=libtool -can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108244: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -if test -z "$ac_cv_prog_AR"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108276: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="ar" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="false" -fi -fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -else - AR="false" -fi -fi -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108311: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108343: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -else - RANLIB=":" -fi -fi -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108378: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -if test -z "$ac_cv_prog_STRIP"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108410: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="strip" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" -fi -fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; else - STRIP=":" -fi + with_sysroot=no fi -old_CC="$CC" -old_CFLAGS="$CFLAGS" +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:108497: checking for ${ac_tool_prefix}file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -EOF - fi ;; - esac - fi - break +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + fi + rm -rf conftest* ;; -esac -fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 else - echo "$ac_t""no" 1>&6 -fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:108557: checking for file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org +need_locks="$enable_libtool_lock" -EOF - fi ;; - esac - fi - break - fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" else - MAGIC_CMD=: + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" fi +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes fi - ;; -esac + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + case $host_os in rhapsody* | darwin*) - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108629: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + fi fi -DSYMUTIL="$ac_cv_prog_DSYMUTIL" +DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - echo "$ac_t""$DSYMUTIL" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +fi if test -z "$ac_cv_prog_DSYMUTIL"; then -if test -n "$ac_tool_prefix"; then + ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108661: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DSYMUTIL="dsymutil" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_DSYMUTIL" && ac_cv_prog_DSYMUTIL=":" +IFS=$as_save_IFS + fi fi -DSYMUTIL="$ac_cv_prog_DSYMUTIL" -if test -n "$DSYMUTIL"; then - echo "$ac_t""$DSYMUTIL" 1>&6 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi else - DSYMUTIL=":" -fi + DSYMUTIL="$ac_cv_prog_DSYMUTIL" fi - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108696: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" +IFS=$as_save_IFS + fi fi -NMEDIT="$ac_cv_prog_NMEDIT" +NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - echo "$ac_t""$NMEDIT" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +fi if test -z "$ac_cv_prog_NMEDIT"; then -if test -n "$ac_tool_prefix"; then + ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:108728: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NMEDIT="nmedit" - break - fi +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_NMEDIT" && ac_cv_prog_NMEDIT=":" +IFS=$as_save_IFS + fi fi -NMEDIT="$ac_cv_prog_NMEDIT" -if test -n "$NMEDIT"; then - echo "$ac_t""$NMEDIT" 1>&6 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - echo "$ac_t""no" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi else - NMEDIT=":" -fi + NMEDIT="$ac_cv_prog_NMEDIT" fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $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 - echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 -echo "configure:108762: checking for -single_module linker flag" >&5 -if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 - echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 -echo "configure:108785: checking for -exported_symbols_list linker flag" >&5 -if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - lt_cv_ld_exported_symbols_list=yes - rm -rf conftest* + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&6 -lt_cv_ld_exported_symbols_list=no - rm -rf conftest* +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f conftest* - LDFLAGS="$save_LDFLAGS" - +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$ac_t""$lt_cv_ld_exported_symbols_list" 1>&6 - case $host_os in - rhapsody* | darwin1.[0123]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" - else - _lt_dsymutil= - fi - ;; - esac - - -enable_dlopen=no -enable_win32_dll=no - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - : + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $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 -# Check whether --with-pic or --without-pic was given. -if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - pic_mode=default + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Source file extension for C test sources. -ac_ext=c + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi -# Object file extension for compiled C test sources. -objext=o -objext=$objext + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $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 -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $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 -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi -# Allow CC to be a program name with arguments. -compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - -echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:108934: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:108951: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "configure:108955: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* -fi -echo "$ac_t""$lt_cv_prog_compiler_rtti_exceptions" 1>&6 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi -fi -lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= -echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:108984: checking for $compiler option to produce PIC" >&5 - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic + + + + + { $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 ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* fi - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$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 ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; +int +main () +{ - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + cat conftest.err >&5 fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +fi - linux* | k*bsd*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; +done - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; +# Set options + + + + enable_dlopen=no + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; *) - lt_prog_compiler_can_build_shared=no + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; esac - fi +else + enable_shared=yes +fi -echo "$ac_t""$lt_prog_compiler_pic" 1>&6 -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - -echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 -echo "configure:109231: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:109248: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "configure:109252: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* -fi -echo "$ac_t""$lt_cv_prog_compiler_pic_works" 1>&6 -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no + enable_static=yes fi -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 -echo "configure:109294: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -fi -echo "$ac_t""$lt_cv_prog_compiler_static_works" 1>&6 -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else - lt_prog_compiler_static= + pic_mode=default fi -echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:109332: checking if $compiler supports -c -o file.$ac_objext" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +test -z "$pic_mode" && pic_mode=default - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:109352: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "configure:109356: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* -fi -echo "$ac_t""$lt_cv_prog_compiler_c_o" 1>&6 -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:109386: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$ac_t""$hard_links" 1>&6 - if test "$hard_links" = no; then - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 - need_locks=warn - fi + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - need_locks=no + enable_fast_install=yes fi -echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:109403: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -EOF - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - else - ld_shlibs=no - fi - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi - rm -rf conftest* -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&6 -fi -rm -f conftest* -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi - rm -rf conftest* -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&6 -fi -rm -f conftest* -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; +test -z "$LN_S" && LN_S="ln -s" - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; +# Global variables: +ofile=libtool +can_build_shared=yes - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +with_gnu_ld="$lt_cv_prog_gnu_ld" - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' +old_CC="$CC" +old_CFLAGS="$CFLAGS" - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - *) - ld_shlibs=no - ;; - esac - fi -echo "$ac_t""$ld_shlibs" 1>&6 -test "$ld_shlibs" = no && can_build_shared=no +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:110347: checking whether -lc should be explicitly linked in" >&5 - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo configure:110351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo configure:110365: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 +_LT_EOF + fi ;; + esac fi - $rm conftest* - echo "$ac_t""$archive_cmds_need_lc" 1>&6 - ;; - esac - fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; esac +fi -echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:110384: checking dynamic linker characteristics" >&5 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' + break fi - shlibpath_var=LIBPATH - fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; +esac +fi -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs + else + MAGIC_CMD=: + fi +fi + + fi ;; +esac -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no +# Use C for the default configuration in the libtool script - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +# Source file extension for C test sources. +ac_ext=c -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; +# Object file extension for compiled C test sources. +objext=o +objext=$objext -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +# Allow CC to be a program name with arguments. +compiler=$CC -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; +if test -n "$compiler"; then -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; +lt_prog_compiler_no_builtin_flag= -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$ac_t""$dynamic_linker" 1>&6 -test "$dynamic_linker" = no && can_build_shared=no - -if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + : fi -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:111009: checking how to hardcode library paths into programs" >&5 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$ac_t""$hardcode_action" 1>&6 -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -striplib= -old_striplib= -echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:111047: checking whether stripping libraries is possible" >&5 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$ac_t""yes" 1>&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 -fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -fi -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - darwin*) - # if libdl is installed we need to link against it - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:111098: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$ac_t""no" 1>&6 + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; - ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; - *) - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:111146: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load(); + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; -int main() { + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -shl_load(); -#endif + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; -; return 0; } -EOF -if { (eval echo configure:111174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shl_load=no" -fi -rm -f conftest* -fi + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:111192: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:111230: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; -int main() { + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -dlopen(); -#endif + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + lt_prog_compiler_pic='-Xcompiler -fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; -; return 0; } -EOF -if { (eval echo configure:111258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:111276: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:111314: checking for dlopen in -lsvld" >&5 -ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsvld $LIBS" -cat > conftest.$ac_ext <&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; + esac + ;; -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:111333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:111352: checking for dld_link in -ldld" >&5 -ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -else - echo "$ac_t""no" 1>&6 -fi + rdos*) + lt_prog_compiler_static='-non_shared' + ;; - -fi + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; - -fi + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; - -fi + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; - -fi + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; - -fi + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; - ;; - esac + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:111427: checking whether a program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - exit (status); -} -EOF - if { (eval echo configure:111500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no fi -rm -fr conftest* - fi -echo "$ac_t""$lt_cv_dlopen_self" 1>&6 - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:111523: checking whether a statically linked program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - exit (status); -} -EOF - if { (eval echo configure:111596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi + +# +# Check to make sure the static flag actually works. +# +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 ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + fi -rm -fr conftest* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= fi -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -# Report which library types will actually be built -echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:111637: checking if libtool supports shared libraries" >&5 -echo "$ac_t""$can_build_shared" 1>&6 - -echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:111641: checking whether to build shared libraries" >&5 -test "$can_build_shared" = "no" && enable_shared=no -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - 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 ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -echo "$ac_t""$enable_shared" 1>&6 + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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 + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:111664: checking whether to build static libraries" >&5 -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -echo "$ac_t""$enable_static" 1>&6 - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - echo "$ac_t"" -creating $ofile" 1>&6 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - cat <<__EOF__ >> "$cfgfile" -#! $SHELL -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# A sed program that does not truncate output. -SED=$lt_SED -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# The names of the tagged configurations supported by this script. -available_tags= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# ### BEGIN LIBTOOL CONFIG + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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 + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -# A C compiler. -LTCC=$lt_LTCC + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac -# A language-specific compiler. -CC=$lt_compiler + ld_shlibs=yes -# Is the compiler the GNU C compiler? -with_gcc=$GCC + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi -# An ERE matcher. -EGREP=$lt_EGREP + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -# The linker used to build libraries. -LD=$lt_LD + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -# Whether we need hard or soft links. -LN_S=$lt_LN_S + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 -# A BSD-compatible nm program. -NM=$lt_NM +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. -# A symbol stripping program -STRIP=$lt_STRIP +_LT_EOF + fi + ;; -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -# Used on cygwin: assembler. -AS="$AS" + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; -# The name of the directory that contains temporary libtool files. -objdir=$objdir + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -# Object file suffix (normally "o"). -objext="$ac_objext" + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi -# Old archive suffix (normally "a"). -libext="$libext" + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -# Executable file suffix (normally ""). -exeext="$exeext" + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 -# Must we lock files when doing compilation? -need_locks=$lt_need_locks +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; -# Do we need a version for libraries? -need_version=$need_version + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# Whether dlopen is supported. -dlopen_support=$enable_dlopen + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# Library versioning type. -version_type=$version_type + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Format of library name prefix. -libname_spec=$lt_libname_spec +int +main () +{ -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +fi -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + aix_libpath=$lt_cv_aix_libpath_ +fi -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +int +main () +{ -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects +fi -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects + aix_libpath=$lt_cv_aix_libpath_ +fi -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method + darwin* | rhapsody*) -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag + else + ld_shlibs=no + fi -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds + ;; -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + freebsd1*) + ld_shlibs=no + ;; -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -# This is the shared library runtime path variable. -runpath_var=$runpath_var + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# This is the shared library path variable. -shlibpath_var=$shlibpath_var + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + *nto* | *qnx*) + ;; -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -# ### END LIBTOOL CONFIG + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; -__EOF__ + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi fi -fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. -if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - echo "configure: warning: output file \`$ofile' does not exist" 1>&2 - fi - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - echo "configure: warning: output file \`$ofile' does not look like a libtool script" 1>&2 - else - echo "configure: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2 - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { echo "configure: error: invalid tag name: $tagname" 1>&2; exit 1; } - ;; - esac - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { echo "configure: error: tag name \"$tagname\" already exists" 1>&2; exit 1; } - fi - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= -compiler_lib_search_dirs_CXX= -# Source file extension for C++ test sources. -ac_ext=cpp -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= -fi -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - # Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:112350: checking for ld used by $CC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:112380: checking for GNU ld" >&5 -else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:112383: checking for non-GNU ld" >&5 -fi -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &6 -else - echo "$ac_t""no" 1>&6 -fi -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:112422: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &6 -with_gnu_ld=$lt_cv_prog_gnu_ld - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -else - GXX=no - with_gnu_ld=no - wlarc= -fi -# PORTME: fill in a description of your system's C++ link characteristics -echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:112488: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi - rm -rf conftest* -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&6 -fi -rm -f conftest* -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi - rm -rf conftest* -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&6 -fi -rm -f conftest* -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac - fi - ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - case $host_cpu in - hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - ld_shlibs_CXX=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -echo "$ac_t""$ld_shlibs_CXX" 1>&6 -test "$ld_shlibs_CXX" = no && can_build_shared=no -GCC_CXX="$GXX" -LD_CXX="$LD" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - for p in `eval $output_verbose_link_cmd`; do - case $p in - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - *) ;; # Ignore the rest. - esac - done - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi -$rm -f confest.$objext -compiler_lib_search_dirs_CXX= -if test -n "$compiler_lib_search_path_CXX"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -# PORTME: override above test on systems where it is broken case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' ;; -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi ;; esac - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' fi - ;; - esac + shlibpath_var=LIBPATH + fi ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; -esac -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:113553: checking for $compiler option to produce PIC" >&5 - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") ;; esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` else case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc*) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc*) - # Intel C++, used to be incompatible with GCC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - vxworks*) + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no ;; *) - lt_prog_compiler_can_build_shared_CXX=no + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ;; esac fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +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 ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +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" = 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 ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +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 ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +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 ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + 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 ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +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 ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +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; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +compiler_needs_object_CXX=no +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_direct_absolute_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +inherit_rpath_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + + ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' + else + lt_prog_compiler_no_builtin_flag_CXX= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + file_list_spec_CXX='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec_CXX='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + + + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec_CXX='' + fi + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi + + else + ld_shlibs_CXX=no + fi + + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + freebsd[12]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + ld_shlibs_CXX=no + ;; + + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; + + gnu*) + ;; + + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + inherit_rpath_CXX=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) + prelink_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + old_archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + ld_shlibs_CXX=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; + esac + + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" + LD_CXX="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + # Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= + +cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF + + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling CXX test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +case $host_os in +interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac + + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + compiler_lib_search_dirs_CXX= +if test -n "${compiler_lib_search_path_CXX}"; then + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + +# +# Check to make sure the PIC flag actually works. +# +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 ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi + +fi + + + + + +# +# Check to make sure the static flag actually works. +# +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 ${lt_cv_prog_compiler_static_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +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 ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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 + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $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 + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no + +with_gnu_ld_CXX=$with_gnu_ld + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } + +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + + + + if test -z "$LIBTOOL"; then + LIBTOOL='$(SHELL) $(top_builddir)/libtool --preserve-dup-deps' + else + LIBTOOL="$LIBTOOL --preserve-dup-deps" + fi + + +test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' +test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' +SHARED_LIBTOOL='$(LIBTOOL)' + +CC=$old_CC + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5 +$as_echo "${T_MD}Generating files${T_ME}" >&6; } + + +CXXFLAGS_CLEAN=$CXXFLAGS +CFLAGS_CLEAN=$CFLAGS +CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" +INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" +CXXFLAGS="$CXXFLAGS $standard_libtool_flag" + +if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then + pharcmd=pharcmd + pharcmd_install=install-pharcmd +else + pharcmd= + pharcmd_install= +fi; + +all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" +install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" + +case $PHP_SAPI in + cli) + install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" + ;; + *) + install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" + ;; +esac + + + PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets" + + + PHP_VAR_SUBST="$PHP_VAR_SUBST install_targets" + + + + + for header_file in Zend/ TSRM/ include/ main/ main/streams/; do + + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INSTALLHEADERS$unique=set" + + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" + + fi + + done + + + + + + case TSRM in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "TSRM"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/TSRM/"; ac_bdir="TSRM/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + + + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo + + + old_IFS=$IFS + for ac_src in TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<&6 -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - -echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 -echo "configure:113850: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:113867: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "configure:113871: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* + old_IFS=$IFS + for ac_src in zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c; do -fi + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS -echo "$ac_t""$lt_cv_prog_compiler_pic_works_CXX" 1>&6 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac + cat >>Makefile.objects<&6 -echo "configure:113913: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" fi -echo "$ac_t""$lt_cv_prog_compiler_static_works_CXX" 1>&6 - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : +if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then + flag=-O0 else - lt_prog_compiler_static_CXX= + flag= fi -echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:113951: checking if $compiler supports -c -o file.$ac_objext" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + case Zend in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:113971: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "configure:113975: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* -fi -echo "$ac_t""$lt_cv_prog_compiler_c_o_CXX" 1>&6 + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:114005: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$ac_t""$hard_links" 1>&6 - if test "$hard_links" = no; then - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 - need_locks=warn - fi -else - need_locks=no -fi + old_IFS=$IFS + for ac_src in zend_execute.c; do -echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:114022: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -echo "$ac_t""$ld_shlibs_CXX" 1>&6 -test "$ld_shlibs_CXX" = no && can_build_shared=no + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $flag$b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $flag$b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $flag$b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $flag$b_cxx_post" ;; + esac -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes + cat >>Makefile.objects<&6 -echo "configure:114068: checking whether -lc should be explicitly linked in" >&5 - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo configure:114072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo configure:114086: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - echo "$ac_t""$archive_cmds_need_lc_CXX" 1>&6 - ;; - esac - fi - ;; -esac -echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:114105: checking dynamic linker characteristics" >&5 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown + BUILD_DIR="$BUILD_DIR main main/streams" -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; + BUILD_DIR="$BUILD_DIR sapi/$PHP_SAPI sapi/cli" -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes + BUILD_DIR="$BUILD_DIR TSRM" - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + BUILD_DIR="$BUILD_DIR Zend" -freebsd1*) - dynamic_linker=no - ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; + src=$abs_srcdir/scripts/Makefile.frag + ac_srcdir=$abs_srcdir/scripts + ac_builddir=scripts + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; + src=$abs_srcdir/Makefile.frag + ac_srcdir=$abs_srcdir/Zend + ac_builddir=Zend + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + + + src=$abs_srcdir/Zend/Makefile.frag + ac_srcdir=$abs_srcdir/Zend + ac_builddir=Zend + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi + $php_shtool mkdir -p $BUILD_DIR - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; + cat >Makefile <> Makefile + done -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; + +$as_echo "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h + + +$php_shtool mkdir -p pear/scripts +$php_shtool mkdir -p scripts +$php_shtool mkdir -p scripts/man1 + +ALL_OUTPUT_FILES="php5.spec main/build-defs.h \ +scripts/phpize scripts/man1/phpize.1 \ +scripts/php-config scripts/man1/php-config.1 \ +$PHP_OUTPUT_FILES" + + + for arg in $ac_configure_args; do + case $arg in + --with-*) + arg_name="`echo $arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`" + ;; + --without-*) + arg_name="`echo $arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`" + ;; + --enable-*) + arg_name="`echo $arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`" + ;; + --disable-*) + arg_name="`echo $arg | $SED -e 's/--disable-/enable-/g' -e 's/=.*//g'`" + ;; *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; + continue + ;; + esac + case $arg_name in + # Allow --disable-all / --enable-all + enable-all);; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; + # Allow certain libtool options + enable-libtool-lock | with-pic | with-tags | enable-shared | enable-static | enable-fast-install | with-gnu-ld);; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; + # Allow certain TSRM options + with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads);; -rdos*) - dynamic_linker=no - ;; + # Allow certain Zend options + with-zend-vm | enable-maintainer-zts | enable-inline-optimization);; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; + # All the rest must be set using the PHP_ARG_* macros + # PHP_ARG_* macros set php_enable_ or php_with_ + *) + # Options that exist before PHP 6 + if test "$PHP_MAJOR_VERSION" -lt "6"; then + case $arg_name in + enable-zend-multibyte) continue;; + esac + fi -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + is_arg_set=php_`echo $arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` + if eval test "x\$$is_arg_set" = "x"; then + PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS +$arg" + fi + ;; + esac + done -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; +ac_config_files="$ac_config_files $ALL_OUTPUT_FILES" -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; +ac_config_commands="$ac_config_commands default" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + 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;} + 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;} fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; +fi +rm -f confcache -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -*) - dynamic_linker=no - ;; -esac -echo "$ac_t""$dynamic_linker" 1>&6 -test "$dynamic_linker" = no && can_build_shared=no +DEFS=-DHAVE_CONFIG_H -if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi +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$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi +LTLIBOBJS=$ac_ltlibobjs -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:114678: checking how to hardcode library paths into programs" >&5 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi -echo "$ac_t""$hardcode_action_CXX" 1>&6 -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +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 +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS -cfgfile="$ofile" + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared +# 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. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... 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'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -# A language-specific compiler. -CC=$lt_compiler_CXX + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + 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" -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX -# An ERE matcher. -EGREP=$lt_EGREP +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi -# The linker used to build libraries. -LD=$lt_LD_CXX +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 -# Whether we need hard or soft links. -LN_S=$lt_LN_S +# 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'" -# A BSD-compatible nm program. -NM=$lt_NM +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.68. Invocation command line was -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ -# Used on cygwin: assembler. -AS="$AS" +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" -# The name of the directory that contains temporary libtool files. -objdir=$objdir +_ACEOF -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to the package provider." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2010 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +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 + ac_shift=shift + ;; + esac -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $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;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; -# Executable file suffix (normally ""). -exeext="$exeext" + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + esac + shift +done -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +ac_configure_extra_args= -# Must we lock files when doing compilation? -need_locks=$lt_need_locks +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +_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 + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi -# Do we need a version for libraries? -need_version=$need_version +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 -# Whether dlopen is supported. -dlopen_support=$enable_dlopen +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +# Quote evaled strings. +for var in SHELL \ +ECHO \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +reload_flag_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ +hardcode_libdir_separator_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX +if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then + REDO_ALL=yes +fi + +################################################################ +# Create configuration headers +# + +test -d TSRM || $php_shtool mkdir TSRM +echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h + +test -d Zend || $php_shtool mkdir Zend + +cat >Zend/zend_config.h < +#if defined(APACHE) && defined(PHP_API_VERSION) +#undef HAVE_DLFCN_H +#endif +FEO + +# run this only when generating all the files? +if test -n "\$REDO_ALL"; then + # Hacking while airborne considered harmful. + # + echo "creating main/internal_functions.c" + extensions="$EXT_STATIC" + sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c + + echo "creating main/internal_functions_cli.c" + cli_extensions="$EXT_CLI_STATIC" + sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c + + if test "$UNAME" = "FreeBSD" && test "$PHP_SAPI" = "apache2filter" && test "$TSRM_PTH" != "pth-config" ; then + echo "+--------------------------------------------------------------------+" + echo "| *** WARNING *** |" + echo "| |" + echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to |" + echo "| add --with-tsrm-pth to your ./configure line. Therefore you need |" + echo "| to install gnu-pth from /usr/ports/devel/pth. |" + fi -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib + if test -n "$PHP_APXS_BROKEN"; then + echo "+--------------------------------------------------------------------+" + echo "| WARNING: Your $APXS script is most likely broken." + echo "| |" + echo "| Please go read http://www.php.net/faq.build#faq.build.apxs |" + echo "| and make the changes described there and try again. |" + fi -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX + if test -n "$DEBUG_LOG"; then + rm -f config.cache +cat < processes when using a local Oracle | +| database, set the value BEQUEATH_DETACH=YES in Oracle Net's | +| sqlnet.ora file on the PHP host, or set the environment variable | +| BEQUEATH_DETACH to YES before starting Apache. If the problem | +| still occurs, then recompile PHP and specify --enable-sigchild | +| when configuring. | +X + fi + fi + fi -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX +cat <>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "main/php_config.h") CONFIG_HEADERS="$CONFIG_HEADERS main/php_config.h" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "$ALL_OUTPUT_FILES") CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap '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 +} +# Create a (secure) tmp directory for tmp files. -# This is the shared library path variable. -shlibpath_var=$shlibpath_var +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +{ + echo "cat >conf$$subs.awk <<_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 '^'` +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 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_CXX + 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 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_CXX + print line +} -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) 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 `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + 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'" + done -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX + case $ac_mode in + :F) + # + # CONFIG_FILE + # -# ### END LIBTOOL TAG CONFIG: $tagname +_ACEOF -__EOF__ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +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 "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $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 +$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;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi -fi - + ;; -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - else - tagname="" - fi - ;; - *) - { echo "configure: error: Unsupported tag name: $tagname" 1>&2; exit 1; } - ;; - esac + case $ac_file$ac_mode in + "libtool":C) - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { echo "configure: error: unable to update list of available tagged configurations." 1>&2; exit 1; } - fi -fi + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -# Prevent multiple expansion +# The names of the tagged configurations supported by this script. +available_tags="CXX " +# ### BEGIN LIBTOOL CONFIG +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared +# Whether or not to build static libraries. +build_old_libs=$enable_static +# What type of objects to build. +pic_mode=$pic_mode +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install - +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL +# An echo program that protects backslashes. +ECHO=$lt_ECHO +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -if test "$enable_debug" != "yes"; then - - if test -z "$LIBTOOL"; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' - else - LIBTOOL="$LIBTOOL --silent" - fi +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -fi +# A sed program that does not truncate output. +SED=$lt_SED +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" - if test -z "$LIBTOOL"; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool --preserve-dup-deps' - else - LIBTOOL="$LIBTOOL --preserve-dup-deps" - fi +# A grep program that handles long lines. +GREP=$lt_GREP +# An ERE matcher. +EGREP=$lt_EGREP -test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' -test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' -SHARED_LIBTOOL='$(LIBTOOL)' +# A literal string matcher. +FGREP=$lt_FGREP -CC=$old_CC +# A BSD- or MS-compatible name lister. +NM=$lt_NM +# Whether we need soft or hard links. +LN_S=$lt_LN_S - echo "$ac_t""" 1>&6 - echo "$ac_t""${T_MD}Generating files${T_ME}" 1>&6 +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len +# Object file suffix (normally "o"). +objext=$ac_objext -CXXFLAGS_CLEAN=$CXXFLAGS -CFLAGS_CLEAN=$CFLAGS -CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" -INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" -CXXFLAGS="$CXXFLAGS $standard_libtool_flag" +# Executable file suffix (normally ""). +exeext=$exeext -if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then - pharcmd=pharcmd - pharcmd_install=install-pharcmd -else - pharcmd= - pharcmd_install= -fi; +# whether the shell understands "unset". +lt_unset=$lt_unset -all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" -install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL -case $PHP_SAPI in - cli) - install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" - ;; - *) - install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" - ;; -esac +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd - PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets" +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP - PHP_VAR_SUBST="$PHP_VAR_SUBST install_targets" +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob - - for header_file in Zend/ TSRM/ include/ main/ main/streams/; do - - - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INSTALLHEADERS$unique=set" - - INSTALL_HEADERS="$INSTALL_HEADERS $header_file" - - fi +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob - done - +# DLL creation program. +DLLTOOL=$lt_DLLTOOL +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd +# The archiver. +AR=$lt_AR - - case TSRM in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "TSRM"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/TSRM/"; ac_bdir="TSRM/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec +# A symbol stripping program. +STRIP=$lt_STRIP - old_IFS=$IFS - for ac_src in TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction - cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> Makefile.fragments +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms - src=$abs_srcdir/Makefile.frag - ac_srcdir=$abs_srcdir/Zend - ac_builddir=Zend - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds - src=$abs_srcdir/Zend/Makefile.frag - ac_srcdir=$abs_srcdir/Zend - ac_builddir=Zend - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action - $php_shtool mkdir -p $BUILD_DIR +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps - cat >Makefile <> Makefile - done +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path - cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile +# ### END LIBTOOL CONFIG +_LT_EOF -cat >> confdefs.h <<\EOF -#define HAVE_BUILD_DEFS_H 1 -EOF + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac -$php_shtool mkdir -p pear/scripts -$php_shtool mkdir -p scripts -$php_shtool mkdir -p scripts/man1 +ltmain="$ac_aux_dir/ltmain.sh" -ALL_OUTPUT_FILES="php5.spec main/build-defs.h \ -scripts/phpize scripts/man1/phpize.1 \ -scripts/php-config scripts/man1/php-config.1 \ -$PHP_OUTPUT_FILES" + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - for arg in $ac_configure_args; do - case $arg in - --with-*) - arg_name="`echo $arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`" - ;; - --without-*) - arg_name="`echo $arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`" - ;; - --enable-*) - arg_name="`echo $arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`" - ;; - --disable-*) - arg_name="`echo $arg | $SED -e 's/--disable-/enable-/g' -e 's/=.*//g'`" - ;; - *) - continue - ;; - esac - case $arg_name in - # Allow --disable-all / --enable-all - enable-all);; + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - # Allow certain libtool options - enable-libtool-lock | with-pic | with-tags | enable-shared | enable-static | enable-fast-install | with-gnu-ld);; - # Allow certain TSRM options - with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads);; + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" - # Allow certain Zend options - with-zend-vm | enable-maintainer-zts | enable-inline-optimization);; - # All the rest must be set using the PHP_ARG_* macros - # PHP_ARG_* macros set php_enable_ or php_with_ - *) - # Options that exist before PHP 6 - if test "$PHP_MAJOR_VERSION" -lt "6"; then - case $arg_name in - enable-zend-multibyte) continue;; - esac - fi + cat <<_LT_EOF >> "$ofile" - is_arg_set=php_`echo $arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` - if eval test "x\$$is_arg_set" = "x"; then - PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS -$arg" - fi - ;; - esac - done +# ### BEGIN LIBTOOL TAG CONFIG: CXX +# The linker used to build libraries. +LD=$lt_LD_CXX -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# A language specific compiler. +CC=$lt_compiler_CXX -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -DEFS=-DHAVE_CONFIG_H +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -ac_given_srcdir=$srcdir +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -trap 'rm -fr `echo "$ALL_OUTPUT_FILES main/php_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@EGREP@%$EGREP%g -s%@SED@%$SED%g -s%@CONFIGURE_COMMAND@%$CONFIGURE_COMMAND%g -s%@CONFIGURE_OPTIONS@%$CONFIGURE_OPTIONS%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@LN_S@%$LN_S%g -s%@AWK@%$AWK%g -s%@YACC@%$YACC%g -s%@RE2C@%$RE2C%g -s%@SHLIB_SUFFIX_NAME@%$SHLIB_SUFFIX_NAME%g -s%@SHLIB_DL_SUFFIX_NAME@%$SHLIB_DL_SUFFIX_NAME%g -s%@php_fpm_user@%$php_fpm_user%g -s%@php_fpm_group@%$php_fpm_group%g -s%@php_fpm_sysconfdir@%$php_fpm_sysconfdir%g -s%@php_fpm_localstatedir@%$php_fpm_localstatedir%g -s%@php_fpm_prefix@%$php_fpm_prefix%g -s%@PROG_SENDMAIL@%$PROG_SENDMAIL%g -s%@LIBOBJS@%$LIBOBJS%g -s%@ALLOCA@%$ALLOCA%g -s%@LTP@%$LTP%g -s%@LTP_GENHTML@%$LTP_GENHTML%g -s%@KRB5_CONFIG@%$KRB5_CONFIG%g -s%@PKG_CONFIG@%$PKG_CONFIG%g -s%@OPENSSL_INCDIR_OPT@%$OPENSSL_INCDIR_OPT%g -s%@ICU_CONFIG@%$ICU_CONFIG%g -s%@CXX@%$CXX%g -s%@CXXCPP@%$CXXCPP%g -s%@MYSQL_MODULE_TYPE@%$MYSQL_MODULE_TYPE%g -s%@MYSQL_LIBS@%$MYSQL_LIBS%g -s%@MYSQL_INCLUDE@%$MYSQL_INCLUDE%g -s%@OCI8_SHARED_LIBADD@%$OCI8_SHARED_LIBADD%g -s%@OCI8_DIR@%$OCI8_DIR%g -s%@OCI8_ORACLE_VERSION@%$OCI8_ORACLE_VERSION%g -s%@ODBC_INCLUDE@%$ODBC_INCLUDE%g -s%@ODBC_LIBS@%$ODBC_LIBS%g -s%@ODBC_LFLAGS@%$ODBC_LFLAGS%g -s%@ODBC_TYPE@%$ODBC_TYPE%g -s%@PDO_MYSQL_MODULE_TYPE@%$PDO_MYSQL_MODULE_TYPE%g -s%@PDO_OCI_SHARED_LIBADD@%$PDO_OCI_SHARED_LIBADD%g -s%@PDO_OCI_DIR@%$PDO_OCI_DIR%g -s%@PDO_OCI_VERSION@%$PDO_OCI_VERSION%g -s%@SNMP_CONFIG@%$SNMP_CONFIG%g -s%@LEMON@%$LEMON%g -s%@RANLIB@%$RANLIB%g -s%@INLINE_CFLAGS@%$INLINE_CFLAGS%g -s%@INCLUDE_PATH@%$INCLUDE_PATH%g -s%@EXPANDED_PEAR_INSTALLDIR@%$EXPANDED_PEAR_INSTALLDIR%g -s%@EXPANDED_EXTENSION_DIR@%$EXPANDED_EXTENSION_DIR%g -s%@EXPANDED_BINDIR@%$EXPANDED_BINDIR%g -s%@EXPANDED_SBINDIR@%$EXPANDED_SBINDIR%g -s%@EXPANDED_LIBDIR@%$EXPANDED_LIBDIR%g -s%@EXPANDED_DATADIR@%$EXPANDED_DATADIR%g -s%@EXPANDED_SYSCONFDIR@%$EXPANDED_SYSCONFDIR%g -s%@EXPANDED_LOCALSTATEDIR@%$EXPANDED_LOCALSTATEDIR%g -s%@EXPANDED_PHP_CONFIG_FILE_PATH@%$EXPANDED_PHP_CONFIG_FILE_PATH%g -s%@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@%$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR%g -s%@PHP_INSTALLED_SAPIS@%$PHP_INSTALLED_SAPIS%g -s%@abs_builddir@%$abs_builddir%g -s%@abs_srcdir@%$abs_srcdir%g -s%@php_abs_top_builddir@%$php_abs_top_builddir%g -s%@php_abs_top_srcdir@%$php_abs_top_srcdir%g -s%@program_prefix@%$program_prefix%g -s%@program_suffix@%$program_suffix%g -s%@DEBUG_CFLAGS@%$DEBUG_CFLAGS%g -s%@EXTENSION_DIR@%$EXTENSION_DIR%g -s%@EXTRA_LDFLAGS@%$EXTRA_LDFLAGS%g -s%@EXTRA_LDFLAGS_PROGRAM@%$EXTRA_LDFLAGS_PROGRAM%g -s%@EXTRA_LIBS@%$EXTRA_LIBS%g -s%@ZEND_EXTRA_LIBS@%$ZEND_EXTRA_LIBS%g -s%@INCLUDES@%$INCLUDES%g -s%@EXTRA_INCLUDES@%$EXTRA_INCLUDES%g -s%@INSTALL_IT@%$INSTALL_IT%g -s%@NATIVE_RPATHS@%$NATIVE_RPATHS%g -s%@PEAR_INSTALLDIR@%$PEAR_INSTALLDIR%g -s%@PHP_LDFLAGS@%$PHP_LDFLAGS%g -s%@PHP_LIBS@%$PHP_LIBS%g -s%@PHP_VERSION@%$PHP_VERSION%g -s%@PHP_VERSION_ID@%$PHP_VERSION_ID%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@OBJEXT@%$OBJEXT%g -s%@EXEEXT@%$EXEEXT%g -s%@ECHO@%$ECHO%g -s%@AR@%$AR%g -s%@STRIP@%$STRIP%g -s%@DSYMUTIL@%$DSYMUTIL%g -s%@NMEDIT@%$NMEDIT%g -s%@LIBTOOL@%$LIBTOOL%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -rm -f conftest.tail -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -EOF -cat >> $CONFIG_STATUS <' > TSRM/tsrm_config.h +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX -test -d Zend || $php_shtool mkdir Zend +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX -cat >Zend/zend_config.h < -#if defined(APACHE) && defined(PHP_API_VERSION) -#undef HAVE_DLFCN_H -#endif -FEO +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX -# run this only when generating all the files? -if test -n "\$REDO_ALL"; then - # Hacking while airborne considered harmful. - # - echo "creating main/internal_functions.c" - extensions="$EXT_STATIC" - sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX - echo "creating main/internal_functions_cli.c" - cli_extensions="$EXT_CLI_STATIC" - sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX - if test "$UNAME" = "FreeBSD" && test "$PHP_SAPI" = "apache2filter" && test "$TSRM_PTH" != "pth-config" ; then - echo "+--------------------------------------------------------------------+" - echo "| *** WARNING *** |" - echo "| |" - echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to |" - echo "| add --with-tsrm-pth to your ./configure line. Therefore you need |" - echo "| to install gnu-pth from /usr/ports/devel/pth. |" - fi +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX - if test -n "$PHP_APXS_BROKEN"; then - echo "+--------------------------------------------------------------------+" - echo "| WARNING: Your $APXS script is most likely broken." - echo "| |" - echo "| Please go read http://www.php.net/faq.build#faq.build.apxs |" - echo "| and make the changes described there and try again. |" - fi +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX - if test -n "$DEBUG_LOG"; then - rm -f config.cache -cat < processes when using a local Oracle | -| database, set the value BEQUEATH_DETACH=YES in Oracle Net's | -| sqlnet.ora file on the PHP host, or set the environment variable | -| BEQUEATH_DETACH to YES before starting Apache. If the problem | -| still occurs, then recompile PHP and specify --enable-sigchild | -| when configuring. | -X - fi - fi - fi +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX -cat <> $CONFIG_STATUS <<\EOF + esac +done # for ac_tag -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +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 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi --- php5-5.3.6.orig/config.sub +++ php5-5.3.6/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -120,8 +124,10 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -148,10 +154,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -166,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -249,13 +258,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,28 +280,42 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -300,6 +326,18 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -320,7 +358,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -329,14 +367,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -351,27 +392,31 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -393,7 +438,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -439,6 +484,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -455,10 +504,27 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -487,7 +553,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -526,6 +592,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -699,6 +769,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -803,6 +876,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -885,9 +964,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -981,6 +1061,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1037,17 +1120,10 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu ;; tile*) basic_machine=tile-unknown @@ -1120,6 +1196,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1128,6 +1207,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1249,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1213,9 +1296,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1236,10 +1322,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,9 +1335,10 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1258,7 +1346,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1297,7 +1385,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1346,7 +1434,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1388,6 +1476,11 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1410,10 +1503,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1425,8 +1518,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1453,7 +1555,7 @@ m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1480,7 +1582,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1585,7 +1687,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) --- php5-5.3.6.orig/install-sh +++ php5-5.3.6/install-sh @@ -0,0 +1,520 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2009-04-28.21; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: --- php5-5.3.6.orig/main/php_config.h.in +++ php5-5.3.6/main/php_config.h.in @@ -1,4 +1,4 @@ -/* main/php_config.h.in. Generated automatically from configure.in by autoheader. */ +/* main/php_config.h.in. Generated from configure.in by autoheader. */ /* Leave this file alone */ /* +----------------------------------------------------------------------+ @@ -32,2889 +32,2407 @@ #define ZEND_DLIMPORT -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -#undef _ALL_SOURCE -#endif - -/* Define if using alloca.c. */ -#undef C_ALLOCA - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -#undef CRAY_STACKSEG_END - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define if you have alloca, as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define if you don't have vprintf but do have _doprnt. */ -#undef HAVE_DOPRNT - -/* Define if your system has a working fnmatch function. */ -#undef HAVE_FNMATCH - -/* Define if your struct stat has st_blksize. */ -#undef HAVE_ST_BLKSIZE - -/* Define if your struct stat has st_blocks. */ -#undef HAVE_ST_BLOCKS - -/* Define if your struct stat has st_rdev. */ -#undef HAVE_ST_RDEV - -/* Define if your struct tm has tm_zone. */ -#undef HAVE_TM_ZONE - -/* Define if you don't have tm_zone but do have the external array - tzname. */ -#undef HAVE_TZNAME - -/* Define if utime(file, NULL) sets file's timestamp to the present. */ -#undef HAVE_UTIME_NULL - -/* Define if you have the vprintf function. */ -#undef HAVE_VPRINTF - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -#undef STACK_DIRECTION - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define if your declares struct tm. */ -#undef TM_IN_SYS_TIME - -/* Define to `int' if doesn't define. */ -#undef uid_t - #undef uint #undef ulong -/* The number of bytes in a char. */ -#undef SIZEOF_CHAR - -/* The number of bytes in a char *. */ -#undef SIZEOF_CHAR_P - -/* The number of bytes in a int. */ -#undef SIZEOF_INT - -/* The number of bytes in a long. */ -#undef SIZEOF_LONG - -/* The number of bytes in a long int. */ -#undef SIZEOF_LONG_INT - -/* The number of bytes in a long long. */ -#undef SIZEOF_LONG_LONG - -/* The number of bytes in a long long int. */ -#undef SIZEOF_LONG_LONG_INT - -/* The number of bytes in a short. */ -#undef SIZEOF_SHORT - -/* The number of bytes in a size_t. */ -#undef SIZEOF_SIZE_T - -/* Define if you have the CreateProcess function. */ -#undef HAVE_CREATEPROCESS - -/* Define if you have the acosh function. */ -#undef HAVE_ACOSH - -/* Define if you have the alphasort function. */ -#undef HAVE_ALPHASORT - -/* Define if you have the asctime_r function. */ -#undef HAVE_ASCTIME_R - -/* Define if you have the asinh function. */ -#undef HAVE_ASINH - -/* Define if you have the asprintf function. */ -#undef HAVE_ASPRINTF - -/* Define if you have the atanh function. */ -#undef HAVE_ATANH - -/* Define if you have the atoll function. */ -#undef HAVE_ATOLL - -/* Define if you have the chroot function. */ -#undef HAVE_CHROOT - -/* Define if you have the clearenv function. */ -#undef HAVE_CLEARENV - -/* Define if you have the crypt function. */ -#undef HAVE_CRYPT - -/* Define if you have the crypt_r function. */ -#undef HAVE_CRYPT_R - -/* Define if you have the ctermid function. */ -#undef HAVE_CTERMID - -/* Define if you have the ctime_r function. */ -#undef HAVE_CTIME_R - -/* Define if you have the cuserid function. */ -#undef HAVE_CUSERID - -/* Define if you have the fabsf function. */ -#undef HAVE_FABSF - -/* Define if you have the finite function. */ -#undef HAVE_FINITE - -/* Define if you have the flock function. */ -#undef HAVE_FLOCK - -/* Define if you have the floorf function. */ -#undef HAVE_FLOORF - -/* Define if you have the fork function. */ -#undef HAVE_FORK - -/* Define if you have the fpclass function. */ -#undef HAVE_FPCLASS - -/* Define if you have the ftok function. */ -#undef HAVE_FTOK - -/* Define if you have the funopen function. */ -#undef HAVE_FUNOPEN - -/* Define if you have the gai_strerror function. */ -#undef HAVE_GAI_STRERROR - -/* Define if you have the gcvt function. */ -#undef HAVE_GCVT - -/* Define if you have the getcwd function. */ -#undef HAVE_GETCWD - -/* Define if you have the getgrgid_r function. */ -#undef HAVE_GETGRGID_R - -/* Define if you have the getgrnam_r function. */ -#undef HAVE_GETGRNAM_R - -/* Define if you have the getgroups function. */ -#undef HAVE_GETGROUPS - -/* Define if you have the gethostname function. */ -#undef HAVE_GETHOSTNAME - -/* Define if you have the getloadavg function. */ -#undef HAVE_GETLOADAVG - -/* Define if you have the getlogin function. */ -#undef HAVE_GETLOGIN - -/* Define if you have the getopt function. */ -#undef HAVE_GETOPT - -/* Define if you have the getpgid function. */ -#undef HAVE_GETPGID - -/* Define if you have the getpid function. */ -#undef HAVE_GETPID - -/* Define if you have the getpriority function. */ -#undef HAVE_GETPRIORITY - -/* Define if you have the getprotobyname function. */ -#undef HAVE_GETPROTOBYNAME - -/* Define if you have the getprotobynumber function. */ -#undef HAVE_GETPROTOBYNUMBER - -/* Define if you have the getpwnam_r function. */ -#undef HAVE_GETPWNAM_R - -/* Define if you have the getpwuid_r function. */ -#undef HAVE_GETPWUID_R - -/* Define if you have the getrlimit function. */ -#undef HAVE_GETRLIMIT - -/* Define if you have the getrusage function. */ -#undef HAVE_GETRUSAGE - -/* Define if you have the getservbyname function. */ -#undef HAVE_GETSERVBYNAME - -/* Define if you have the getservbyport function. */ -#undef HAVE_GETSERVBYPORT - -/* Define if you have the getsid function. */ -#undef HAVE_GETSID - -/* Define if you have the gettimeofday function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define if you have the getwd function. */ -#undef HAVE_GETWD - -/* Define if you have the glob function. */ -#undef HAVE_GLOB - -/* Define if you have the gmtime_r function. */ -#undef HAVE_GMTIME_R - -/* Define if you have the grantpt function. */ -#undef HAVE_GRANTPT - -/* Define if you have the hstrerror function. */ -#undef HAVE_HSTRERROR - -/* Define if you have the hypot function. */ -#undef HAVE_HYPOT - -/* Define if you have the inet_ntoa function. */ -#undef HAVE_INET_NTOA - -/* Define if you have the inet_ntop function. */ -#undef HAVE_INET_NTOP - -/* Define if you have the inet_pton function. */ -#undef HAVE_INET_PTON - -/* Define if you have the initgroups function. */ -#undef HAVE_INITGROUPS - -/* Define if you have the isascii function. */ -#undef HAVE_ISASCII - -/* Define if you have the isfinite function. */ -#undef HAVE_ISFINITE - -/* Define if you have the isinf function. */ -#undef HAVE_ISINF - -/* Define if you have the isnan function. */ -#undef HAVE_ISNAN - -/* Define if you have the kill function. */ -#undef HAVE_KILL - -/* Define if you have the lchown function. */ -#undef HAVE_LCHOWN - -/* Define if you have the ldap_parse_reference function. */ -#undef HAVE_LDAP_PARSE_REFERENCE - -/* Define if you have the ldap_parse_result function. */ -#undef HAVE_LDAP_PARSE_RESULT - -/* Define if you have the ldap_start_tls_s function. */ -#undef HAVE_LDAP_START_TLS_S - -/* Define if you have the link function. */ -#undef HAVE_LINK - -/* Define if you have the localeconv function. */ -#undef HAVE_LOCALECONV - -/* Define if you have the localtime_r function. */ -#undef HAVE_LOCALTIME_R - -/* Define if you have the lockf function. */ -#undef HAVE_LOCKF - -/* Define if you have the log1p function. */ -#undef HAVE_LOG1P - -/* Define if you have the lrand48 function. */ -#undef HAVE_LRAND48 - -/* Define if you have the makedev function. */ -#undef HAVE_MAKEDEV - -/* Define if you have the mblen function. */ -#undef HAVE_MBLEN - -/* Define if you have the mbrlen function. */ -#undef HAVE_MBRLEN - -/* Define if you have the mbsinit function. */ -#undef HAVE_MBSINIT - -/* Define if you have the memcpy function. */ -#undef HAVE_MEMCPY - -/* Define if you have the memmove function. */ -#undef HAVE_MEMMOVE - -/* Define if you have the mempcpy function. */ -#undef HAVE_MEMPCPY - -/* Define if you have the mkfifo function. */ -#undef HAVE_MKFIFO - -/* Define if you have the mknod function. */ -#undef HAVE_MKNOD - -/* Define if you have the mkstemp function. */ -#undef HAVE_MKSTEMP - -/* Define if you have the mmap function. */ -#undef HAVE_MMAP - -/* Define if you have the mremap function. */ -#undef HAVE_MREMAP - -/* Define if you have the mysql_commit function. */ -#undef HAVE_MYSQL_COMMIT - -/* Define if you have the mysql_next_result function. */ -#undef HAVE_MYSQL_NEXT_RESULT - -/* Define if you have the mysql_sqlstate function. */ -#undef HAVE_MYSQL_SQLSTATE - -/* Define if you have the mysql_stmt_prepare function. */ -#undef HAVE_MYSQL_STMT_PREPARE - -/* Define if you have the nanosleep function. */ -#undef HAVE_NANOSLEEP - -/* Define if you have the nice function. */ -#undef HAVE_NICE - -/* Define if you have the nl_langinfo function. */ -#undef HAVE_NL_LANGINFO - -/* Define if you have the perror function. */ -#undef HAVE_PERROR - -/* Define if you have the poll function. */ -#undef HAVE_POLL - -/* Define if you have the ptsname function. */ -#undef HAVE_PTSNAME - -/* Define if you have the putenv function. */ -#undef HAVE_PUTENV - -/* Define if you have the rand_r function. */ -#undef HAVE_RAND_R - -/* Define if you have the random function. */ -#undef HAVE_RANDOM - -/* Define if you have the realpath function. */ -#undef HAVE_REALPATH - -/* Define if you have the rl_completion_matches function. */ -#undef HAVE_RL_COMPLETION_MATCHES - -/* Define if you have the scandir function. */ -#undef HAVE_SCANDIR - -/* Define if you have the setegid function. */ -#undef HAVE_SETEGID - -/* Define if you have the setenv function. */ -#undef HAVE_SETENV - -/* Define if you have the seteuid function. */ -#undef HAVE_SETEUID - -/* Define if you have the setitimer function. */ -#undef HAVE_SETITIMER - -/* Define if you have the setlocale function. */ -#undef HAVE_SETLOCALE - -/* Define if you have the setpgid function. */ -#undef HAVE_SETPGID - -/* Define if you have the setpriority function. */ -#undef HAVE_SETPRIORITY - -/* Define if you have the setproctitle function. */ -#undef HAVE_SETPROCTITLE - -/* Define if you have the setsid function. */ -#undef HAVE_SETSID - -/* Define if you have the setsockopt function. */ -#undef HAVE_SETSOCKOPT - -/* Define if you have the setvbuf function. */ -#undef HAVE_SETVBUF - -/* Define if you have the shutdown function. */ -#undef HAVE_SHUTDOWN - -/* Define if you have the sigaction function. */ -#undef HAVE_SIGACTION - -/* Define if you have the sigprocmask function. */ -#undef HAVE_SIGPROCMASK - -/* Define if you have the sigsetjmp function. */ -#undef HAVE_SIGSETJMP - -/* Define if you have the sigtimedwait function. */ -#undef HAVE_SIGTIMEDWAIT +/* Define if you want to enable memory limit support */ +#define MEMORY_LIMIT 0 -/* Define if you have the sigwaitinfo function. */ -#undef HAVE_SIGWAITINFO - -/* Define if you have the sin function. */ -#undef HAVE_SIN -/* Define if you have the snprintf function. */ -#undef HAVE_SNPRINTF - -/* Define if you have the socketpair function. */ -#undef HAVE_SOCKETPAIR - -/* Define if you have the srand48 function. */ -#undef HAVE_SRAND48 - -/* Define if you have the srandom function. */ -#undef HAVE_SRANDOM - -/* Define if you have the statfs function. */ -#undef HAVE_STATFS - -/* Define if you have the statvfs function. */ -#undef HAVE_STATVFS - -/* Define if you have the std_syslog function. */ -#undef HAVE_STD_SYSLOG - -/* Define if you have the strcasecmp function. */ -#undef HAVE_STRCASECMP - -/* Define if you have the strcoll function. */ -#undef HAVE_STRCOLL - -/* Define if you have the strdup function. */ -#undef HAVE_STRDUP - -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR - -/* Define if you have the strfmon function. */ -#undef HAVE_STRFMON - -/* Define if you have the strftime function. */ -#undef HAVE_STRFTIME - -/* Define if you have the strlcat function. */ -#undef HAVE_STRLCAT - -/* Define if you have the strlcpy function. */ -#undef HAVE_STRLCPY - -/* Define if you have the strndup function. */ -#undef HAVE_STRNDUP - -/* Define if you have the strnlen function. */ -#undef HAVE_STRNLEN - -/* Define if you have the strpbrk function. */ -#undef HAVE_STRPBRK - -/* Define if you have the strpncpy function. */ -#undef HAVE_STRPNCPY - -/* Define if you have the strptime function. */ -#undef HAVE_STRPTIME - -/* Define if you have the strstr function. */ -#undef HAVE_STRSTR - -/* Define if you have the strtod function. */ -#undef HAVE_STRTOD - -/* Define if you have the strtok_r function. */ -#undef HAVE_STRTOK_R - -/* Define if you have the strtol function. */ -#undef HAVE_STRTOL - -/* Define if you have the strtoll function. */ -#undef HAVE_STRTOLL - -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL - -/* Define if you have the strtoull function. */ -#undef HAVE_STRTOULL - -/* Define if you have the symlink function. */ -#undef HAVE_SYMLINK - -/* Define if you have the tempnam function. */ -#undef HAVE_TEMPNAM +/* */ +#undef AIX -/* Define if you have the tzset function. */ -#undef HAVE_TZSET +/* Whether to use native BeOS threads */ +#undef BETHREADS -/* Define if you have the unlockpt function. */ -#undef HAVE_UNLOCKPT +/* */ +#undef CDB_INCLUDE_FILE -/* Define if you have the unsetenv function. */ -#undef HAVE_UNSETENV +/* Define if system uses EBCDIC */ +#undef CHARSET_EBCDIC -/* Define if you have the usleep function. */ -#undef HAVE_USLEEP +/* Whether to build bcmath as dynamic module */ +#undef COMPILE_DL_BCMATH -/* Define if you have the utime function. */ -#undef HAVE_UTIME +/* Whether to build bz2 as dynamic module */ +#undef COMPILE_DL_BZ2 -/* Define if you have the utimes function. */ -#undef HAVE_UTIMES +/* Whether to build calendar as dynamic module */ +#undef COMPILE_DL_CALENDAR -/* Define if you have the vasprintf function. */ -#undef HAVE_VASPRINTF +/* Whether to build ctype as dynamic module */ +#undef COMPILE_DL_CTYPE -/* Define if you have the vsnprintf function. */ -#undef HAVE_VSNPRINTF +/* Whether to build curl as dynamic module */ +#undef COMPILE_DL_CURL -/* Define if you have the wait3 function. */ -#undef HAVE_WAIT3 +/* Whether to build date as dynamic module */ +#undef COMPILE_DL_DATE -/* Define if you have the waitpid function. */ -#undef HAVE_WAITPID +/* Whether to build dba as dynamic module */ +#undef COMPILE_DL_DBA -/* Define if you have the header file. */ -#undef HAVE__NSAPI_H +/* Whether to build dom as dynamic module */ +#undef COMPILE_DL_DOM -/* Define if you have the header file. */ -#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +/* Whether to build enchant as dynamic module */ +#undef COMPILE_DL_ENCHANT -/* Define if you have the header file. */ -#undef HAVE_ALLOCA_H +/* Whether to build ereg as dynamic module */ +#undef COMPILE_DL_EREG -/* Define if you have the header file. */ -#undef HAVE_ARPA_INET_H +/* Whether to build exif as dynamic module */ +#undef COMPILE_DL_EXIF -/* Define if you have the header file. */ -#undef HAVE_ARPA_NAMESER_H +/* Whether to build fileinfo as dynamic module */ +#undef COMPILE_DL_FILEINFO -/* Define if you have the header file. */ -#undef HAVE_ASSERT_H +/* Whether to build filter as dynamic module */ +#undef COMPILE_DL_FILTER -/* Define if you have the header file. */ -#undef HAVE_ATOMIC_H +/* Whether to build ftp as dynamic module */ +#undef COMPILE_DL_FTP -/* Define if you have the header file. */ -#undef HAVE_CRYPT_H +/* Whether to build gd as dynamic module */ +#undef COMPILE_DL_GD -/* Define if you have the header file. */ -#undef HAVE_DEFAULT_STORE_H +/* Whether to build gettext as dynamic module */ +#undef COMPILE_DL_GETTEXT -/* Define if you have the header file. */ -#undef HAVE_DIRENT_H +/* Whether to build gmp as dynamic module */ +#undef COMPILE_DL_GMP -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H +/* Whether to build hash as dynamic module */ +#undef COMPILE_DL_HASH -/* Define if you have the header file. */ -#undef HAVE_DNS_H +/* Whether to build iconv as dynamic module */ +#undef COMPILE_DL_ICONV -/* Define if you have the header file. */ -#undef HAVE_ERRNO_H +/* Whether to build imap as dynamic module */ +#undef COMPILE_DL_IMAP -/* Define if you have the header file. */ -#undef HAVE_FCNTL_H +/* Whether to build interbase as dynamic module */ +#undef COMPILE_DL_INTERBASE -/* Define if you have the header file. */ -#undef HAVE_GRP_H +/* Whether to build intl as dynamic module */ +#undef COMPILE_DL_INTL -/* Define if you have the header file. */ -#undef HAVE_IEEEFP_H +/* Whether to build json as dynamic module */ +#undef COMPILE_DL_JSON -/* Define if you have the header file. */ -#undef HAVE_INTTYPES_H +/* Whether to build ldap as dynamic module */ +#undef COMPILE_DL_LDAP -/* Define if you have the header file. */ -#undef HAVE_LANGINFO_H +/* Whether to build libxml as dynamic module */ +#undef COMPILE_DL_LIBXML -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H +/* Whether to build mbstring as dynamic module */ +#undef COMPILE_DL_MBSTRING -/* Define if you have the header file. */ -#undef HAVE_LOCALE_H +/* Whether to build mcrypt as dynamic module */ +#undef COMPILE_DL_MCRYPT -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H +/* Whether to build mssql as dynamic module */ +#undef COMPILE_DL_MSSQL -/* Define if you have the header file. */ -#undef HAVE_MONETARY_H +/* Whether to build mysql as dynamic module */ +#undef COMPILE_DL_MYSQL -/* Define if you have the header file. */ -#undef HAVE_NDIR_H +/* Whether to build mysqli as dynamic module */ +#undef COMPILE_DL_MYSQLI -/* Define if you have the header file. */ -#undef HAVE_NETDB_H +/* Whether to build mysqlnd as dynamic module */ +#undef COMPILE_DL_MYSQLND -/* Define if you have the header file. */ -#undef HAVE_NETINET_IN_H +/* Whether to build oci8 as dynamic module */ +#undef COMPILE_DL_OCI8 -/* Define if you have the header file. */ -#undef HAVE_NETINET_TCP_H +/* Whether to build odbc as dynamic module */ +#undef COMPILE_DL_ODBC -/* Define if you have the header file. */ -#undef HAVE_OPENSSL_CRYPTO_H +/* Whether to build openssl as dynamic module */ +#undef COMPILE_DL_OPENSSL -/* Define if you have the header file. */ -#undef HAVE_PWD_H +/* Whether to build pcntl as dynamic module */ +#undef COMPILE_DL_PCNTL -/* Define if you have the header file. */ -#undef HAVE_RESOLV_H +/* Whether to build pcre as dynamic module */ +#undef COMPILE_DL_PCRE -/* Define if you have the header file. */ -#undef HAVE_SIGNAL_H +/* Whether to build pdo as dynamic module */ +#undef COMPILE_DL_PDO -/* Define if you have the header file. */ -#undef HAVE_ST_H +/* Whether to build pdo_dblib as dynamic module */ +#undef COMPILE_DL_PDO_DBLIB -/* Define if you have the header file. */ -#undef HAVE_STDARG_H +/* Whether to build pdo_firebird as dynamic module */ +#undef COMPILE_DL_PDO_FIREBIRD -/* Define if you have the header file. */ -#undef HAVE_STDBOOL_H +/* Whether to build pdo_mysql as dynamic module */ +#undef COMPILE_DL_PDO_MYSQL -/* Define if you have the header file. */ -#undef HAVE_STDINT_H +/* Whether to build pdo_oci as dynamic module */ +#undef COMPILE_DL_PDO_OCI -/* Define if you have the header file. */ -#undef HAVE_STDIO_H +/* Whether to build pdo_odbc as dynamic module */ +#undef COMPILE_DL_PDO_ODBC -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H +/* Whether to build pdo_pgsql as dynamic module */ +#undef COMPILE_DL_PDO_PGSQL -/* Define if you have the header file. */ -#undef HAVE_STRING_H +/* Whether to build pdo_sqlite as dynamic module */ +#undef COMPILE_DL_PDO_SQLITE -/* Define if you have the header file. */ -#undef HAVE_STRINGS_H +/* Whether to build pgsql as dynamic module */ +#undef COMPILE_DL_PGSQL -/* Define if you have the header file. */ -#undef HAVE_SYS_DIR_H +/* Whether to build phar as dynamic module */ +#undef COMPILE_DL_PHAR -/* Define if you have the header file. */ -#undef HAVE_SYS_FILE_H +/* Whether to build posix as dynamic module */ +#undef COMPILE_DL_POSIX -/* Define if you have the header file. */ -#undef HAVE_SYS_IOCTL_H +/* Whether to build pspell as dynamic module */ +#undef COMPILE_DL_PSPELL -/* Define if you have the header file. */ -#undef HAVE_SYS_IPC_H +/* Whether to build readline as dynamic module */ +#undef COMPILE_DL_READLINE -/* Define if you have the header file. */ -#undef HAVE_SYS_LOADAVG_H +/* Whether to build recode as dynamic module */ +#undef COMPILE_DL_RECODE -/* Define if you have the header file. */ -#undef HAVE_SYS_MKDEV_H +/* Whether to build reflection as dynamic module */ +#undef COMPILE_DL_REFLECTION -/* Define if you have the header file. */ -#undef HAVE_SYS_MMAN_H +/* Whether to build session as dynamic module */ +#undef COMPILE_DL_SESSION -/* Define if you have the header file. */ -#undef HAVE_SYS_MOUNT_H +/* Whether to build shmop as dynamic module */ +#undef COMPILE_DL_SHMOP -/* Define if you have the header file. */ -#undef HAVE_SYS_NDIR_H +/* Whether to build simplexml as dynamic module */ +#undef COMPILE_DL_SIMPLEXML -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H +/* Whether to build snmp as dynamic module */ +#undef COMPILE_DL_SNMP -/* Define if you have the header file. */ -#undef HAVE_SYS_POLL_H +/* Whether to build soap as dynamic module */ +#undef COMPILE_DL_SOAP -/* Define if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H +/* Whether to build sockets as dynamic module */ +#undef COMPILE_DL_SOCKETS -/* Define if you have the header file. */ -#undef HAVE_SYS_SELECT_H +/* Whether to build spl as dynamic module */ +#undef COMPILE_DL_SPL -/* Define if you have the header file. */ -#undef HAVE_SYS_SOCKET_H +/* Whether to build sqlite as dynamic module */ +#undef COMPILE_DL_SQLITE -/* Define if you have the header file. */ -#undef HAVE_SYS_STAT_H +/* Whether to build sqlite3 as dynamic module */ +#undef COMPILE_DL_SQLITE3 -/* Define if you have the header file. */ -#undef HAVE_SYS_STATFS_H +/* Whether to build standard as dynamic module */ +#undef COMPILE_DL_STANDARD -/* Define if you have the header file. */ -#undef HAVE_SYS_STATVFS_H +/* Whether to build sybase_ct as dynamic module */ +#undef COMPILE_DL_SYBASE_CT -/* Define if you have the header file. */ -#undef HAVE_SYS_SYSEXITS_H +/* Whether to build sysvmsg as dynamic module */ +#undef COMPILE_DL_SYSVMSG -/* Define if you have the header file. */ -#undef HAVE_SYS_TIME_H +/* Whether to build sysvsem as dynamic module */ +#undef COMPILE_DL_SYSVSEM -/* Define if you have the header file. */ -#undef HAVE_SYS_TIMES_H +/* Whether to build sysvshm as dynamic module */ +#undef COMPILE_DL_SYSVSHM -/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H +/* Whether to build tidy as dynamic module */ +#undef COMPILE_DL_TIDY -/* Define if you have the header file. */ -#undef HAVE_SYS_UIO_H +/* Whether to build tokenizer as dynamic module */ +#undef COMPILE_DL_TOKENIZER -/* Define if you have the header file. */ -#undef HAVE_SYS_UN_H +/* Whether to build wddx as dynamic module */ +#undef COMPILE_DL_WDDX -/* Define if you have the header file. */ -#undef HAVE_SYS_UTSNAME_H +/* Whether to build xml as dynamic module */ +#undef COMPILE_DL_XML -/* Define if you have the header file. */ -#undef HAVE_SYS_VARARGS_H +/* Whether to build xmlreader as dynamic module */ +#undef COMPILE_DL_XMLREADER -/* Define if you have the header file. */ -#undef HAVE_SYS_VFS_H +/* Whether to build xmlrpc as dynamic module */ +#undef COMPILE_DL_XMLRPC -/* Define if you have the header file. */ -#undef HAVE_SYS_WAIT_H +/* Whether to build xmlwriter as dynamic module */ +#undef COMPILE_DL_XMLWRITER -/* Define if you have the header file. */ -#undef HAVE_SYSEXITS_H +/* Whether to build xsl as dynamic module */ +#undef COMPILE_DL_XSL -/* Define if you have the header file. */ -#undef HAVE_SYSLOG_H +/* Whether to build zip as dynamic module */ +#undef COMPILE_DL_ZIP -/* Define if you have the header file. */ -#undef HAVE_TERMIOS_H +/* Whether to build zlib as dynamic module */ +#undef COMPILE_DL_ZLIB -/* Define if you have the header file. */ -#undef HAVE_TIME_H +/* */ +#undef COOKIE_IO_FUNCTIONS_T -/* Define if you have the header file. */ -#undef HAVE_TUXMODULE_H +/* */ +#undef COOKIE_SEEKER_USES_OFF64_T -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END -/* Define if you have the header file. */ -#undef HAVE_UNIX_H +/* Define if crypt_r has uses CRYPTD */ +#undef CRYPT_R_CRYPTD -/* Define if you have the header file. */ -#undef HAVE_UTIME_H +/* Define if struct crypt_data requires _GNU_SOURCE */ +#undef CRYPT_R_GNU_SOURCE -/* Define if you have the header file. */ -#undef HAVE_WCHAR_H +/* Define if crypt_r uses struct crypt_data */ +#undef CRYPT_R_STRUCT_CRYPT_DATA -/* Define if you have the header file. */ -#undef HAVE_XMLPARSE_H +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA -/* Define if you have the header file. */ -#undef HAVE_XMLTOK_H +/* Define if the target system is darwin */ +#undef DARWIN -/* Define if you have the m library (-lm). */ -#undef HAVE_LIBM +/* */ +#undef DB1_INCLUDE_FILE -/* Define if the target system has /dev/urandom device */ -#undef HAVE_DEV_URANDOM +/* */ +#undef DB1_VERSION -/* Whether you have AOLserver */ -#undef HAVE_AOLSERVER +/* */ +#undef DB2_INCLUDE_FILE -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DB3_INCLUDE_FILE -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef DB4_INCLUDE_FILE -/* */ -#undef HAVE_APACHE +/* */ +#undef DBA_CDB -/* */ -#undef HAVE_APACHE +/* */ +#undef DBA_CDB_BUILTIN -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DBA_CDB_MAKE -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DBA_DB1 -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef DBA_DB2 -/* */ -#undef HAVE_OLD_COMPAT_H +/* */ +#undef DBA_DB3 -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DBA_DB4 -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef DBA_DBM -/* */ -#undef HAVE_OLD_COMPAT_H +/* */ +#undef DBA_FLATFILE -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DBA_GDBM -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef DBA_INIFILE -/* */ -#undef HAVE_OLD_COMPAT_H +/* */ +#undef DBA_NDBM -/* */ -#undef USE_TRANSFER_TABLES +/* */ +#undef DBA_QDBM -/* */ -#undef PHP_APACHE_HAVE_CLIENT_FD +/* */ +#undef DBM_INCLUDE_FILE -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef DBM_VERSION -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef DEFAULT_SHORT_OPEN_TAG -/* */ -#undef HAVE_APACHE_HOOKS +/* Whether to enable chroot() function */ +#undef ENABLE_CHROOT_FUNC -/* */ -#undef HAVE_APACHE +/* */ +#undef ENABLE_GD_TTF -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef ENCHANT_VERSION_STRING -/* */ -#undef HAVE_AP_CONFIG_H +/* */ +#undef GDBM_INCLUDE_FILE -/* */ -#undef HAVE_AP_COMPAT_H +/* Whether you use GNU Pth */ +#undef GNUPTH -/* */ -#undef HAVE_OLD_COMPAT_H +/* Whether 3 arg set_rebind_proc() */ +#undef HAVE_3ARG_SETREBINDPROC -/* */ -#undef HAVE_AP_CONFIG_H +/* Define to 1 if you have the `acosh' function. */ +#undef HAVE_ACOSH -/* */ -#undef HAVE_AP_COMPAT_H +/* */ +#undef HAVE_ADABAS -/* */ -#undef HAVE_OLD_COMPAT_H +/* whether the compiler supports __alignof__ */ +#undef HAVE_ALIGNOF -/* */ -#undef HAVE_AP_CONFIG_H +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA -/* */ -#undef HAVE_AP_COMPAT_H +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H -/* */ -#undef HAVE_OLD_COMPAT_H +/* Define to 1 if you have the `alphasort' function. */ +#undef HAVE_ALPHASORT -/* */ -#undef USE_TRANSFER_TABLES +/* Whether you have AOLserver */ +#undef HAVE_AOLSERVER -/* */ -#undef PHP_APACHE_HAVE_CLIENT_FD +/* */ +#undef HAVE_APACHE -/* Whether to compile with Caudium support */ -#undef HAVE_CAUDIUM +/* */ +#undef HAVE_APACHE_HOOKS -/* Whether you have a Continuity Server */ -#undef HAVE_CONTINUITY +/* Define to 1 if you have the + header file. */ +#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H -/* do we have prctl? */ -#undef HAVE_PRCTL +/* */ +#undef HAVE_AP_COMPAT_H -/* do we have clock_gettime? */ -#undef HAVE_CLOCK_GETTIME +/* */ +#undef HAVE_AP_CONFIG_H -/* do we have clock_get_time? */ -#undef HAVE_CLOCK_GET_TIME +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H -/* do we have ptrace? */ -#undef HAVE_PTRACE +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_NAMESER_H -/* do we have mach_vm_read? */ -#undef HAVE_MACH_VM_READ +/* Define to 1 if you have the `asctime_r' function. */ +#undef HAVE_ASCTIME_R -/* /proc/pid/mem interface */ -#undef PROC_MEM_FILE +/* Define to 1 if you have the `asinh' function. */ +#undef HAVE_ASINH -/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ -#undef HAVE_BUILTIN_ATOMIC +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF -/* do we have TCP_INFO? */ -#undef HAVE_LQ_TCP_INFO +/* Define to 1 if you have the header file. */ +#undef HAVE_ASSERT_H -/* do we have SO_LISTENQxxx? */ -#undef HAVE_LQ_SO_LISTENQ +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH -/* fpm user name */ -#undef PHP_FPM_USER +/* whether atof() accepts INF */ +#undef HAVE_ATOF_ACCEPTS_INF -/* fpm group name */ -#undef PHP_FPM_GROUP +/* whether atof() accepts NAN */ +#undef HAVE_ATOF_ACCEPTS_NAN -/* */ -#undef WITH_ZEUS +/* Define to 1 if you have the `atoll' function. */ +#undef HAVE_ATOLL -/* Whether you have a Netscape/iPlanet/Sun Webserver */ -#undef HAVE_NSAPI +/* Define to 1 if you have the header file. */ +#undef HAVE_ATOMIC_H -/* Whether you have phttpd */ -#undef HAVE_PHTTPD +/* whether the compiler supports __attribute__ ((__aligned__)) */ +#undef HAVE_ATTRIBUTE_ALIGNED -/* whether you want Pi3Web support */ -#undef WITH_PI3WEB +/* Whether you have bcmath */ +#undef HAVE_BCMATH -/* Whether you use Roxen */ -#undef HAVE_ROXEN +/* */ +#undef HAVE_BIND_TEXTDOMAIN_CODESET -/* Whether to use Roxen in ZTS mode */ -#undef ROXEN_USE_ZTS +/* */ +#undef HAVE_BIRDSTEP -/* Define if the socklen_t typedef is in sys/socket.h */ -#undef HAVE_SOCKLEN_T +/* Define if system has broken getcwd */ +#undef HAVE_BROKEN_GETCWD -/* Define if sockaddr_un in sys/un.h contains a sun_len component */ -#undef HAVE_SOCKADDR_UN_SUN_LEN +/* Define if your glibc borks on fopen with mode a+ */ +#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND -/* Define if cross-process locking is required by accept() */ -#undef USE_LOCKING +/* Whether we have librecode 3.5 */ +#undef HAVE_BROKEN_RECODE -/* Define if system uses EBCDIC */ -#undef CHARSET_EBCDIC +/* Konstantin Chuguev's iconv implementation */ +#undef HAVE_BSD_ICONV -/* Define if processor uses big-endian word */ -#undef WORDS_BIGENDIAN +/* */ +#undef HAVE_BUILD_DEFS_H -/* whether write(2) works */ -#undef PHP_WRITE_STDOUT +/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ +#undef HAVE_BUILTIN_ATOMIC -/* */ -#undef HAVE_SOCKET +/* */ +#undef HAVE_BUNDLED_PCRE -/* */ -#undef HAVE_SOCKET +/* */ +#undef HAVE_BZ2 -/* */ -#undef HAVE_LIBSOCKET +/* */ +#undef HAVE_CALENDAR -/* */ -#undef HAVE_SOCKETPAIR +/* Whether to compile with Caudium support */ +#undef HAVE_CAUDIUM -/* */ -#undef HAVE_SOCKETPAIR +/* Define to 1 if you have the `chroot' function. */ +#undef HAVE_CHROOT -/* */ -#undef HAVE_LIBSOCKET +/* Define to 1 if you have the `clearenv' function. */ +#undef HAVE_CLEARENV -/* */ -#undef HAVE_HTONL +/* */ +#undef HAVE_CLI0CLI_H -/* */ -#undef HAVE_HTONL +/* */ +#undef HAVE_CLI0CORE_H -/* */ -#undef HAVE_LIBSOCKET +/* */ +#undef HAVE_CLI0DEFS_H -/* */ -#undef HAVE_GETHOSTNAME +/* */ +#undef HAVE_CLI0ENV_H -/* */ -#undef HAVE_GETHOSTNAME +/* */ +#undef HAVE_CLI0EXT_H -/* */ -#undef HAVE_LIBNSL +/* do we have clock_gettime? */ +#undef HAVE_CLOCK_GETTIME -/* */ -#undef HAVE_GETHOSTBYADDR +/* do we have clock_get_time? */ +#undef HAVE_CLOCK_GET_TIME -/* */ -#undef HAVE_GETHOSTBYADDR +/* Whether you have struct cmsghdr */ +#undef HAVE_CMSGHDR -/* */ -#undef HAVE_LIBNSL +/* */ +#undef HAVE_CODBC -/* */ -#undef HAVE_YP_GET_DEFAULT_DOMAIN +/* */ +#undef HAVE_COLORCLOSESTHWB -/* */ -#undef HAVE_YP_GET_DEFAULT_DOMAIN +/* Whether you have a Continuity Server */ +#undef HAVE_CONTINUITY -/* */ -#undef HAVE_LIBNSL +/* Define to 1 if you have the `CreateProcess' function. */ +#undef HAVE_CREATEPROCESS -/* */ -#undef HAVE_DLOPEN +/* */ +#undef HAVE_CRYPT -/* */ -#undef HAVE_DLOPEN +/* Define to 1 if you have the header file. */ +#undef HAVE_CRYPT_H -/* */ -#undef HAVE_LIBDL +/* */ +#undef HAVE_CRYPT_R -/* */ -#undef HAVE_LIBDL +/* Define to 1 if you have the `ctermid' function. */ +#undef HAVE_CTERMID -/* */ -#undef HAVE_INET_ATON +/* Define to 1 if you have the `ctime_r' function. */ +#undef HAVE_CTIME_R -/* */ -#undef HAVE_INET_ATON +/* */ +#undef HAVE_CTYPE -/* */ -#undef HAVE_LIBRESOLV +/* */ +#undef HAVE_CURL -/* */ -#undef HAVE_INET_ATON +/* */ +#undef HAVE_CURL_EASY_STRERROR -/* */ -#undef HAVE_LIBBIND +/* Have cURL with GnuTLS support */ +#undef HAVE_CURL_GNUTLS -/* */ -#undef HAVE_FOPENCOOKIE +/* */ +#undef HAVE_CURL_MULTI_STRERROR -/* */ -#undef COOKIE_IO_FUNCTIONS_T +/* Have cURL with OpenSSL support */ +#undef HAVE_CURL_OPENSSL -/* */ -#undef COOKIE_SEEKER_USES_OFF64_T +/* Have cURL with SSL support */ +#undef HAVE_CURL_SSL -/* Define if system has broken getcwd */ -#undef HAVE_BROKEN_GETCWD +/* */ +#undef HAVE_CURL_VERSION_INFO -/* Define if your glibc borks on fopen with mode a+ */ -#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND +/* Define to 1 if you have the `cuserid' function. */ +#undef HAVE_CUSERID -/* Whether localtime_r is declared */ -#undef MISSING_LOCALTIME_R_DECL +/* */ +#undef HAVE_DBA -/* Whether gmtime_r is declared */ -#undef MISSING_GMTIME_R_DECL +/* Whether you want DBMaker */ +#undef HAVE_DBMAKER -/* Whether asctime_r is declared */ -#undef MISSING_ASCTIME_R_DECL +/* */ +#undef HAVE_DCNGETTEXT -/* Whether ctime_r is declared */ -#undef MISSING_CTIME_R_DECL +/* Whether system headers declare timezone */ +#undef HAVE_DECLARED_TIMEZONE -/* Whether strtok_r is declared */ -#undef MISSING_STRTOK_R_DECL +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#undef HAVE_DECL_TZNAME -/* */ -#undef MISSING_FCLOSE_DECL +/* Define to 1 if you have the header file. */ +#undef HAVE_DEFAULT_STORE_H -/* */ -#undef MISSING_FCLOSE_DECL +/* Define if the target system has /dev/urandom device */ +#undef HAVE_DEV_URANDOM -/* whether you have tm_gmtoff in struct tm */ -#undef HAVE_TM_GMTOFF +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H -/* whether you have struct flock */ -#undef HAVE_STRUCT_FLOCK +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H -/* Whether you have socklen_t */ -#undef HAVE_SOCKLEN_T +/* */ +#undef HAVE_DLOPEN -/* Size of intmax_t */ -#undef SIZEOF_INTMAX_T +/* Whether you have dmalloc */ +#undef HAVE_DMALLOC -/* Whether intmax_t is available */ -#undef HAVE_INTMAX_T +/* */ +#undef HAVE_DNGETTEXT -/* Size of ssize_t */ -#undef SIZEOF_SSIZE_T +/* Define to 1 if you have the header file. */ +#undef HAVE_DNS_H -/* Whether ssize_t is available */ -#undef HAVE_SSIZE_T +/* */ +#undef HAVE_DNS_SEARCH -/* Size of ptrdiff_t */ -#undef SIZEOF_PTRDIFF_T +/* */ +#undef HAVE_DN_EXPAND -/* Whether ptrdiff_t is available */ -#undef HAVE_PTRDIFF_T +/* */ +#undef HAVE_DN_SKIPNAME -/* Whether you have struct sockaddr_storage */ -#undef HAVE_SOCKADDR_STORAGE +/* */ +#undef HAVE_DOM -/* Whether struct sockaddr has field sa_len */ -#undef HAVE_SOCKADDR_SA_LEN +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT -/* */ -#undef HAVE_NANOSLEEP +/* OpenSSL 0.9.7 or later */ +#undef HAVE_DSA_DEFAULT_METHOD -/* */ -#undef HAVE_LIBRT +/* embedded MySQL support enabled */ +#undef HAVE_EMBEDDED_MYSQLI -/* Define if you have the getaddrinfo function */ -#undef HAVE_GETADDRINFO +/* */ +#undef HAVE_EMPRESS -/* Whether system headers declare timezone */ -#undef HAVE_DECLARED_TIMEZONE +/* */ +#undef HAVE_ENCHANT -/* Whether you have HP-UX 10.x */ -#undef PHP_HPUX_TIME_R +/* */ +#undef HAVE_ENCHANT_BROKER_SET_PARAM -/* Whether you have IRIX-style functions */ -#undef PHP_IRIX_TIME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_ERRNO_H -/* whether you have POSIX readdir_r */ -#undef HAVE_POSIX_READDIR_R +/* */ +#undef HAVE_ESOOB -/* whether you have old-style readdir_r */ -#undef HAVE_OLD_READDIR_R +/* Whether you want EXIF (metadata from images) support */ +#undef HAVE_EXIF -/* */ -#undef in_addr_t +/* Define to 1 if you have the `fabsf' function. */ +#undef HAVE_FABSF -/* Define if crypt_r has uses CRYPTD */ -#undef CRYPT_R_CRYPTD +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H -/* Define if crypt_r uses struct crypt_data */ -#undef CRYPT_R_STRUCT_CRYPT_DATA +/* Define to 1 if you have the `finite' function. */ +#undef HAVE_FINITE -/* Define if struct crypt_data requires _GNU_SOURCE */ -#undef CRYPT_R_GNU_SOURCE +/* Define to 1 if you have the `flock' function. */ +#undef HAVE_FLOCK -/* Whether you have gcov */ -#undef HAVE_GCOV +/* Define to 1 if you have the `floorf' function. */ +#undef HAVE_FLOORF -/* */ -#undef PHP_SAFE_MODE +/* Define if flush should be called explicitly after a buffered io. */ +#undef HAVE_FLUSHIO -/* */ -#undef PHP_SAFE_MODE +/* Define to 1 if your system has a working POSIX `fnmatch' function. */ +#undef HAVE_FNMATCH -/* */ -#undef PHP_SAFE_MODE_EXEC_DIR +/* */ +#undef HAVE_FOPENCOOKIE -/* */ -#undef PHP_SAFE_MODE_EXEC_DIR +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK -/* */ -#undef PHP_SIGCHILD +/* Define to 1 if you have the `fpclass' function. */ +#undef HAVE_FPCLASS -/* */ -#undef PHP_SIGCHILD +/* whether fpsetprec is present and usable */ +#undef HAVE_FPSETPREC -/* */ -#undef MAGIC_QUOTES +/* whether FPU control word can be manipulated by inline assembler */ +#undef HAVE_FPU_INLINE_ASM_X86 -/* */ -#undef MAGIC_QUOTES +/* whether floatingpoint.h defines fp_except */ +#undef HAVE_FP_EXCEPT -/* */ -#undef DEFAULT_SHORT_OPEN_TAG +/* */ +#undef HAVE_FREETDS -/* */ -#undef DEFAULT_SHORT_OPEN_TAG +/* Define to 1 if you have the `ftok' function. */ +#undef HAVE_FTOK -/* Whether you have dmalloc */ -#undef HAVE_DMALLOC +/* Whether you want FTP support */ +#undef HAVE_FTP -/* Whether to enable IPv6 support */ -#undef HAVE_IPV6 +/* Define to 1 if you have the `funopen' function. */ +#undef HAVE_FUNOPEN -/* Define if int32_t type is present. */ -#undef HAVE_INT32_T +/* Define to 1 if you have the `gai_strerror' function. */ +#undef HAVE_GAI_STRERROR -/* Define if uint32_t type is present. */ -#undef HAVE_UINT32_T +/* Whether you have gcov */ +#undef HAVE_GCOV -/* Whether to build date as dynamic module */ -#undef COMPILE_DL_DATE +/* Define to 1 if you have the `gcvt' function. */ +#undef HAVE_GCVT -/* Whether to build ereg as dynamic module */ -#undef COMPILE_DL_EREG +/* */ +#undef HAVE_GDIMAGECOLORRESOLVE -/* */ -#undef HAVE_REGEX_T_RE_MAGIC +/* */ +#undef HAVE_GD_BUNDLED -/* */ -#undef HSREGEX +/* */ +#undef HAVE_GD_CACHE_CREATE -/* */ -#undef REGEX +/* */ +#undef HAVE_GD_DYNAMIC_CTX_EX -/* */ -#undef REGEX +/* */ +#undef HAVE_GD_FONTCACHESHUTDOWN -/* 1 */ -#undef HAVE_REGEX_T_RE_MAGIC +/* */ +#undef HAVE_GD_FONTMUTEX -/* */ -#undef HAVE_LIBXML +/* */ +#undef HAVE_GD_FREEFONTCACHE -/* */ -#undef HAVE_LIBXML +/* */ +#undef HAVE_GD_GD2 -/* Whether to build libxml as dynamic module */ -#undef COMPILE_DL_LIBXML +/* */ +#undef HAVE_GD_GIF_CREATE -/* Whether to build openssl as dynamic module */ -#undef COMPILE_DL_OPENSSL +/* */ +#undef HAVE_GD_GIF_CTX -/* OpenSSL 0.9.7 or later */ -#undef HAVE_DSA_DEFAULT_METHOD +/* */ +#undef HAVE_GD_GIF_READ -/* */ -#undef HAVE_OPENSSL_EXT +/* */ +#undef HAVE_GD_IMAGEELLIPSE -/* */ -#undef HAVE_PCRE +/* */ +#undef HAVE_GD_IMAGESETBRUSH -/* Whether to build pcre as dynamic module */ -#undef COMPILE_DL_PCRE +/* */ +#undef HAVE_GD_IMAGESETTILE -/* Whether to build pcre as dynamic module */ -#undef COMPILE_DL_PCRE +/* */ +#undef HAVE_GD_JPG -/* */ -#undef HAVE_BUNDLED_PCRE +/* */ +#undef HAVE_GD_PNG -/* have commercial sqlite3 with crypto support */ -#undef HAVE_SQLITE3_KEY +/* */ +#undef HAVE_GD_STRINGFT -/* have sqlite3 with extension support */ -#undef SQLITE_OMIT_LOAD_EXTENSION +/* */ +#undef HAVE_GD_STRINGFTEX -/* */ -#undef HAVE_SQLITE3 +/* */ +#undef HAVE_GD_STRINGTTF -/* Whether to build sqlite3 as dynamic module */ -#undef COMPILE_DL_SQLITE3 +/* */ +#undef HAVE_GD_WBMP -/* Whether to build zlib as dynamic module */ -#undef COMPILE_DL_ZLIB +/* */ +#undef HAVE_GD_XBM -/* */ -#undef HAVE_ZLIB +/* */ +#undef HAVE_GD_XPM -/* Whether to build bcmath as dynamic module */ -#undef COMPILE_DL_BCMATH +/* Define if you have the getaddrinfo function */ +#undef HAVE_GETADDRINFO -/* Whether you have bcmath */ -#undef HAVE_BCMATH +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD -/* */ -#undef HAVE_BZ2 +/* Define to 1 if you have the `getgrgid_r' function. */ +#undef HAVE_GETGRGID_R -/* Whether to build bz2 as dynamic module */ -#undef COMPILE_DL_BZ2 +/* Define to 1 if you have the `getgrnam_r' function. */ +#undef HAVE_GETGRNAM_R -/* */ -#undef HAVE_CALENDAR +/* Define to 1 if you have the `getgroups' function. */ +#undef HAVE_GETGROUPS -/* Whether to build calendar as dynamic module */ -#undef COMPILE_DL_CALENDAR +/* */ +#undef HAVE_GETHOSTBYADDR -/* */ -#undef HAVE_CTYPE +/* Define to 1 if you have the `gethostname' function. */ +#undef HAVE_GETHOSTNAME -/* Whether to build ctype as dynamic module */ -#undef COMPILE_DL_CTYPE +/* Define to 1 if you have the `getloadavg' function. */ +#undef HAVE_GETLOADAVG -/* Have cURL with SSL support */ -#undef HAVE_CURL_SSL +/* Define to 1 if you have the `getlogin' function. */ +#undef HAVE_GETLOGIN -/* Have cURL with OpenSSL support */ -#undef HAVE_CURL_OPENSSL +/* Define to 1 if you have the `getopt' function. */ +#undef HAVE_GETOPT -/* Have cURL with GnuTLS support */ -#undef HAVE_CURL_GNUTLS +/* Define to 1 if you have the `getpgid' function. */ +#undef HAVE_GETPGID -/* */ -#undef HAVE_CURL +/* Define to 1 if you have the `getpid' function. */ +#undef HAVE_GETPID -/* */ -#undef HAVE_CURL_VERSION_INFO +/* Define to 1 if you have the `getpriority' function. */ +#undef HAVE_GETPRIORITY -/* */ -#undef HAVE_CURL_EASY_STRERROR +/* Define to 1 if you have the `getprotobyname' function. */ +#undef HAVE_GETPROTOBYNAME -/* */ -#undef HAVE_CURL_MULTI_STRERROR +/* Define to 1 if you have the `getprotobynumber' function. */ +#undef HAVE_GETPROTOBYNUMBER -/* */ -#undef PHP_CURL_URL_WRAPPERS +/* Define to 1 if you have the `getpwnam_r' function. */ +#undef HAVE_GETPWNAM_R -/* Whether to build curl as dynamic module */ -#undef COMPILE_DL_CURL +/* Define to 1 if you have the `getpwuid_r' function. */ +#undef HAVE_GETPWUID_R -/* */ -#undef QDBM_INCLUDE_FILE +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT -/* */ -#undef DBA_QDBM +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE -/* */ -#undef GDBM_INCLUDE_FILE +/* Define to 1 if you have the `getservbyname' function. */ +#undef HAVE_GETSERVBYNAME -/* */ -#undef DBA_GDBM +/* Define to 1 if you have the `getservbyport' function. */ +#undef HAVE_GETSERVBYPORT -/* */ -#undef NDBM_INCLUDE_FILE +/* Define to 1 if you have the `getsid' function. */ +#undef HAVE_GETSID -/* */ -#undef DBA_NDBM +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY -/* */ -#undef DBA_DB4 +/* Define to 1 if you have the `getwd' function. */ +#undef HAVE_GETWD -/* */ -#undef DB4_INCLUDE_FILE +/* */ +#undef HAVE_GICONV_H -/* */ -#undef DBA_DB3 +/* glibc's iconv implementation */ +#undef HAVE_GLIBC_ICONV -/* */ -#undef DB3_INCLUDE_FILE +/* Define to 1 if you have the `glob' function. */ +#undef HAVE_GLOB -/* */ -#undef DBA_DB2 +/* */ +#undef HAVE_GMP -/* */ -#undef DB2_INCLUDE_FILE +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R -/* */ -#undef DB1_VERSION +/* Define to 1 if you have the `grantpt' function. */ +#undef HAVE_GRANTPT -/* */ -#undef DB1_VERSION +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H -/* */ -#undef DB1_INCLUDE_FILE +/* Have HASH Extension */ +#undef HAVE_HASH_EXT -/* */ -#undef DBA_DB1 +/* Define to 1 if you have the `hstrerror' function. */ +#undef HAVE_HSTRERROR -/* */ -#undef DBM_INCLUDE_FILE +/* */ +#undef HAVE_HTONL -/* */ -#undef DBM_VERSION +/* whether HUGE_VAL == INF */ +#undef HAVE_HUGE_VAL_INF -/* */ -#undef DBM_VERSION +/* whether HUGE_VAL + -HUGEVAL == NAN */ +#undef HAVE_HUGE_VAL_NAN -/* */ -#undef DBA_DBM +/* Define to 1 if you have the `hypot' function. */ +#undef HAVE_HYPOT -/* */ -#undef DBA_CDB_BUILTIN +/* */ +#undef HAVE_IBASE -/* */ -#undef DBA_CDB_MAKE +/* */ +#undef HAVE_IBMDB2 -/* */ -#undef DBA_CDB +/* IBM iconv implementation */ +#undef HAVE_IBM_ICONV -/* */ -#undef CDB_INCLUDE_FILE +/* */ +#undef HAVE_ICONV -/* */ -#undef DBA_CDB +/* Define to 1 if you have the header file. */ +#undef HAVE_IEEEFP_H -/* */ -#undef DBA_INIFILE +/* */ +#undef HAVE_IMAP -/* */ -#undef DBA_FLATFILE +/* */ +#undef HAVE_IMAP2000 -/* */ -#undef HAVE_DBA +/* */ +#undef HAVE_IMAP2001 -/* Whether to build dba as dynamic module */ -#undef COMPILE_DL_DBA +/* */ +#undef HAVE_IMAP2004 -/* */ -#undef HAVE_LIBXML +/* */ +#undef HAVE_IMAP_AUTH_GSS -/* */ -#undef HAVE_DOM +/* */ +#undef HAVE_IMAP_KRB -/* Whether to build dom as dynamic module */ -#undef COMPILE_DL_DOM +/* */ +#undef HAVE_IMAP_MUTF7 -/* Whether to build enchant as dynamic module */ -#undef COMPILE_DL_ENCHANT +/* */ +#undef HAVE_IMAP_SSL -/* */ -#undef HAVE_ENCHANT +/* */ +#undef HAVE_INET_ATON -/* */ -#undef HAVE_ENCHANT_BROKER_SET_PARAM +/* Define to 1 if you have the `inet_ntoa' function. */ +#undef HAVE_INET_NTOA -/* */ -#undef ENCHANT_VERSION_STRING +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP -/* Whether you want EXIF (metadata from images) support */ -#undef HAVE_EXIF +/* Define to 1 if you have the `inet_pton' function. */ +#undef HAVE_INET_PTON -/* Whether to build exif as dynamic module */ -#undef COMPILE_DL_EXIF +/* Define to 1 if you have the `initgroups' function. */ +#undef HAVE_INITGROUPS -/* Whether to build fileinfo as dynamic module */ -#undef COMPILE_DL_FILEINFO +/* Define if int32_t type is present. */ +#undef HAVE_INT32_T -/* Whether to build filter as dynamic module */ -#undef COMPILE_DL_FILTER +/* Whether intmax_t is available */ +#undef HAVE_INTMAX_T -/* Whether you want FTP support */ -#undef HAVE_FTP +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -/* Whether to build ftp as dynamic module */ -#undef COMPILE_DL_FTP +/* */ +#undef HAVE_IODBC -/* */ -#undef USE_GD_IMGSTRTTF +/* */ +#undef HAVE_IODBC_H -/* */ -#undef USE_GD_IMGSTRTTF +/* Whether to enable IPv6 support */ +#undef HAVE_IPV6 -/* */ -#undef HAVE_LIBFREETYPE +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII -/* */ -#undef ENABLE_GD_TTF +/* Define to 1 if you have the `isfinite' function. */ +#undef HAVE_ISFINITE -/* */ -#undef HAVE_LIBT1 +/* Define to 1 if you have the `isinf' function. */ +#undef HAVE_ISINF -/* */ -#undef HAVE_LIBGD +/* Define to 1 if you have the `isnan' function. */ +#undef HAVE_ISNAN -/* */ -#undef HAVE_LIBGD13 +/* */ +#undef HAVE_ISQLEXT_H -/* */ -#undef HAVE_LIBGD15 +/* */ +#undef HAVE_ISQL_H -/* */ -#undef HAVE_LIBGD20 +/* whether to enable JavaScript Object Serialization support */ +#undef HAVE_JSON -/* */ -#undef HAVE_LIBGD204 +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL -/* */ -#undef HAVE_GD_IMAGESETTILE +/* Define to 1 if you have the header file. */ +#undef HAVE_LANGINFO_H -/* */ -#undef HAVE_GD_IMAGESETBRUSH +/* Define to 1 if you have the `lchown' function. */ +#undef HAVE_LCHOWN -/* */ -#undef HAVE_GDIMAGECOLORRESOLVE +/* */ +#undef HAVE_LDAP -/* */ -#undef HAVE_COLORCLOSESTHWB +/* Define to 1 if you have the `ldap_parse_reference' function. */ +#undef HAVE_LDAP_PARSE_REFERENCE -/* */ -#undef HAVE_GD_WBMP +/* Define to 1 if you have the `ldap_parse_result' function. */ +#undef HAVE_LDAP_PARSE_RESULT -/* */ -#undef HAVE_GD_GD2 +/* LDAP SASL support */ +#undef HAVE_LDAP_SASL -/* */ -#undef HAVE_GD_PNG +/* */ +#undef HAVE_LDAP_SASL_H -/* */ -#undef HAVE_GD_XBM +/* */ +#undef HAVE_LDAP_SASL_SASL_H -/* */ -#undef HAVE_GD_BUNDLED +/* Define to 1 if you have the `ldap_start_tls_s' function. */ +#undef HAVE_LDAP_START_TLS_S -/* */ -#undef HAVE_GD_GIF_READ +/* */ +#undef HAVE_LIBBIND -/* */ -#undef HAVE_GD_GIF_CREATE +/* */ +#undef HAVE_LIBCRYPT -/* */ -#undef HAVE_GD_IMAGEELLIPSE +/* */ +#undef HAVE_LIBDL -/* */ -#undef HAVE_GD_FONTCACHESHUTDOWN +/* */ +#undef HAVE_LIBDNET_STUB -/* */ -#undef HAVE_GD_FONTMUTEX +/* */ +#undef HAVE_LIBEDIT -/* */ -#undef HAVE_GD_DYNAMIC_CTX_EX +/* */ +#undef HAVE_LIBEXPAT -/* */ -#undef HAVE_GD_GIF_CTX +/* */ +#undef HAVE_LIBFREETYPE -/* */ -#undef HAVE_GD_JPG +/* */ +#undef HAVE_LIBGD -/* */ -#undef HAVE_GD_XPM +/* */ +#undef HAVE_LIBGD13 -/* */ -#undef HAVE_GD_STRINGFT +/* */ +#undef HAVE_LIBGD15 -/* */ -#undef HAVE_GD_STRINGFTEX +/* */ +#undef HAVE_LIBGD20 -/* */ -#undef ENABLE_GD_TTF +/* */ +#undef HAVE_LIBGD204 -/* */ -#undef USE_GD_JISX0208 +/* */ +#undef HAVE_LIBICONV -/* */ -#undef USE_GD_IMGSTRTTF +/* */ +#undef HAVE_LIBINTL -/* */ -#undef USE_GD_IMGSTRTTF +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM -/* */ -#undef HAVE_LIBFREETYPE +/* */ +#undef HAVE_LIBMCRYPT -/* */ -#undef ENABLE_GD_TTF +/* Whether you have libmm */ +#undef HAVE_LIBMM -/* */ -#undef HAVE_LIBT1 +/* */ +#undef HAVE_LIBNSL -/* */ -#undef HAVE_LIBGD +/* */ +#undef HAVE_LIBPAM -/* */ -#undef HAVE_LIBGD13 +/* */ +#undef HAVE_LIBRARYMANAGER_H -/* */ -#undef HAVE_LIBGD15 +/* */ +#undef HAVE_LIBREADLINE -/* */ -#undef HAVE_GD_PNG +/* Whether we have librecode 3.5 or higher */ +#undef HAVE_LIBRECODE -/* */ -#undef HAVE_GD_GIF_READ +/* */ +#undef HAVE_LIBRESOLV -/* */ -#undef HAVE_GD_GIF_CREATE +/* */ +#undef HAVE_LIBRT -/* */ -#undef HAVE_GD_WBMP +/* */ +#undef HAVE_LIBSOCKET -/* */ -#undef HAVE_GD_JPG +/* */ +#undef HAVE_LIBT1 -/* */ -#undef HAVE_GD_XPM +/* */ +#undef HAVE_LIBXML -/* */ -#undef HAVE_GD_GD2 +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H -/* */ -#undef HAVE_LIBGD20 +/* Define to 1 if you have the `link' function. */ +#undef HAVE_LINK -/* */ -#undef HAVE_GD_IMAGESETTILE +/* Define to 1 if you have the `localeconv' function. */ +#undef HAVE_LOCALECONV -/* */ -#undef HAVE_GD_IMAGEELLIPSE +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H -/* */ -#undef HAVE_GD_IMAGESETBRUSH +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R -/* */ -#undef HAVE_GD_STRINGTTF +/* Define to 1 if you have the `lockf' function. */ +#undef HAVE_LOCKF -/* */ -#undef HAVE_GD_STRINGFT +/* Define to 1 if you have the `log1p' function. */ +#undef HAVE_LOG1P -/* */ -#undef HAVE_GD_STRINGFTEX +/* do we have SO_LISTENQxxx? */ +#undef HAVE_LQ_SO_LISTENQ -/* */ -#undef HAVE_COLORCLOSESTHWB +/* do we have TCP_INFO? */ +#undef HAVE_LQ_TCP_INFO -/* */ -#undef HAVE_GDIMAGECOLORRESOLVE +/* Define to 1 if you have the `lrand48' function. */ +#undef HAVE_LRAND48 -/* */ -#undef HAVE_GD_GIF_CTX +/* do we have mach_vm_read? */ +#undef HAVE_MACH_VM_READ -/* */ -#undef HAVE_GD_CACHE_CREATE +/* Define to 1 if you have the `makedev' function. */ +#undef HAVE_MAKEDEV -/* */ -#undef HAVE_GD_FONTCACHESHUTDOWN +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H -/* */ -#undef HAVE_GD_FREEFONTCACHE +/* Define to 1 if you have the `mblen' function. */ +#undef HAVE_MBLEN -/* */ -#undef HAVE_GD_FONTMUTEX +/* whether to have multibyte regex support */ +#undef HAVE_MBREGEX -/* */ -#undef HAVE_GD_DYNAMIC_CTX_EX +/* Define to 1 if you have the `mbrlen' function. */ +#undef HAVE_MBRLEN -/* */ -#undef HAVE_LIBGD204 +/* Define to 1 if you have the `mbsinit' function. */ +#undef HAVE_MBSINIT -/* Whether to build gd as dynamic module */ -#undef COMPILE_DL_GD +/* Define if your system has mbstate_t in wchar.h */ +#undef HAVE_MBSTATE_T -/* */ -#undef HAVE_LIBINTL +/* whether to have multibyte string support */ +#undef HAVE_MBSTRING -/* Whether to build gettext as dynamic module */ -#undef COMPILE_DL_GETTEXT +/* Define to 1 if you have the `memcpy' function. */ +#undef HAVE_MEMCPY -/* */ -#undef HAVE_NGETTEXT +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE -/* */ -#undef HAVE_DNGETTEXT +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H -/* */ -#undef HAVE_DCNGETTEXT +/* Define to 1 if you have the `mempcpy' function. */ +#undef HAVE_MEMPCPY -/* */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Define if the target system has support for memory allocation using + mmap(MAP_ANON) */ +#undef HAVE_MEM_MMAP_ANON -/* Whether to build gmp as dynamic module */ -#undef COMPILE_DL_GMP +/* Define if the target system has support for memory allocation using + mmap("/dev/zero") */ +#undef HAVE_MEM_MMAP_ZERO -/* */ -#undef HAVE_GMP +/* Define to 1 if you have the `mkfifo' function. */ +#undef HAVE_MKFIFO -/* */ -#undef PHP_MHASH_BC +/* Define to 1 if you have the `mknod' function. */ +#undef HAVE_MKNOD -/* Have HASH Extension */ -#undef HAVE_HASH_EXT +/* Define to 1 if you have the `mkstemp' function. */ +#undef HAVE_MKSTEMP -/* Define if processor uses big-endian word */ -#undef WORDS_BIGENDIAN +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP -/* Whether to build hash as dynamic module */ -#undef COMPILE_DL_HASH +/* Define to 1 if you have the header file. */ +#undef HAVE_MONETARY_H -/* */ -#undef HAVE_LIBICONV +/* Define to 1 if you have the `mremap' function. */ +#undef HAVE_MREMAP -/* */ -#undef HAVE_GICONV_H +/* */ +#undef HAVE_MSSQL -/* */ -#undef HAVE_LIBICONV +/* Whether you have MySQL */ +#undef HAVE_MYSQL -/* iconv() is aliased to libiconv() in -liconv */ -#undef ICONV_ALIASED_LIBICONV +/* */ +#undef HAVE_MYSQLILIB -/* */ -#undef HAVE_ICONV +/* Define to 1 if you have the `mysql_commit' function. */ +#undef HAVE_MYSQL_COMMIT -/* Which iconv implementation to use */ -#undef PHP_ICONV_IMPL +/* Define to 1 if you have the `mysql_next_result' function. */ +#undef HAVE_MYSQL_NEXT_RESULT -/* Konstantin Chuguev's iconv implementation */ -#undef HAVE_BSD_ICONV +/* Define to 1 if you have the `mysql_sqlstate' function. */ +#undef HAVE_MYSQL_SQLSTATE -/* Which iconv implementation to use */ -#undef PHP_ICONV_IMPL +/* Define to 1 if you have the `mysql_stmt_prepare' function. */ +#undef HAVE_MYSQL_STMT_PREPARE -/* glibc's iconv implementation */ -#undef HAVE_GLIBC_ICONV +/* Define to 1 if you have the `nanosleep' function. */ +#undef HAVE_NANOSLEEP -/* Which iconv implementation to use */ -#undef PHP_ICONV_IMPL +/* Define to 1 if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H -/* IBM iconv implementation */ -#undef HAVE_IBM_ICONV +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H -/* Which iconv implementation to use */ -#undef PHP_ICONV_IMPL +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H -/* Whether iconv supports error no or not */ -#undef ICONV_SUPPORTS_ERRNO +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H -/* Whether iconv supports error no or not */ -#undef ICONV_SUPPORTS_ERRNO +/* */ +#undef HAVE_NET_SNMP -/* Whether iconv supports error no or not */ -#undef ICONV_SUPPORTS_ERRNO +/* Whether utf8_mime2text() has new signature */ +#undef HAVE_NEW_MIME2TEXT -/* Path to iconv.h */ -#undef PHP_ICONV_H_PATH +/* */ +#undef HAVE_NGETTEXT -/* Whether to build iconv as dynamic module */ -#undef COMPILE_DL_ICONV +/* Define to 1 if you have the `nice' function. */ +#undef HAVE_NICE -/* Whether to build imap as dynamic module */ -#undef COMPILE_DL_IMAP +/* Define to 1 if you have the `nl_langinfo' function. */ +#undef HAVE_NL_LANGINFO + +/* Whether you have a Netscape/iPlanet/Sun Webserver */ +#undef HAVE_NSAPI -/* */ -#undef HAVE_IMAP +/* */ +#undef HAVE_NSLDAP -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCI8 -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCICOLLASSIGN -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCIENVCREATE -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCIENVNLSCREATE -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCILOBISTEMPORARY -/* */ -#undef HAVE_IMAP2000 +/* */ +#undef HAVE_OCISTMTFETCH2 -/* */ -#undef HAVE_IMAP2004 +/* */ +#undef HAVE_OCI_INSTANT_CLIENT -/* Whether utf8_mime2text() has new signature */ -#undef HAVE_NEW_MIME2TEXT +/* */ +#undef HAVE_OCI_LOB_READ2 -/* */ -#undef HAVE_IMAP2001 +/* */ +#undef HAVE_ODBC2 -/* */ -#undef HAVE_LIBPAM +/* */ +#undef HAVE_ODBCSDK_H -/* */ -#undef HAVE_LIBCRYPT +/* */ +#undef HAVE_ODBC_H -/* */ -#undef HAVE_IMAP_KRB +/* */ +#undef HAVE_ODBC_ROUTER -/* */ -#undef HAVE_IMAP_SSL +/* */ +#undef HAVE_OLD_COMPAT_H -/* */ -#undef HAVE_IMAP_AUTH_GSS +/* whether you have old-style readdir_r */ +#undef HAVE_OLD_READDIR_R -/* */ -#undef HAVE_IMAP_MUTF7 +/* Define to 1 if the oniguruma library is available */ +#undef HAVE_ONIG -/* */ -#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CRYPTO_H -/* */ -#undef HAVE_IBASE +/* */ +#undef HAVE_OPENSSL_EXT -/* Whether to build interbase as dynamic module */ -#undef COMPILE_DL_INTERBASE +/* */ +#undef HAVE_ORALDAP -/* Whether to build intl as dynamic module */ -#undef COMPILE_DL_INTL +/* */ +#undef HAVE_ORALDAP_10 -/* whether to enable JavaScript Object Serialization support */ -#undef HAVE_JSON +/* Whether struct _zend_object_value is packed */ +#undef HAVE_PACKED_OBJECT_VALUE -/* Whether to build json as dynamic module */ -#undef COMPILE_DL_JSON +/* */ +#undef HAVE_PCRE -/* Whether to build ldap as dynamic module */ -#undef COMPILE_DL_LDAP +/* */ +#undef HAVE_PDO_DBLIB -/* */ -#undef HAVE_NSLDAP +/* */ +#undef HAVE_PDO_FIREBIRD -/* */ -#undef HAVE_NSLDAP +/* Whether to build PostgreSQL for PDO support or not */ +#undef HAVE_PDO_PGSQL -/* */ -#undef HAVE_NSLDAP +/* */ +#undef HAVE_PDO_SQLITELIB -/* */ -#undef HAVE_NSLDAP +/* Define to 1 if you have the `perror' function. */ +#undef HAVE_PERROR -/* */ -#undef HAVE_ORALDAP +/* Whether to build PostgreSQL support or not */ +#undef HAVE_PGSQL -/* */ -#undef HAVE_ORALDAP_10 +/* Whether libpq is compiled with --enable-multibyte */ +#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT -/* */ -#undef HAVE_LDAP +/* PostgreSQL 7.4 or later */ +#undef HAVE_PGTRANSACTIONSTATUS -/* Whether 3 arg set_rebind_proc() */ -#undef HAVE_3ARG_SETREBINDPROC +/* Whether to have pg_config.h */ +#undef HAVE_PG_CONFIG_H -/* */ -#undef HAVE_LDAP_SASL_SASL_H +/* PostgreSQL 8.1 or later */ +#undef HAVE_PG_LO_CREATE -/* */ -#undef HAVE_LDAP_SASL_H +/* PostgreSQL 8.4 or later */ +#undef HAVE_PG_LO_IMPORT_WITH_OID -/* LDAP SASL support */ -#undef HAVE_LDAP_SASL +/* */ +#undef HAVE_PHP_SESSION -/* whether to have multibyte string support */ -#undef HAVE_MBSTRING +/* Whether you have phttpd */ +#undef HAVE_PHTTPD -/* whether to check multibyte regex backtrack */ -#undef USE_COMBINATION_EXPLOSION_CHECK +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_PROTOTYPES +/* whether to include POSIX-like functions */ +#undef HAVE_POSIX -/* Define to 1 if the bundled oniguruma is used */ -#undef PHP_ONIG_BUNDLED +/* whether you have POSIX readdir_r */ +#undef HAVE_POSIX_READDIR_R -/* Define to 1 if the oniguruma library is available */ -#undef HAVE_ONIG +/* PostgreSQL 7.0.x or later */ +#undef HAVE_PQCLIENTENCODING -/* Define to 1 if the oniguruma library is available */ -#undef HAVE_ONIG +/* Broken libpq under windows */ +#undef HAVE_PQCMDTUPLES -/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ -#undef PHP_ONIG_BAD_KOI8_ENTRY +/* PostgreSQL 7.2.0 or later */ +#undef HAVE_PQESCAPE -/* whether to have multibyte regex support */ -#undef HAVE_MBREGEX +/* PostgreSQL 8.1.4 or later */ +#undef HAVE_PQESCAPE_BYTEA_CONN -/* Whether to build mbstring as dynamic module */ -#undef COMPILE_DL_MBSTRING +/* PostgreSQL 8.1.4 or later */ +#undef HAVE_PQESCAPE_CONN -/* */ -#undef HAVE_LIBMCRYPT +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQEXECPARAMS -/* */ -#undef HAVE_LIBMCRYPT +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQEXECPREPARED -/* Whether to build mcrypt as dynamic module */ -#undef COMPILE_DL_MCRYPT +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQFREEMEM -/* Whether to build mssql as dynamic module */ -#undef COMPILE_DL_MSSQL +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQFTABLE -/* */ -#undef HAVE_LIBDNET_STUB +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQGETCOPYDATA -/* */ -#undef HAVE_MSSQL +/* Older PostgreSQL */ +#undef HAVE_PQOIDVALUE -/* */ -#undef HAVE_FREETDS +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQPARAMETERSTATUS -/* */ -#undef PHP_MYSQL_UNIX_SOCK_ADDR +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQPREPARE -/* */ -#undef PHP_MYSQL_UNIX_SOCK_ADDR +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQPROTOCOLVERSION -/* Whether you have MySQL */ -#undef HAVE_MYSQL +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQPUTCOPYDATA -/* Whether to build mysql as dynamic module */ -#undef COMPILE_DL_MYSQL +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQPUTCOPYEND -/* Whether mysqlnd is enabled */ -#undef MYSQL_USE_MYSQLND +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQRESULTERRORFIELD -/* embedded MySQL support enabled */ -#undef HAVE_EMBEDDED_MYSQLI +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQSENDPREPARE -/* */ -#undef HAVE_MYSQLILIB +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQSENDQUERYPARAMS -/* */ -#undef HAVE_STMT_NEXT_RESULT +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQSENDQUERYPREPARED -/* Whether to build mysqli as dynamic module */ -#undef COMPILE_DL_MYSQLI +/* PostgreSQL 7.4 or later */ +#undef HAVE_PQSETERRORVERBOSITY -/* Whether mysqlnd is enabled */ -#undef MYSQLI_USE_MYSQLND +/* PostgreSQL 7.0.x or later */ +#undef HAVE_PQSETNONBLOCKING -/* */ -#undef HAVE_OCI_LOB_READ2 +/* PostgreSQL 7.3.0 or later */ +#undef HAVE_PQUNESCAPEBYTEA -/* Whether to build oci8 as dynamic module */ -#undef COMPILE_DL_OCI8 +/* do we have prctl? */ +#undef HAVE_PRCTL -/* */ -#undef HAVE_OCI8 +/* */ +#undef HAVE_PREAD -/* */ -#undef PHP_OCI8_DEF_DIR +/* */ +#undef HAVE_PSPELL -/* */ -#undef PHP_OCI8_DEF_SHARED_LIBADD +/* do we have ptrace? */ +#undef HAVE_PTRACE -/* */ -#undef HAVE_OCI_INSTANT_CLIENT +/* Whether ptrdiff_t is available */ +#undef HAVE_PTRDIFF_T -/* */ -#undef HAVE_OCI_LOB_READ2 +/* Define to 1 if you have the `ptsname' function. */ +#undef HAVE_PTSNAME -/* Whether to build oci8 as dynamic module */ -#undef COMPILE_DL_OCI8 +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV -/* */ -#undef HAVE_OCI8 +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H -/* */ -#undef HAVE_ADABAS +/* */ +#undef HAVE_PWRITE -/* */ -#undef HAVE_SAPDB +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM -/* */ -#undef HAVE_SOLID_35 +/* Define to 1 if you have the `rand_r' function. */ +#undef HAVE_RAND_R -/* */ -#undef HAVE_SOLID_30 +/* Define to 1 if you have the `realpath' function. */ +#undef HAVE_REALPATH -/* */ -#undef HAVE_SOLID +/* Whether Reflection is enabled */ +#undef HAVE_REFLECTION -/* Needed in sqlunix.h */ -#undef SS_LINUX +/* 1 */ +#undef HAVE_REGEX_T_RE_MAGIC -/* Needed in sqlunix.h */ -#undef SS_LINUX +/* Define to 1 if you have the header file. */ +#undef HAVE_RESOLV_H -/* Needed in sqlunix.h for wchar defs */ -#undef SS_FBX +/* */ +#undef HAVE_RES_NSEARCH -/* Needed in sqlunix.h for wchar defs */ -#undef SS_FBX +/* */ +#undef HAVE_RES_SEARCH -/* */ -#undef HAVE_IBMDB2 +/* */ +#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST -/* */ -#undef HAVE_ODBC_ROUTER +/* */ +#undef HAVE_RL_CALLBACK_READ_CHAR -/* */ -#undef HAVE_EMPRESS +/* Define to 1 if you have the `rl_completion_matches' function. */ +#undef HAVE_RL_COMPLETION_MATCHES -/* */ -#undef HAVE_EMPRESS +/* Whether you use Roxen */ +#undef HAVE_ROXEN -/* */ -#undef AIX +/* */ +#undef HAVE_SAPDB -/* */ -#undef HPUX +/* Define to 1 if you have the `scandir' function. */ +#undef HAVE_SCANDIR -/* */ -#undef LINUX +/* */ +#undef HAVE_SEMUN -/* */ -#undef NEUTRINO +/* Define to 1 if you have the `setegid' function. */ +#undef HAVE_SETEGID -/* */ -#undef ISOLARIS +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV -/* */ -#undef SOLARIS +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID -/* */ -#undef UNIXWARE +/* Define to 1 if you have the `setitimer' function. */ +#undef HAVE_SETITIMER -/* */ -#undef HAVE_BIRDSTEP +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE -/* */ -#undef HAVE_CODBC +/* Define to 1 if you have the `setpgid' function. */ +#undef HAVE_SETPGID -/* */ -#undef HAVE_IODBC +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY -/* */ -#undef HAVE_ODBC2 +/* Define to 1 if you have the `setproctitle' function. */ +#undef HAVE_SETPROCTITLE -/* */ -#undef HAVE_ESOOB +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID -/* */ -#undef HAVE_UNIXODBC +/* Define to 1 if you have the `setsockopt' function. */ +#undef HAVE_SETSOCKOPT -/* Whether you want DBMaker */ -#undef HAVE_DBMAKER +/* Define to 1 if you have the `setvbuf' function. */ +#undef HAVE_SETVBUF -/* */ -#undef HAVE_SQLDATASOURCES +/* */ +#undef HAVE_SHMOP -/* */ -#undef HAVE_UODBC +/* Define to 1 if you have the `shutdown' function. */ +#undef HAVE_SHUTDOWN -/* Whether to build odbc as dynamic module */ -#undef COMPILE_DL_ODBC +/* */ +#undef HAVE_SIGACTION -/* */ -#undef HAVE_FORK +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H -/* */ -#undef HAVE_WAITPID +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK -/* */ -#undef HAVE_SIGACTION +/* Define to 1 if you have the `sigsetjmp' function. */ +#undef HAVE_SIGSETJMP -/* Whether to build pcntl as dynamic module */ -#undef COMPILE_DL_PCNTL +/* Define to 1 if you have the `sigtimedwait' function. */ +#undef HAVE_SIGTIMEDWAIT -/* Whether to build pdo as dynamic module */ -#undef COMPILE_DL_PDO +/* Define to 1 if you have the `sigwaitinfo' function. */ +#undef HAVE_SIGWAITINFO -/* Whether to build pdo_dblib as dynamic module */ -#undef COMPILE_DL_PDO_DBLIB +/* */ +#undef HAVE_SIMPLEXML -/* */ -#undef HAVE_LIBDNET_STUB +/* Define to 1 if you have the `sin' function. */ +#undef HAVE_SIN -/* */ -#undef HAVE_PDO_DBLIB +/* */ +#undef HAVE_SNMP -/* */ -#undef HAVE_FREETDS +/* */ +#undef HAVE_SNMP_PARSE_OID -/* */ -#undef HAVE_PDO_FIREBIRD +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF -/* Whether to build pdo_firebird as dynamic module */ -#undef COMPILE_DL_PDO_FIREBIRD +/* */ +#undef HAVE_SOAP -/* Whether pdo_mysql uses mysqlnd */ -#undef PDO_USE_MYSQLND +/* Whether struct sockaddr has field sa_len */ +#undef HAVE_SOCKADDR_SA_LEN -/* Whether you have MySQL */ -#undef HAVE_MYSQL +/* Whether you have struct sockaddr_storage */ +#undef HAVE_SOCKADDR_STORAGE -/* */ -#undef PDO_MYSQL_UNIX_ADDR +/* Define if sockaddr_un in sys/un.h contains a sun_len component */ +#undef HAVE_SOCKADDR_UN_SUN_LEN -/* Whether to build pdo_mysql as dynamic module */ -#undef COMPILE_DL_PDO_MYSQL +/* */ +#undef HAVE_SOCKET -/* */ -#undef HAVE_OCIENVCREATE +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR -/* */ -#undef HAVE_OCIENVNLSCREATE +/* */ +#undef HAVE_SOCKETS -/* */ -#undef HAVE_OCILOBISTEMPORARY +/* Whether you have socklen_t */ +#undef HAVE_SOCKLEN_T -/* */ -#undef HAVE_OCILOBISTEMPORARY +/* */ +#undef HAVE_SOLID -/* */ -#undef HAVE_OCICOLLASSIGN +/* */ +#undef HAVE_SOLID_30 -/* */ -#undef HAVE_OCISTMTFETCH2 +/* */ +#undef HAVE_SOLID_35 -/* Whether to build pdo_oci as dynamic module */ -#undef COMPILE_DL_PDO_OCI +/* Whether you want SPL (Standard PHP Library) support */ +#undef HAVE_SPL -/* */ -#undef PHP_PDO_OCI_CLIENT_VERSION +/* */ +#undef HAVE_SQLCLI1_H -/* */ -#undef HAVE_ODBC_H +/* */ +#undef HAVE_SQLDATASOURCES -/* */ -#undef HAVE_ODBCSDK_H +/* */ +#undef HAVE_SQLEXT_H -/* */ -#undef HAVE_IODBC_H +/* */ +#undef HAVE_SQLITE3 -/* */ -#undef HAVE_SQLUNIX_H +/* have commercial sqlite3 with crypto support */ +#undef HAVE_SQLITE3_KEY -/* */ +/* */ #undef HAVE_SQLTYPES_H -/* */ +/* */ #undef HAVE_SQLUCODE_H -/* */ +/* */ +#undef HAVE_SQLUNIX_H + +/* */ #undef HAVE_SQL_H -/* */ -#undef HAVE_ISQL_H +/* Define to 1 if you have the `srand48' function. */ +#undef HAVE_SRAND48 -/* */ -#undef HAVE_SQLEXT_H +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM -/* */ -#undef HAVE_ISQLEXT_H +/* Whether ssize_t is available */ +#undef HAVE_SSIZE_T -/* */ -#undef HAVE_UDBCEXT_H +/* Define to 1 if you have the `statfs' function. */ +#undef HAVE_STATFS -/* */ -#undef HAVE_SQLCLI1_H +/* Define to 1 if you have the `statvfs' function. */ +#undef HAVE_STATVFS -/* */ -#undef HAVE_LIBRARYMANAGER_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H -/* */ -#undef HAVE_CLI0CORE_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_PROTOTYPES -/* */ -#undef HAVE_CLI0EXT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H -/* */ -#undef HAVE_CLI0CLI_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H -/* */ -#undef HAVE_CLI0DEFS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H -/* */ -#undef HAVE_CLI0ENV_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H -/* Whether to build pdo_odbc as dynamic module */ -#undef COMPILE_DL_PDO_ODBC +/* Define to 1 if you have the `std_syslog' function. */ +#undef HAVE_STD_SYSLOG -/* Whether to have pg_config.h */ -#undef HAVE_PG_CONFIG_H +/* */ +#undef HAVE_STMT_NEXT_RESULT -/* Whether to have pg_config.h */ -#undef HAVE_PG_CONFIG_H +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP -/* Whether to build PostgreSQL for PDO support or not */ -#undef HAVE_PDO_PGSQL +/* Define to 1 if you have the `strcoll' function. */ +#undef HAVE_STRCOLL -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPARAMETERSTATUS +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP -/* PostgreSQL 8.0 or later */ -#undef HAVE_PQPREPARE +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR -/* PostgreSQL 8.1.4 or later */ -#undef HAVE_PQESCAPE_CONN +/* Define to 1 if you have the `strfmon' function. */ +#undef HAVE_STRFMON -/* PostgreSQL 8.1.4 or later */ -#undef HAVE_PQESCAPE_BYTEA_CONN +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME -/* Whether libpq is compiled with --enable-multibyte */ -#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -/* Whether to build pdo_pgsql as dynamic module */ -#undef COMPILE_DL_PDO_PGSQL +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H -/* */ -#undef HAVE_PDO_SQLITELIB +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT -/* have commercial sqlite3 with crypto support */ -#undef HAVE_SQLITE3_KEY +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY -/* Whether to build pdo_sqlite as dynamic module */ -#undef COMPILE_DL_PDO_SQLITE +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP -/* Whether to build pdo_sqlite as dynamic module */ -#undef COMPILE_DL_PDO_SQLITE +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN -/* Whether to have pg_config.h */ -#undef HAVE_PG_CONFIG_H +/* Define to 1 if you have the `strpbrk' function. */ +#undef HAVE_STRPBRK -/* Whether to have pg_config.h */ -#undef HAVE_PG_CONFIG_H +/* Define to 1 if you have the `strpncpy' function. */ +#undef HAVE_STRPNCPY -/* Whether to build PostgreSQL support or not */ -#undef HAVE_PGSQL +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME -/* PostgreSQL 7.2.0 or later */ -#undef HAVE_PQESCAPE +/* whether strptime() declaration fails */ +#undef HAVE_STRPTIME_DECL_FAILS -/* PostgreSQL 7.3.0 or later */ -#undef HAVE_PQUNESCAPEBYTEA +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR -/* PostgreSQL 7.0.x or later */ -#undef HAVE_PQSETNONBLOCKING +/* Define to 1 if you have the `strtod' function. */ +#undef HAVE_STRTOD -/* Broken libpq under windows */ -#undef HAVE_PQCMDTUPLES +/* Define to 1 if you have the `strtok_r' function. */ +#undef HAVE_STRTOK_R -/* Older PostgreSQL */ -#undef HAVE_PQOIDVALUE +/* Define to 1 if you have the `strtol' function. */ +#undef HAVE_STRTOL -/* PostgreSQL 7.0.x or later */ -#undef HAVE_PQCLIENTENCODING +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPARAMETERSTATUS +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPROTOCOLVERSION +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL -/* PostgreSQL 7.4 or later */ -#undef HAVE_PGTRANSACTIONSTATUS +/* whether you have struct flock */ +#undef HAVE_STRUCT_FLOCK -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQEXECPARAMS +/* Define to 1 if `st_blksize' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BLKSIZE -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPREPARE +/* Define to 1 if `st_blocks' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BLOCKS -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQEXECPREPARED +/* Define to 1 if `st_rdev' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_RDEV -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQRESULTERRORFIELD +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#undef HAVE_STRUCT_TM_TM_ZONE -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQSENDQUERYPARAMS +/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ +#undef HAVE_ST_BLKSIZE -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQSENDPREPARE +/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ +#undef HAVE_ST_BLOCKS -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQSENDQUERYPREPARED +/* Define to 1 if you have the header file. */ +#undef HAVE_ST_H -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPUTCOPYDATA +/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use + `HAVE_STRUCT_STAT_ST_RDEV' instead. */ +#undef HAVE_ST_RDEV -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQPUTCOPYEND +/* */ +#undef HAVE_SYBASE_CT -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQGETCOPYDATA +/* Define to 1 if you have the `symlink' function. */ +#undef HAVE_SYMLINK -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQFREEMEM +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSEXITS_H -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQSETERRORVERBOSITY +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H -/* PostgreSQL 7.4 or later */ -#undef HAVE_PQFTABLE +/* Define if system timezone data is used */ +#undef HAVE_SYSTEM_TZDATA -/* PostgreSQL 8.1.4 or later */ -#undef HAVE_PQESCAPE_CONN +/* Define for location of system timezone data */ +#undef HAVE_SYSTEM_TZDATA_PREFIX -/* PostgreSQL 8.1.4 or later */ -#undef HAVE_PQESCAPE_BYTEA_CONN +/* */ +#undef HAVE_SYSVMSG -/* Whether libpq is compiled with --enable-multibyte */ -#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT +/* */ +#undef HAVE_SYSVSEM -/* PostgreSQL 8.1 or later */ -#undef HAVE_PG_LO_CREATE +/* */ +#undef HAVE_SYSVSHM -/* PostgreSQL 8.4 or later */ -#undef HAVE_PG_LO_IMPORT_WITH_OID +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H -/* Whether to build pgsql as dynamic module */ -#undef COMPILE_DL_PGSQL +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H -/* Whether to build phar as dynamic module */ -#undef COMPILE_DL_PHAR +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H -/* */ -#undef PHAR_HASH_OK +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IPC_H -/* */ -#undef PHAR_HAVE_OPENSSL +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LOADAVG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MKDEV_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H -/* whether to include POSIX-like functions */ -#undef HAVE_POSIX +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_POLL_H -/* Whether to build posix as dynamic module */ -#undef COMPILE_DL_POSIX +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H -/* Whether you have a working ttyname_r */ -#undef HAVE_TTYNAME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H -/* Wether struct utsname has domainname */ -#undef HAVE_UTSNAME_DOMAINNAME +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H -/* Whether to build pspell as dynamic module */ -#undef COMPILE_DL_PSPELL +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATFS_H -/* */ -#undef HAVE_PSPELL +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATVFS_H -/* */ -#undef HAVE_RL_CALLBACK_READ_CHAR +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H -/* */ -#undef HAVE_LIBREADLINE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSEXITS_H -/* */ -#undef HAVE_LIBEDIT +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIMES_H -/* Whether to build readline as dynamic module */ -#undef COMPILE_DL_READLINE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H -/* Whether we have librecode 3.5 */ -#undef HAVE_BROKEN_RECODE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H -/* Whether we have librecode 3.5 or higher */ -#undef HAVE_LIBRECODE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UIO_H -/* Whether to build recode as dynamic module */ -#undef COMPILE_DL_RECODE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H -/* Whether Reflection is enabled */ -#undef HAVE_REFLECTION +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H -/* Whether to build reflection as dynamic module */ -#undef COMPILE_DL_REFLECTION +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VARARGS_H -/* */ -#undef HAVE_PWRITE +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VFS_H -/* whether pwrite64 is default */ -#undef PHP_PWRITE_64 +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_WAIT_H -/* */ -#undef HAVE_PREAD +/* Define to 1 if you have the `tempnam' function. */ +#undef HAVE_TEMPNAM -/* whether pread64 is default */ -#undef PHP_PREAD_64 +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIOS_H -/* Whether to build session as dynamic module */ -#undef COMPILE_DL_SESSION +/* */ +#undef HAVE_TIDY -/* */ -#undef HAVE_PHP_SESSION +/* */ +#undef HAVE_TIDYOPTGETDOC -/* Whether you have libmm */ -#undef HAVE_LIBMM +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H -/* */ -#undef HAVE_SHMOP +/* whether you have tm_gmtoff in struct tm */ +#undef HAVE_TM_GMTOFF -/* Whether to build shmop as dynamic module */ -#undef COMPILE_DL_SHMOP +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#undef HAVE_TM_ZONE -/* */ -#undef HAVE_LIBXML +/* Whether you have a working ttyname_r */ +#undef HAVE_TTYNAME_R -/* */ -#undef HAVE_SIMPLEXML +/* Define to 1 if you have the header file. */ +#undef HAVE_TUXMODULE_H -/* Whether to build simplexml as dynamic module */ -#undef COMPILE_DL_SIMPLEXML +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +#undef HAVE_TZNAME -/* */ -#undef HAVE_NET_SNMP +/* Define to 1 if you have the `tzset' function. */ +#undef HAVE_TZSET -/* */ -#undef HAVE_SNMP_PARSE_OID +/* */ +#undef HAVE_UDBCEXT_H -/* */ -#undef HAVE_SNMP +/* Define if uint32_t type is present. */ +#undef HAVE_UINT32_T -/* */ -#undef UCD_SNMP_HACK +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H -/* Whether to build snmp as dynamic module */ -#undef COMPILE_DL_SNMP +/* */ +#undef HAVE_UNIXODBC -/* */ -#undef HAVE_LIBXML +/* Define to 1 if you have the header file. */ +#undef HAVE_UNIX_H -/* */ -#undef HAVE_SOAP +/* Define to 1 if you have the `unlockpt' function. */ +#undef HAVE_UNLOCKPT -/* Whether to build soap as dynamic module */ -#undef COMPILE_DL_SOAP +/* Define to 1 if you have the `unsetenv' function. */ +#undef HAVE_UNSETENV -/* Whether you have struct cmsghdr */ -#undef HAVE_CMSGHDR +/* */ +#undef HAVE_UODBC -/* */ -#undef MISSING_MSGHDR_MSGFLAGS +/* Define to 1 if you have the `usleep' function. */ +#undef HAVE_USLEEP -/* */ -#undef HAVE_SOCKETS +/* Define to 1 if you have the `utime' function. */ +#undef HAVE_UTIME -/* Whether to build sockets as dynamic module */ -#undef COMPILE_DL_SOCKETS +/* Define to 1 if you have the `utimes' function. */ +#undef HAVE_UTIMES -/* Whether struct _zend_object_value is packed */ -#undef HAVE_PACKED_OBJECT_VALUE +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H -/* Whether you want SPL (Standard PHP Library) support */ -#undef HAVE_SPL +/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ +#undef HAVE_UTIME_NULL -/* Whether to build spl as dynamic module */ -#undef COMPILE_DL_SPL +/* Wether struct utsname has domainname */ +#undef HAVE_UTSNAME_DOMAINNAME -/* Have PDO */ -#undef PHP_SQLITE2_HAVE_PDO +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF -/* Whether to build sqlite as dynamic module */ -#undef COMPILE_DL_SQLITE +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF -/* Size of a pointer */ -#undef SQLITE_PTR_SZ +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF -/* */ -#undef SQLITE_UTF8 +/* Define to 1 if you have the `wait3' function. */ +#undef HAVE_WAIT3 -/* Define if flush should be called explicitly after a buffered io. */ -#undef HAVE_FLUSHIO +/* */ +#undef HAVE_WAITPID -/* */ -#undef HAVE_CRYPT +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H -/* whether the compiler supports __alignof__ */ -#undef HAVE_ALIGNOF +/* */ +#undef HAVE_WDDX -/* whether the compiler supports __attribute__ ((__aligned__)) */ -#undef HAVE_ATTRIBUTE_ALIGNED +/* */ +#undef HAVE_XML -/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */ -#undef PHP_USE_PHP_CRYPT_R +/* Define to 1 if you have the header file. */ +#undef HAVE_XMLPARSE_H -/* Whether the system supports standard DES salt */ -#undef PHP_STD_DES_CRYPT +/* */ +#undef HAVE_XMLREADER -/* Whether the system supports BlowFish salt */ -#undef PHP_BLOWFISH_CRYPT +/* */ +#undef HAVE_XMLRPC -/* Whether the system supports extended DES salt */ -#undef PHP_EXT_DES_CRYPT +/* Define to 1 if you have the header file. */ +#undef HAVE_XMLTOK_H -/* Whether the system supports MD5 salt */ -#undef PHP_MD5_CRYPT +/* */ +#undef HAVE_XMLWRITER -/* Whether the system supports SHA512 salt */ -#undef PHP_SHA512_CRYPT +/* */ +#undef HAVE_XSL -/* Whether the system supports SHA256 salt */ -#undef PHP_SHA256_CRYPT +/* */ +#undef HAVE_XSL_EXSLT -/* Whether the system supports standard DES salt */ -#undef PHP_STD_DES_CRYPT +/* */ +#undef HAVE_YP_GET_DEFAULT_DOMAIN -/* Whether the system supports BlowFish salt */ -#undef PHP_BLOWFISH_CRYPT +/* */ +#undef HAVE_ZIP -/* Whether the system supports extended DES salt */ -#undef PHP_EXT_DES_CRYPT +/* */ +#undef HAVE_ZLIB -/* Whether the system supports MD5 salt */ -#undef PHP_MD5_CRYPT +/* whether _controlfp is present usable */ +#undef HAVE__CONTROLFP -/* Whether the system supports SHA512 salt */ -#undef PHP_SHA512_CRYPT +/* whether _controlfp_s is present and usable */ +#undef HAVE__CONTROLFP_S -/* Whether the system supports SHA256 salt */ -#undef PHP_SHA256_CRYPT +/* whether _FPU_SETCW is present and usable */ +#undef HAVE__FPU_SETCW -/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ -#undef PHP_USE_PHP_CRYPT_R +/* */ +#undef HPUX -/* Define if your system has fork/vfork/CreateProcess */ -#undef PHP_CAN_SUPPORT_PROC_OPEN +/* */ +#undef HSREGEX -/* Whether to enable chroot() function */ -#undef ENABLE_CHROOT_FUNC +/* iconv() is aliased to libiconv() in -liconv */ +#undef ICONV_ALIASED_LIBICONV -/* */ -#undef HAVE_RES_NSEARCH +/* Whether iconv supports error no or not */ +#undef ICONV_SUPPORTS_ERRNO -/* */ -#undef HAVE_RES_NSEARCH +/* */ +#undef ISOLARIS -/* */ -#undef HAVE_LIBRESOLV +/* */ +#undef LINUX -/* */ -#undef HAVE_RES_NSEARCH +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR -/* */ -#undef HAVE_LIBBIND +/* */ +#undef MAGIC_QUOTES -/* */ -#undef HAVE_RES_NSEARCH +/* Whether asctime_r is declared */ +#undef MISSING_ASCTIME_R_DECL -/* */ -#undef HAVE_LIBSOCKET +/* Whether ctime_r is declared */ +#undef MISSING_CTIME_R_DECL -/* */ -#undef HAVE_DNS_SEARCH +/* */ +#undef MISSING_FCLOSE_DECL -/* */ -#undef HAVE_DNS_SEARCH +/* Whether gmtime_r is declared */ +#undef MISSING_GMTIME_R_DECL -/* */ -#undef HAVE_LIBRESOLV +/* Whether localtime_r is declared */ +#undef MISSING_LOCALTIME_R_DECL -/* */ -#undef HAVE_DNS_SEARCH +/* */ +#undef MISSING_MSGHDR_MSGFLAGS -/* */ -#undef HAVE_LIBBIND +/* Whether strtok_r is declared */ +#undef MISSING_STRTOK_R_DECL -/* */ -#undef HAVE_DNS_SEARCH +/* Whether mysqlnd is enabled */ +#undef MYSQLI_USE_MYSQLND -/* */ -#undef HAVE_LIBSOCKET +/* Enable compressed protocol support */ +#undef MYSQLND_COMPRESSION_ENABLED -/* */ -#undef HAVE_DN_EXPAND +/* Enable SSL support */ +#undef MYSQLND_SSL_SUPPORTED -/* */ -#undef HAVE_DN_EXPAND +/* Whether mysqlnd is enabled */ +#undef MYSQL_USE_MYSQLND -/* */ -#undef HAVE_LIBRESOLV +/* */ +#undef NDBM_INCLUDE_FILE -/* */ -#undef HAVE_DN_EXPAND +/* */ +#undef NEUTRINO -/* */ -#undef HAVE_LIBBIND +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O -/* */ -#undef HAVE_DN_EXPAND +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* */ -#undef HAVE_LIBSOCKET +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -/* */ -#undef HAVE_DN_SKIPNAME +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -/* */ -#undef HAVE_DN_SKIPNAME +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME -/* */ -#undef HAVE_LIBRESOLV +/* Define to the home page for this package. */ +#undef PACKAGE_URL -/* */ -#undef HAVE_DN_SKIPNAME +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -/* */ -#undef HAVE_LIBBIND +/* */ +#undef PDO_MYSQL_UNIX_ADDR -/* */ -#undef HAVE_DN_SKIPNAME +/* Whether pdo_mysql uses mysqlnd */ +#undef PDO_USE_MYSQLND -/* */ -#undef HAVE_LIBSOCKET +/* */ +#undef PHAR_HASH_OK -/* */ -#undef HAVE_RES_SEARCH +/* */ +#undef PHAR_HAVE_OPENSSL -/* */ -#undef HAVE_RES_SEARCH +/* */ +#undef PHP_APACHE_HAVE_CLIENT_FD -/* */ -#undef HAVE_LIBRESOLV +/* Whether the system supports BlowFish salt */ +#undef PHP_BLOWFISH_CRYPT -/* */ -#undef HAVE_RES_SEARCH +/* PHP build date */ +#undef PHP_BUILD_DATE -/* */ -#undef HAVE_LIBBIND +/* Define if your system has fork/vfork/CreateProcess */ +#undef PHP_CAN_SUPPORT_PROC_OPEN -/* */ -#undef HAVE_RES_SEARCH +/* */ +#undef PHP_CURL_URL_WRAPPERS -/* */ -#undef HAVE_LIBSOCKET +/* Whether the system supports extended DES salt */ +#undef PHP_EXT_DES_CRYPT -/* whether atof() accepts NAN */ -#undef HAVE_ATOF_ACCEPTS_NAN +/* fpm group name */ +#undef PHP_FPM_GROUP -/* whether atof() accepts INF */ -#undef HAVE_ATOF_ACCEPTS_INF +/* fpm user name */ +#undef PHP_FPM_USER -/* whether HUGE_VAL == INF */ -#undef HAVE_HUGE_VAL_INF +/* Whether you have HP-UX 10.x */ +#undef PHP_HPUX_TIME_R -/* whether HUGE_VAL + -HUGEVAL == NAN */ -#undef HAVE_HUGE_VAL_NAN +/* Path to iconv.h */ +#undef PHP_ICONV_H_PATH -/* whether strptime() declaration fails */ -#undef HAVE_STRPTIME_DECL_FAILS +/* Which iconv implementation to use */ +#undef PHP_ICONV_IMPL -/* Define if your system has mbstate_t in wchar.h */ -#undef HAVE_MBSTATE_T +/* Whether you have IRIX-style functions */ +#undef PHP_IRIX_TIME_R -/* Whether to build standard as dynamic module */ -#undef COMPILE_DL_STANDARD +/* Whether the system supports MD5 salt */ +#undef PHP_MD5_CRYPT -/* */ -#undef HAVE_SYBASE_CT +/* */ +#undef PHP_MHASH_BC -/* Whether to build sybase_ct as dynamic module */ -#undef COMPILE_DL_SYBASE_CT +/* */ +#undef PHP_MYSQL_UNIX_SOCK_ADDR -/* */ -#undef HAVE_SYSVMSG +/* */ +#undef PHP_OCI8_DEF_DIR -/* Whether to build sysvmsg as dynamic module */ -#undef COMPILE_DL_SYSVMSG +/* */ +#undef PHP_OCI8_DEF_SHARED_LIBADD -/* Whether to build sysvsem as dynamic module */ -#undef COMPILE_DL_SYSVSEM +/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ +#undef PHP_ONIG_BAD_KOI8_ENTRY -/* */ -#undef HAVE_SYSVSEM +/* Define to 1 if the bundled oniguruma is used */ +#undef PHP_ONIG_BUNDLED -/* */ -#undef HAVE_SEMUN +/* uname output */ +#undef PHP_OS -/* */ -#undef HAVE_SEMUN +/* */ +#undef PHP_PDO_OCI_CLIENT_VERSION -/* */ -#undef HAVE_SYSVSHM +/* whether pread64 is default */ +#undef PHP_PREAD_64 -/* Whether to build sysvshm as dynamic module */ -#undef COMPILE_DL_SYSVSHM +/* whether pwrite64 is default */ +#undef PHP_PWRITE_64 -/* */ -#undef HAVE_TIDYOPTGETDOC +/* */ +#undef PHP_SAFE_MODE -/* Whether to build tidy as dynamic module */ -#undef COMPILE_DL_TIDY +/* */ +#undef PHP_SAFE_MODE_EXEC_DIR -/* */ -#undef HAVE_TIDY +/* Whether the system supports SHA256 salt */ +#undef PHP_SHA256_CRYPT -/* Whether to build tokenizer as dynamic module */ -#undef COMPILE_DL_TOKENIZER +/* Whether the system supports SHA512 salt */ +#undef PHP_SHA512_CRYPT -/* */ -#undef HAVE_LIBXML +/* */ +#undef PHP_SIGCHILD -/* */ -#undef HAVE_LIBEXPAT +/* Have PDO */ +#undef PHP_SQLITE2_HAVE_PDO -/* */ -#undef HAVE_WDDX +/* Whether the system supports standard DES salt */ +#undef PHP_STD_DES_CRYPT -/* Whether to build wddx as dynamic module */ -#undef COMPILE_DL_WDDX +/* uname -a output */ +#undef PHP_UNAME -/* */ -#undef HAVE_LIBXML +/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ +#undef PHP_USE_PHP_CRYPT_R -/* */ -#undef HAVE_LIBEXPAT +/* whether write(2) works */ +#undef PHP_WRITE_STDOUT -/* Whether to build xml as dynamic module */ -#undef COMPILE_DL_XML +/* /proc/pid/mem interface */ +#undef PROC_MEM_FILE -/* */ -#undef HAVE_XML +/* Whether to use Pthreads */ +#undef PTHREADS -/* */ -#undef HAVE_LIBXML +/* */ +#undef QDBM_INCLUDE_FILE -/* */ -#undef HAVE_XMLREADER +/* */ +#undef REGEX -/* Whether to build xmlreader as dynamic module */ -#undef COMPILE_DL_XMLREADER +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE -/* */ -#undef HAVE_XMLRPC +/* Whether to use Roxen in ZTS mode */ +#undef ROXEN_USE_ZTS -/* */ -#undef HAVE_LIBXML +/* The size of `char', as computed by sizeof. */ +#undef SIZEOF_CHAR -/* */ -#undef HAVE_LIBEXPAT +/* The size of `char *', as computed by sizeof. */ +#undef SIZEOF_CHAR_P -/* */ -#undef HAVE_LIBICONV +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT -/* */ -#undef HAVE_GICONV_H +/* Size of intmax_t */ +#undef SIZEOF_INTMAX_T -/* */ -#undef HAVE_LIBICONV +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG -/* iconv() is aliased to libiconv() in -liconv */ -#undef ICONV_ALIASED_LIBICONV +/* The size of `long int', as computed by sizeof. */ +#undef SIZEOF_LONG_INT -/* */ -#undef HAVE_ICONV +/* The size of `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG -/* */ -#undef UNDEF_THREADS_HACK +/* The size of `long long int', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG_INT -/* Whether to build xmlrpc as dynamic module */ -#undef COMPILE_DL_XMLRPC +/* Size of ptrdiff_t */ +#undef SIZEOF_PTRDIFF_T -/* Whether to build xmlrpc as dynamic module */ -#undef COMPILE_DL_XMLRPC +/* The size of `short', as computed by sizeof. */ +#undef SIZEOF_SHORT -/* */ -#undef HAVE_LIBXML +/* The size of `size_t', as computed by sizeof. */ +#undef SIZEOF_SIZE_T -/* */ -#undef HAVE_XMLWRITER +/* Size of ssize_t */ +#undef SIZEOF_SSIZE_T -/* Whether to build xmlwriter as dynamic module */ -#undef COMPILE_DL_XMLWRITER +/* */ +#undef SOLARIS -/* */ -#undef HAVE_XSL_EXSLT +/* have sqlite3 with extension support */ +#undef SQLITE_OMIT_LOAD_EXTENSION -/* */ -#undef HAVE_XSL +/* Size of a pointer */ +#undef SQLITE_PTR_SZ -/* Whether to build xsl as dynamic module */ -#undef COMPILE_DL_XSL +/* */ +#undef SQLITE_UTF8 -/* */ -#undef HAVE_ZIP +/* Needed in sqlunix.h for wchar defs */ +#undef SS_FBX -/* Whether to build zip as dynamic module */ -#undef COMPILE_DL_ZIP +/* Needed in sqlunix.h */ +#undef SS_LINUX -/* Whether to build mysqlnd as dynamic module */ -#undef COMPILE_DL_MYSQLND +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION -/* Enable compressed protocol support */ -#undef MYSQLND_COMPRESSION_ENABLED +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Enable SSL support */ -#undef MYSQLND_SSL_SUPPORTED +/* Suhosin Patch */ +#undef SUHOSIN_PATCH -/* Define if int32_t type is present. */ -#undef HAVE_INT32_T +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME -/* Define if uint32_t type is present. */ -#undef HAVE_UINT32_T +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME -/* Whether sprintf is broken */ -#undef ZEND_BROKEN_SPRINTF +/* */ +#undef TSRM_ST -/* whether floatingpoint.h defines fp_except */ -#undef HAVE_FP_EXCEPT +/* */ +#undef UCD_SNMP_HACK -/* whether _FPU_SETCW is present and usable */ -#undef HAVE__FPU_SETCW +/* */ +#undef UNDEF_THREADS_HACK -/* whether fpsetprec is present and usable */ -#undef HAVE_FPSETPREC +/* */ +#undef UNIXWARE -/* whether _controlfp is present usable */ -#undef HAVE__CONTROLFP +/* whether to check multibyte regex backtrack */ +#undef USE_COMBINATION_EXPLOSION_CHECK -/* whether _controlfp_s is present and usable */ -#undef HAVE__CONTROLFP_S +/* */ +#undef USE_GD_IMGSTRTTF -/* whether FPU control word can be manipulated by inline assembler */ -#undef HAVE_FPU_INLINE_ASM_X86 +/* */ +#undef USE_GD_JISX0208 -/* Define if double cast to long preserves least significant bits */ -#undef ZEND_DVAL_TO_LVAL_CAST_OK +/* Define if cross-process locking is required by accept() */ +#undef USE_LOCKING -/* Define if dlsym() requires a leading underscore in symbol names. */ -#undef DLSYM_NEEDS_UNDERSCORE +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif -/* virtual machine dispatch method */ -#undef ZEND_VM_KIND -/* virtual machine dispatch method */ -#undef ZEND_VM_KIND +/* */ +#undef USE_TRANSFER_TABLES -/* virtual machine dispatch method */ -#undef ZEND_VM_KIND +/* whether you want Pi3Web support */ +#undef WITH_PI3WEB -/* */ -#undef ZEND_DEBUG +/* */ +#undef WITH_ZEUS -/* */ -#undef ZEND_DEBUG +/* Define if processor uses big-endian word */ +#undef WORDS_BIGENDIAN -/* */ -#undef ZTS +/* Whether sprintf is broken */ +#undef ZEND_BROKEN_SPRINTF -/* */ -#undef ZEND_MULTIBYTE +/* */ +#undef ZEND_DEBUG -/* Define if the target system is darwin */ -#undef DARWIN +/* Define if double cast to long preserves least significant bits */ +#undef ZEND_DVAL_TO_LVAL_CAST_OK -/* */ +/* */ #undef ZEND_MM_ALIGNMENT -/* */ +/* */ #undef ZEND_MM_ALIGNMENT_LOG2 -/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */ -#undef HAVE_MEM_MMAP_ANON +/* */ +#undef ZEND_MULTIBYTE -/* Define if the target system has support for memory allocation using mmap(/dev/zero) */ -#undef HAVE_MEM_MMAP_ZERO +/* virtual machine dispatch method */ +#undef ZEND_VM_KIND -/* */ +/* */ #undef ZTS -/* Whether you use GNU Pth */ -#undef GNUPTH +/* Define to 1 if on MINIX. */ +#undef _MINIX -/* */ -#undef TSRM_ST +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE -/* Whether to use native BeOS threads */ -#undef BETHREADS +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE -/* Whether to use Pthreads */ -#undef PTHREADS +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const -/* PHP build date */ -#undef PHP_BUILD_DATE +/* Define to `int' if doesn't define. */ +#undef gid_t -/* hardcode for each of the cross compiler host */ -#undef PHP_OS +/* */ +#undef in_addr_t -/* hardcode for each of the cross compiler host */ -#undef PHP_UNAME +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif -/* uname -a output */ -#undef PHP_UNAME +/* Define to `unsigned int' if does not define. */ +#undef size_t -/* uname output */ -#undef PHP_OS +/* Define to `int' if doesn't define. */ +#undef uid_t -/* */ -#undef HAVE_BUILD_DEFS_H +/* Define to `unsigned int ' if does not define. */ +#undef uint +/* Define to `unsigned long ' if does not define. */ +#undef ulong #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS --- php5-5.3.6.orig/main/php_version.h +++ php5-5.3.6/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.3.6" +#define PHP_EXTRA_VERSION "-13ubuntu3" +#define PHP_VERSION "5.3.6-13ubuntu3" #define PHP_VERSION_ID 50306 --- php5-5.3.6.orig/debian/php5-fpm.init +++ php5-5.3.6/debian/php5-fpm.init @@ -0,0 +1,168 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: php-fpm php5-fpm +# Required-Start: $remote_fs $network +# Required-Stop: $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: starts php5-fpm +# Description: Starts PHP5 FastCGI Process Manager Daemon +### END INIT INFO + +# Author: Ondrej Sury + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="PHP5 FastCGI Process Manager" +NAME=php5-fpm +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="--fpm-config /etc/php5/fpm/php-fpm.conf" +PIDFILE=/var/run/php5-fpm.pid +TIMEOUT=30 +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function to check the correctness of the config file +# +do_check() +{ + [ "$1" != "no" ] && $DAEMON $DAEMON_ARGS -t 2>&1 | grep -v "\[ERROR\]" + FPM_ERROR=$($DAEMON $DAEMON_ARGS -t 2>&1 | grep "\[ERROR\]") + + if [ -n "${FPM_ERROR}" ]; then + echo "Please fix your configuration file..." + $DAEMON $DAEMON_ARGS -t 2>&1 | grep "\[ERROR\]" + return 1 + fi + return 0 +} + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS 2>/dev/null \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/$TIMEOUT/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_check $VERBOSE + case "$?" in + 0) + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + 1) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + check) + do_check yes + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC" "$NAME" + do_reload + log_end_msg $? + ;; + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +: --- php5-5.3.6.orig/debian/php5-sybase.postrm +++ php5-5.3.6/debian/php5-sybase.postrm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +NEW_CONFFILE=/etc/php5/conf.d/mssql.ini +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 5.2.3-2 +then + rm $NEW_CONFFILE +fi + +#DEBHELPER# --- php5-5.3.6.orig/debian/php5-dev.files +++ php5-5.3.6/debian/php5-dev.files @@ -0,0 +1,6 @@ +usr/bin/php-config +usr/bin/phpize +usr/share/man/man1/php-config.1 +usr/share/man/man1/phpize.1 +usr/include +usr/lib/php5/build --- php5-5.3.6.orig/debian/source_php5.py +++ php5-5.3.6/debian/source_php5.py @@ -0,0 +1,57 @@ +#!/usr/bin/python + +'''PHP5 Apport interface + +Copyright (C) 2010 Canonical Ltd. +Author: Chuck Short + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import os +import subprocess +from apport.hookutils import * + +def _add_my_conf_files(report, filename): + if not os.path.exists(filename): + return + + key = 'PHPConf' + path_to_key(filename) + report[key] = "" + for line in read_file(filename).split('\n'): + try: + if 'mysql.default_password ' in line.split('=')[0]: + line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0]) + if 'mysqli.default_pw ' in line.split('=')[0]: + line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0]) + if 'ifx.default_password ' in line.split('=')[0]: + line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0]) + report[key] += line + '\n' + except IndexError: + continue + +def add_info(report): + _add_my_conf_files(report, '/etc/php5/apache2/php.ini') + _add_my_conf_files(report, '/etc/php5/cli/php5.ini') + + # packages in main + packages=['php5', 'php-common', 'libapache2-mod-php5', 'libapache2-mod-php5filter' + 'php5-cgi', 'php5-cli', 'php5-dev', 'php5-dbg', 'php-pear', 'php5-curl', 'php5-gd' + 'php5-gmp', 'php5-ldap', 'php5-mhash', 'php5-mysql', 'php5-odbc', 'php5-pgsql', + 'php5-pspell', 'php5-recode', 'php5-snmp', 'php5-sqlite', 'php5-sybase', 'php5-tidy', + 'php5-xmlrpc', 'php5-xsl'] + + versions = '' + for package in packages: + try: + version = packaging.get_version(package) + except ValueError: + version = 'N/A' + if version is None: + version = 'N/A' + versions += '%s %s\n' %(package, version) + report['PHPInstalledModules'] = versions --- php5-5.3.6.orig/debian/libapache2-mod-php5.postinst +++ php5-5.3.6/debian/libapache2-mod-php5.postinst @@ -0,0 +1,49 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +reload_apache() +{ + if apache2ctl configtest 2>/dev/null; then + invoke-rc.d apache2 force-reload || true + else + echo "Your apache2 configuration is broken, so we're not restarting it for you." + fi +} + +# we've registered a trigger to handle extension updates. +if [ "$1" = "triggered" ] && [ "$2" = "/etc/php5/conf.d" ]; then + reload_apache + exit 0 +elif [ "$1" != "configure" ]; then + exit 0 +fi + +phpini="/etc/php5/apache2/php.ini" + +ucf /usr/share/php5/php.ini-production $phpini +ucfr libapache2-mod-php5 $phpini + +if [ -n "$2" ]; then + # recover the previous state + if [ -e /etc/php5/apache2/.start ]; then + a2enmod php5 >/dev/null || true + rm -f /etc/php5/apache2/.start + fi +# we're upgrading. test if we're enabled, and if so, restart to reload the module. + if [ -e /etc/apache2/mods-enabled/php5.load ]; then + reload_apache + fi + exit 0 +fi + +if [ -e /etc/apache2/apache2.conf ]; then +# Enable the module, but hide a2enmod's misleading message about apachectl +# and force-reload the thing ourselves. + a2enmod php5 >/dev/null || true + reload_apache +fi + +exit 0 --- php5-5.3.6.orig/debian/php5-fpm.postinst +++ php5-5.3.6/debian/php5-fpm.postinst @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +dpkg-maintscript-helper mv_conffile /etc/php5/fpm/main.conf /etc/php5/fpm/php-fpm.conf 5.3.5-1 -- "$@" + +if [ "$1" != "configure" ]; then + exit 0 +fi + +phpini="/etc/php5/fpm/php.ini" + +ucf /usr/share/php5/php.ini-production $phpini +ucfr php5-fpm $phpini + +exit 0 --- php5-5.3.6.orig/debian/php5-module.ini +++ php5-5.3.6/debian/php5-module.ini @@ -0,0 +1,2 @@ +; configuration for php @extname@ module +extension=@dsoname@.so --- php5-5.3.6.orig/debian/gbp.conf +++ php5-5.3.6/debian/gbp.conf @@ -0,0 +1,9 @@ +[DEFAULT] +debian-branch = debian-sid +debian-tag = debian/%(version)s +upstream-branch = upstream-sid +upstream-tag = upstream/%(version)s +pristine-tar = True + +[git-dch] +meta = 1 --- php5-5.3.6.orig/debian/php5-sapi.lintian-overrides +++ php5-5.3.6/debian/php5-sapi.lintian-overrides @@ -0,0 +1,18 @@ +# The extensions directory must exist, even if empty +@sapi@: package-contains-empty-directory @extdir@/ +# Not a spelling mistake, just a compilation curiosity +@sapi@: spelling-error-in-binary * ment meant +# Not a spelling mistake, tz code for Tahiti +@sapi@: spelling-error-in-binary * taht that +libapache2-mod-php5: embedded-library usr/lib/apache2/modules/libphp5.so: file +libapache2-mod-php5filter: embedded-library usr/lib/apache2/modules/libphp5filter.so: file +php5-cgi: embedded-library usr/bin/php5-cgi: file +php5-cgi: embedded-library usr/lib/cgi-bin/php5: file +php5-cli: embedded-library usr/bin/php5: file +php5-fpm: embedded-library usr/sbin/php5-fpm: file +libapache2-mod-php5: embedded-library ./usr/lib/apache2/modules/libphp5.so: file +libapache2-mod-php5filter: embedded-library ./usr/lib/apache2/modules/libphp5filter.so: file +php5-cgi: embedded-library ./usr/bin/php5-cgi: file +php5-cgi: embedded-library ./usr/lib/cgi-bin/php5: file +php5-cli: embedded-library ./usr/bin/php5: file +php5-fpm: embedded-library ./usr/sbin/php5-fpm: file --- php5-5.3.6.orig/debian/php5-dev.dirs +++ php5-5.3.6/debian/php5-dev.dirs @@ -0,0 +1,2 @@ +/usr/bin +/usr/share/lintian/overrides --- php5-5.3.6.orig/debian/php5-sapi.links +++ php5-5.3.6/debian/php5-sapi.links @@ -0,0 +1 @@ +etc/php5/conf.d etc/php5/@sapi@/conf.d --- php5-5.3.6.orig/debian/extramodulelist +++ php5-5.3.6/debian/extramodulelist @@ -0,0 +1,9 @@ +mysql MySQL mysqli +mysql MySQL pdo_mysql +interbase InterBase/Firebird pdo_firebird +common PDO pdo +odbc ODBC pdo_odbc +pgsql PostgreSQL pdo_pgsql +sqlite SQLite pdo_sqlite +sqlite SQLite3 sqlite3 +sybase Sybase pdo_dblib --- php5-5.3.6.orig/debian/php-pear.lintian-overrides +++ php5-5.3.6/debian/php-pear.lintian-overrides @@ -0,0 +1 @@ +php-pear: extra-license-file usr/share/doc/php5-common/PEAR/PEAR/LICENSE --- php5-5.3.6.orig/debian/libapache2-mod-php5.dirs +++ php5-5.3.6/debian/libapache2-mod-php5.dirs @@ -0,0 +1,3 @@ +/etc/apache2/mods-available +/etc/php5/apache2 +/usr/lib/apache2/modules --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.prerm +++ php5-5.3.6/debian/libapache2-mod-php5filter.prerm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + remove) + if [ -e /etc/apache2/apache2.conf -a -e /etc/apache2/mods-enabled/php5.load ]; then + # set a flag to remember the original state + # useful when reinstalling the same version. + touch /etc/php5/apache2filter/.start + fi + a2dismod php5filter || true + ;; +esac + +exit 0 --- php5-5.3.6.orig/debian/php5-common.docs +++ php5-5.3.6/debian/php5-common.docs @@ -0,0 +1,10 @@ +CREDITS +EXTENSIONS +TODO +CODING_STANDARDS +README.SVN-RULES +README.EXT_SKEL +README.SELF-CONTAINED-EXTENSIONS +README.Zeus +README.PHP4-TO-PHP5-THIN-CHANGES +debian/README.Debian.security --- php5-5.3.6.orig/debian/php5-common.dirs +++ php5-5.3.6/debian/php5-common.dirs @@ -0,0 +1,7 @@ +/usr/lib/php5/libexec +/usr/share/lintian/overrides +/usr/share/doc/php5-common/examples +/usr/share/php5 +/var/lib/php5 +/usr/lib/php5 +/etc/php5/conf.d --- php5-5.3.6.orig/debian/php-pear.dirs +++ php5-5.3.6/debian/php-pear.dirs @@ -0,0 +1,2 @@ +/usr/share/doc/php-pear/PEAR +/usr/share/lintian/overrides --- php5-5.3.6.orig/debian/rules +++ php5-5.3.6/debian/rules @@ -0,0 +1,720 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that builds an +# architecture-dependant package, as well as an architecture-independent +# package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# Set this flag to 'yes' if you want to disable all modifications breaking abi +# compatibility to upstream +PHP5_COMPAT=no + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export DEB_HOST_MULTIARCH + +PHP5_HOST_GNU_TYPE = $(subst gnulp,gnu,$(DEB_HOST_GNU_TYPE)) +PHP5_BUILD_GNU_TYPE = $(subst gnulp,gnu,$(DEB_BUILD_GNU_TYPE)) + +PHP5_HOST_GNU_TYPE := $(shell echo $(PHP5_HOST_GNU_TYPE) | sed 's/-gnu$$//') +PHP5_BUILD_GNU_TYPE := $(shell echo $(PHP5_BUILD_GNU_TYPE) | sed 's/-gnu$$//') + +PHP5_SOURCE_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //") +PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://") +PHP5_DEBIAN_REVISION = $(shell echo $(PHP5_SOURCE_VERSION) | sed "s/.*-//") + +MYSQL_PORT := $(shell for i in $$(seq 1025 3600); do nc -z localhost $$i || { echo $$i; exit; } ; done) +MYSQL_DATA_DIR ?= $(shell readlink -f mysql_db) +ifeq (,$(MYSQL_PORT)) + $(error Could not find available port for mysql server) +endif +MYSQL_SOCKET = $(MYSQL_DATA_DIR)/mysql.sock + +# specify some options to our patch system +QUILT_DIFF_OPTS=-p +QUILT_NO_DIFF_TIMESTAMPS=1 +export QUILT_DIFF_OPTS QUILT_NO_DIFF_TIMESTAMPS + +PROG_SENDMAIL = /usr/sbin/sendmail +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O2 +else + CFLAGS += -O0 +endif +CFLAGS += -Wall -fsigned-char -fno-strict-aliasing +# LFS support +ifneq (yes,$(PHP5_COMPAT)) + CFLAGS += $(shell getconf LFS_CFLAGS) +endif + +# Enable IEEE-conformant floating point math on alphas (not the default) +ifeq (alpha-linux-gnu,$(DEB_HOST_GNU_TYPE)) + CFLAGS += -mieee +endif + +ifeq ($(DEB_HOST_GNU_TYPE), $(findstring $(DEB_HOST_GNU_TYPE), ia64-linux-gnu powerpc64-linux-gnu avr32-linux-gnu)) + CFLAGS += -g +else + CFLAGS += -gstabs +endif + +# some other helpful (for readability at least) shorthand variables +PHPIZE_BUILDDIR = debian/php5-dev/usr/lib/php5/build + +# support new (>= 2.2) and older versions of libtool for backporting ease +LIBTOOL_DIRS = /usr/share/libtool/config /usr/share/libtool +LTMAIN = $(firstword $(wildcard $(foreach d,$(LIBTOOL_DIRS),$d/ltmain.sh))) +LTMAIN_DIR = $(dir $(LTMAIN)) + +ifeq ($(LTMAIN_DIR), /usr/share/libtool/) +LIBTOOL_CONFLICTS:=libtool (>= 2.2) +else ifeq ($(LTMAIN_DIR), /usr/share/libtool/config/) +LIBTOOL_CONFLICTS:=libtool (<< 2.2) +else +LIBTOOL_CONFLICTS:=$(error "could not resolve path to ltmain.sh") +endif + +#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +# MAKEFLAGS += -j$(NUMJOBS) +#endif + +# enable the hardening wrapper +DEB_BUILD_HARDENING = 1 +# but disable PIE +DEB_BUILD_HARDENING_PIE = 0 +export DEB_BUILD_HARDENING DEB_BUILD_HARDENING_PIE + +COMMON_CONFIG=--build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --disable-debug \ + --with-regex=php \ + --disable-rpath \ + --disable-static \ + --with-pic \ + --with-layout=GNU \ + --with-pear=/usr/share/php \ + --enable-calendar \ + --enable-sysvsem \ + --enable-sysvshm \ + --enable-sysvmsg \ + --enable-bcmath \ + --with-bz2 \ + --enable-ctype \ + --with-db4 \ + --without-gdbm \ + --with-iconv \ + --enable-exif \ + --enable-ftp \ + --with-gettext \ + --enable-mbstring \ + --with-pcre-regex=/usr \ + --enable-shmop \ + --enable-sockets \ + --enable-wddx \ + --with-libxml-dir=/usr \ + --with-zlib \ + --with-kerberos=/usr \ + --with-openssl \ + --enable-soap \ + --enable-zip \ + --with-mhash=yes \ + --with-exec-dir=/usr/lib/php5/libexec \ + --with-system-tzdata + +BUILTIN_EXTENSION_CHECK=$$e=get_loaded_extensions(); natcasesort($$e); \ + $$s="The following extensions are built in:"; \ + foreach($$e as $$i) { $$s .= " $$i"; } \ + echo("php:Extensions=" . wordwrap($$s . ".\n", 75, "\$${Newline} ")); + +# include the patch/unpatch rules from quilt +include /usr/share/quilt/quilt.make + +prepared: prepared-stamp +prepared-stamp: $(QUILT_STAMPFN) + dh_testdir + sleep 1 + sed -i -e 's/EXTRA_VERSION=""/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/' configure.in + ./buildconf --force + touch prepared-stamp + +unprepared: + dh_testdir + sed -i -e 's/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/EXTRA_VERSION=""/' configure.in + rm -f prepared-stamp + +test-results.txt: build-apache2-stamp build-cli-stamp build-cgi-stamp +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + mkdir -p temp_session_store + # start our own mysql server for the tests + $(SHELL) debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR) + extensions=""; \ + for f in $(CURDIR)/apache2-build/modules/*.so; do \ + ext=`basename "$$f"`; \ + test -d "$(CURDIR)/ext/$${ext%.so}/tests" || continue; \ + test "$$ext" != "imap.so" || continue; \ + test "$$ext" != "interbase.so" || continue; \ + test "$$ext" != "ldap.so" || continue; \ + test "$$ext" != "odbc.so" || continue; \ + test "$$ext" != "pgsql.so" || continue; \ + test "$$ext" != "pdo_dblib.so" || continue; \ + test "$$ext" != "pdo_firebird.so" || continue; \ + test "$$ext" != "pdo_odbc.so" || continue; \ + test "$$ext" != "pdo_pgsql.so" || continue; \ + test "$$ext" != "snmp.so" || continue; \ + extensions="$$extensions -d extension=$$ext"; \ + done; \ + [ "$$extensions" ] || { echo "extensions list is empty"; exit 1; }; \ + env MYSQL_TEST_PORT=$(MYSQL_PORT) MYSQL_TEST_SOCKET=$(MYSQL_SOCKET) PDO_MYSQL_TEST_PORT=$(MYSQL_PORT) PDO_MYSQL_TEST_SOCKET=$(MYSQL_SOCKET) NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=$(CURDIR)/cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=$(CURDIR)/cli-build/sapi/cli/php \ + $(CURDIR)/cli-build/sapi/cli/php run-tests.php -d mysql.default_socket=$(MYSQL_SOCKET) -d mysqli.default_socket=$(MYSQL_SOCKET) -d extension_dir=$(CURDIR)/apache2-build/modules/ $$extensions| tee test-results.txt + rm -rf temp_session_store + @for test in `find . -name '*.log' -a '!' -name 'config.log' -a '!' -name 'bootstrap.log' -a '!' -name 'run.log'`; do \ + echo; \ + echo -n "$${test#./}:"; \ + cat $$test; \ + echo; \ + done | tee -a test-results.txt + $(SHELL) debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR) stop +else + echo 'nocheck found in DEB_BUILD_OPTIONS' | tee test-results.txt +endif + +build: build-apache2-stamp build-apache2filter-stamp build-cgi-stamp build-cli-stamp build-fpm-stamp build-pear-stamp test-results.txt + +build-apache2-stamp: configure-apache2-stamp + dh_testdir + cd apache2-build && $(MAKE) + + touch build-apache2-stamp + +build-apache2filter-stamp: configure-apache2filter-stamp + dh_testdir + cd apache2filter-build && $(MAKE) + + touch build-apache2filter-stamp + +build-cli-stamp: configure-cli-stamp + dh_testdir + cd cli-build && $(MAKE) + + touch build-cli-stamp + +build-fpm-stamp: configure-fpm-stamp + dh_testdir + cd fpm-build && $(MAKE) + + touch build-fpm-stamp + + +build-cgi-stamp: configure-cgi-stamp + dh_testdir + cd cgi-build && $(MAKE) && mv sapi/cgi/php-cgi sapi/cgi/cgi-bin.php5 + + # Dirty hack to not rebuild everything twice + cd cgi-build/main && \ + sed -i -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/' \ + -e 's/DISCARD_PATH 0/DISCARD_PATH 1/' php_config.h && \ + sed -i -e 's/--enable-force-cgi-redirect/--enable-discard-path/' build-defs.h && \ + touch ../../ext/standard/info.c && \ + touch ../../sapi/cgi/cgi_main.c + + cd cgi-build && $(MAKE) && mv sapi/cgi/php-cgi sapi/cgi/usr.bin.php5-cgi + + touch build-cgi-stamp + +build-pear-stamp: build-cgi-stamp + dh_testdir + -mkdir pear-build + -mkdir pear-build-download + cd cgi-build && PHP_PEAR_DOWNLOAD_DIR=$(CURDIR)/pear-build-download $(MAKE) install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build + sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \ + $(CURDIR)/pear-build/usr/bin/pear && \ + sed -i -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \ + $(CURDIR)/pear-build/usr/bin/pecl && \ + sed -i -e 's/-d memory_limit="-1"//' \ + -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \ + $(CURDIR)/pear-build/usr/bin/peardev + sed -i -re "s#('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR)#\1 . '/pear'#" $(CURDIR)/pear-build/usr/share/php/PEAR/Config.php + patch -s -d $(CURDIR)/pear-build/usr/share/php/ -p1 -i $(CURDIR)/debian/patches/CVE-2011-1144.patch + patch -s -d $(CURDIR)/pear-build/usr/share/php/ -p1 -i $(CURDIR)/debian/patches/PEAR-Builder-print-info-about-php5-dev.patch + touch build-pear-stamp + +configure: configure-apache2-stamp configure-apache2filter-stamp configure-cli-stamp configure-fpm-stamp configure-cgi-stamp + +configure-apache2-stamp: prepared-stamp + dh_testdir + if [ -d apache2-build ]; then rm -rf apache2-build; fi + -mkdir apache2-build + cd apache2-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --with-apxs2=/usr/bin/apxs2 \ + --with-config-file-path=/etc/php5/apache2 \ + --with-config-file-scan-dir=/etc/php5/apache2/conf.d \ + $(COMMON_CONFIG) \ + --without-mm \ + --with-curl=shared,/usr \ + --with-enchant=shared,/usr \ + --with-zlib-dir=/usr \ + --with-gd=shared,/usr --enable-gd-native-ttf \ + --with-gmp=shared,/usr \ + --with-jpeg-dir=shared,/usr \ + --with-xpm-dir=shared,/usr/X11R6 \ + --with-png-dir=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --enable-intl=shared \ + --with-ttf=shared,/usr \ + --with-t1lib=shared,/usr \ + --with-ldap=shared,/usr \ + --with-ldap-sasl=/usr \ + --with-mysql=shared,/usr \ + --with-mysqli=shared,/usr/bin/mysql_config \ + --with-pspell=shared,/usr \ + --with-unixODBC=shared,/usr \ + --with-recode=shared,/usr \ + --with-xsl=shared,/usr \ + --with-snmp=shared,/usr \ + --without-sqlite \ + --with-sqlite3=shared,/usr \ + --with-mssql=shared,/usr \ + --with-tidy=shared,/usr \ + --with-xmlrpc=shared \ + --with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \ + --enable-pdo=shared \ + --without-pdo-dblib \ + --with-pdo-mysql=shared,/usr \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared,/usr/bin/pg_config \ + --with-pdo-sqlite=shared,/usr \ + --with-pdo-dblib=shared,/usr + cd apache2-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-apache2-stamp + +configure-apache2filter-stamp: prepared-stamp + dh_testdir + if [ -d apache2filter-build ]; then rm -rf apache2filter-build; fi + -mkdir apache2filter-build + cd apache2filter-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --with-apxs2filter=/usr/bin/apxs2 \ + --with-config-file-path=/etc/php5/apache2filter \ + --with-config-file-scan-dir=/etc/php5/apache2filter/conf.d \ + $(COMMON_CONFIG) \ + --without-mm \ + --disable-pdo \ + --without-mysql --without-sybase-ct --without-mssql \ + --without-sqlite --without-sqlite3 + cd apache2filter-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-apache2filter-stamp + +configure-cgi-stamp: prepared-stamp + dh_testdir + if [ -d cgi-build ]; then rm -rf cgi-build; fi + -mkdir cgi-build + cd cgi-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --enable-force-cgi-redirect --enable-fastcgi \ + --with-config-file-path=/etc/php5/cgi \ + --with-config-file-scan-dir=/etc/php5/cgi/conf.d \ + $(COMMON_CONFIG) \ + --without-mm \ + --disable-pdo \ + --without-mysql --without-sybase-ct --without-mssql \ + --without-sqlite --without-sqlite3 \ + --enable-pcntl + cd cgi-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-cgi-stamp + +configure-cli-stamp: prepared-stamp + dh_testdir + if [ -d cli-build ]; then rm -rf cli-build; fi + -mkdir cli-build + cd cli-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --disable-cgi \ + --with-config-file-path=/etc/php5/cli \ + --with-config-file-scan-dir=/etc/php5/cli/conf.d \ + $(COMMON_CONFIG) \ + --with-libedit \ + --without-mm \ + --disable-pdo \ + --without-mysql --without-sybase-ct --without-sqlite \ + --without-mssql --without-sqlite3 --enable-pcntl + cd cli-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-cli-stamp + +configure-fpm-stamp: prepared-stamp + dh_testdir + if [ -d fpm-build ]; then rm -rf fpm-build; fi + -mkdir fpm-build + cd fpm-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --enable-fpm --disable-cgi \ + --with-fpm-user=www-data --with-fpm-group=www-data \ + --with-config-file-path=/etc/php5/fpm \ + --with-config-file-scan-dir=/etc/php5/fpm/conf.d \ + $(COMMON_CONFIG) \ + --with-libevent-dir=/usr \ + --without-mm \ + --disable-pdo \ + --without-mysql --without-sybase-ct --without-sqlite \ + --without-mssql --without-sqlite3 + cd fpm-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-fpm-stamp + +clean: unprepared unpatch + dh_testdir + dh_testroot + + + rm -f configure-apache2-stamp build-apache2-stamp + rm -f configure-apache2filter-stamp build-apache2filter-stamp + rm -f configure-cgi-stamp build-cgi-stamp + rm -f configure-cli-stamp build-cli-stamp + rm -f configure-fpm-stamp build-fpm-stamp + rm -f build-pear-stamp + rm -f install-stamp + rm -rf apache2-build + rm -rf apache2filter-build + rm -rf cgi-build + rm -rf cli-build + rm -rf fpm-build + rm -rf pear-build pear-build-download + rm -f debian/copyright + # just in case the build tests failed, kill the running mysqld + $(SHELL) debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR) stop > /dev/null 2>&1 || exit 0 + rm -rf test-results.txt $(MYSQL_DATA_DIR) + dh_clean -Xorig + + # clean up autogenerated cruft + cat debian/modulelist | while read package extname dsoname; do \ + rm -f debian/php5-$$package.postinst; \ + done + for sapi in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli php5-fpm; do \ + for cruft in postrm links; do \ + rm -f debian/$${sapi}.$${cruft}; \ + done; \ + done + +PCNTL_FUNCTIONS := $(shell < ext/pcntl/php_pcntl.h sed -ne "/^PHP_FUNCTION/ s/PHP_FUNCTION(\(.*\));/\1/;t end;d;:end p" | tr '\n' ',') + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + chmod 01733 debian/php5-common/var/lib/php5 + + # Add here commands to install the package into debian/php5. + # install apache2 DSO module + cp apache2-build/.libs/libphp5.so \ + debian/libapache2-mod-php5/`apxs2 -q LIBEXECDIR`/ + cp debian/libapache2-mod-php5.load \ + debian/libapache2-mod-php5/etc/apache2/mods-available/php5.load + cp debian/libapache2-mod-php5.conf \ + debian/libapache2-mod-php5/etc/apache2/mods-available/php5.conf + + # Add here commands to install the package into debian/php5. + # install apache2 DSO filter module + cp apache2filter-build/.libs/libphp5.so \ + debian/libapache2-mod-php5filter/`apxs2 -q LIBEXECDIR`/libphp5filter.so + cp debian/libapache2-mod-php5filter.load \ + debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.load + cp debian/libapache2-mod-php5filter.conf \ + debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.conf + + # sanitize php.ini file + cat php.ini-production | tr "\t" " " | sed -e'/short_open_tag =/ s/Off/On/g;/session.gc_probability =/ s/1/0/g;/disable_functions =/ s/$$/ $(PCNTL_FUNCTIONS)/g;' > debian/php5-common/usr/share/php5/php.ini-production + # memory_limit: 16M for cgi/apache; 32M for cli + cat php.ini-production | tr "\t" " " | sed -e'/memory_limit =/ s/128M/-1/g;/short_open_tag =/ s/Off/On/g;/session.gc_probability =/ s/1/0/g' > debian/php5-common/usr/share/php5/php.ini-production.cli + cat php.ini-production | tr "\t" " " | sed -e'/memory_limit =/ s/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-production-dist + cat php.ini-development | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-development + cp test-results.txt debian/php5-common/usr/share/doc/php5-common/ + + # install the apache modules' files + cd apache2-build && $(MAKE) install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5 + # remove netware and win32 headers that we don't want + cd debian/libapache2-mod-php5/usr/include/php5/ && \ + $(RM) TSRM/readdir.h \ + TSRM/tsrm_config.nw.h TSRM/tsrm_config.w32.h\ + TSRM/tsrm_nw.h TSRM/tsrm_win32.h\ + Zend/zend_config.nw.h Zend/zend_config.w32.h\ + main/config.nw.h main/config.w32.h\ + main/win95nt.h + + # install PEAR + cp -a pear-build/* debian/php-pear/ + + # everything under usr/share/php/data except 'PEAR' is b0rken + # and actually needs to be fixed + [ ! -f debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE ] || \ + $(RM) debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE + [ ! -f debian/php-pear/usr/share/php/doc/PEAR/INSTALL ] || \ + $(RM) debian/php-pear/usr/share/php/doc/PEAR/INSTALL + [ ! -f debian/php-pear/usr/share/php/doc/Structures_Graph/docs/generate.sh ] || \ + $(RM) debian/php-pear/usr/share/php/doc/Structures_Graph/docs/generate.sh + for f in Structures_Graph/publish.sh Structures_Graph/package.sh \ + Structures_Graph/genpackage.xml.pl; do \ + $(RM) debian/php-pear/usr/share/php/data/$$f; \ + done + # we don't want test suites + $(RM) -r debian/php-pear/usr/share/php/test/ + [ -d debian/php-pear/usr/share/php/doc ] && { \ + mkdir -p debian/php-pear/usr/share/doc/php5-common/PEAR; \ + mv debian/php-pear/usr/share/php/doc/* \ + debian/php-pear/usr/share/doc/php5-common/PEAR/; \ + $(RM) -r debian/php-pear/usr/share/php/doc; \ + ln -s ../doc/php-pear/PEAR debian/php-pear/usr/share/php/doc; \ + echo "Dummy placeholder to prevent the directory's deletion" > \ + debian/php-pear/usr/share/doc/php5-common/PEAR/.placeholder; \ + } + + # install extensions + ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\ + for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-fpm php5-cli; do \ + mkdir -p debian/$$i/$${ext}; \ + done; \ + cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \ + if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \ + mkdir -p debian/php5-$$package$${ext}; \ + chrpath debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \ + chrpath -d debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \ + install -m 644 -o root -g root \ + debian/libapache2-mod-php5/$${ext}/$$dsoname.so \ + debian/php5-$$package$${ext}/$$dsoname.so; \ + rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \ + done + + # install CGI + cp cgi-build/sapi/cgi/cgi-bin.php5 debian/php5-cgi/usr/lib/cgi-bin/php5 + cp cgi-build/sapi/cgi/usr.bin.php5-cgi debian/php5-cgi/usr/bin/php5-cgi + cp cli-build/sapi/cli/php.1 debian/php5-cgi/usr/share/man/man1/php5-cgi.1 + + # install CLI + cp cli-build/sapi/cli/php debian/php5-cli/usr/bin/php5 + cp cli-build/sapi/cli/php.1 debian/php5-cli/usr/share/man/man1/php5.1 + + # install FPM + mkdir -p debian/php5-fpm/usr/sbin debian/php5-fpm/usr/share/man/man8/ debian/php5-fpm/etc/php5/fpm/pool.d + cp fpm-build/sapi/fpm/php-fpm debian/php5-fpm/usr/sbin/php5-fpm + cp fpm-build/sapi/fpm/php-fpm.8 debian/php5-fpm/usr/share/man/man8/php5-fpm.8 + # we don't want the pool definitions on the main file itself: + sed -r '/('"'"'|\[)www('"'"'|\])/Q' < fpm-build/sapi/fpm/php-fpm.conf > \ + debian/php5-fpm/etc/php5/fpm/php-fpm.conf + # extract the first pool, called "www," from the config file: + sed -nr '/('"'"'|\[)www('"'"'|\])/{h;p;d};x;/www/{x;p}' < fpm-build/sapi/fpm/php-fpm.conf \ + > debian/php5-fpm/etc/php5/fpm/pool.d/www.conf + + # move and install -dev files + dh_movefiles --sourcedir=debian/libapache2-mod-php5 + rm -rf debian/libapache2-mod-php5/usr/lib/php5/build/ \ + debian/libapache2-mod-php5/usr/include/ \ + debian/libapache2-mod-php5/usr/bin/ + rm -rf debian/libapache2-mod-php5filter/usr/lib/php5/build/ \ + debian/libapache2-mod-php5filter/usr/include/ \ + debian/libapache2-mod-php5filter/usr/bin/ + for i in Makefile.global acinclude.m4 mkdep.awk phpize.m4 scan_makefile_in.awk; do \ + chmod 644 debian/php5-dev/usr/lib/php5/build/$$i; \ + done + mkdir -p debian/php5-dev/usr/share/php5 + cp -a ext/skeleton ext/ext_skel debian/php5-dev/usr/share/php5 + sed -i 's/skel_dir="skeleton"/skel_dir="\/usr\/share\/php5\/skeleton"/' \ + debian/php5-dev/usr/share/php5/ext_skel + # shipping duplicate files from other packages is hell for security audits + ln -sf /usr/share/misc/config.guess $(PHPIZE_BUILDDIR)/config.guess + ln -sf /usr/share/misc/config.sub $(PHPIZE_BUILDDIR)/config.sub + ln -sf /usr/share/aclocal/libtool.m4 $(PHPIZE_BUILDDIR)/libtool.m4 + ln -sf $(LTMAIN_DIR)ltmain.sh $(PHPIZE_BUILDDIR)/ltmain.sh + ln -sf /usr/bin/shtool $(PHPIZE_BUILDDIR)/shtool + # make php-dev stuff versioned + for i in php-config phpize; do \ + mv debian/php5-dev/usr/bin/$$i debian/php5-dev/usr/bin/"$$i"5; \ + mv debian/php5-dev/usr/share/man/man1/"$$i".1 debian/php5-dev/usr/share/man/man1/"$$i"5.1; \ + done + # remove windows devel file + rm $(CURDIR)/debian/php5-dev/usr/share/php5/skeleton/skeleton.dsp + + # install common files + install -m755 debian/maxlifetime debian/php5-common/usr/lib/php5 + + # install lintian overrides + cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common + cp debian/php5-dev.lintian-overrides $(CURDIR)/debian/php5-dev/usr/share/lintian/overrides/php5-dev + cp debian/php-pear.lintian-overrides $(CURDIR)/debian/php-pear/usr/share/lintian/overrides/php-pear + + # install the apport hook + install -D -m 644 debian/source_php5.py debian/php5-common/usr/share/apport/package-hooks/source_php5.py + + # install some generic lintian overrides + ext=`debian/php5-dev/usr/bin/php-config5 --extension-dir | cut -b2- `; \ + for sapi in php5-cli php5-fpm php5-cgi libapache2-mod-php5 libapache2-mod-php5filter; do \ + mkdir -p $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/; \ + sed "s/@sapi@/$$sapi/g;s,@extdir@,$$ext,g" \ + < $(CURDIR)/debian/php5-sapi.lintian-overrides | \ + grep -E "^$${sapi}: " \ + >> $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \ + done + + # directories cleanup: + -rmdir -p debian/libapache2-mod-php5/usr/share/man/man1 + -find debian/php-pear -type d -exec rmdir --ignore-fail-on-non-empty -p '{}' \; >/dev/null 2>&1 + + touch install-stamp + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: DH_OPTIONS=-i +binary-indep: build install + # Need this version of debhelper for DH_OPTIONS to work. + dh_testdir + dh_testroot + cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright + + dh_installdocs + + for package in php5 php-pear; do \ + rm -rf debian/$$package/usr/share/doc/$$package; \ + ln -s php5-common debian/$$package/usr/share/doc/$$package; \ + done + + dh_link + dh_compress -Xphp.ini + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install + # Need this version of debhelper for DH_OPTIONS to work. + dh_testdir + dh_testroot + # Do this first so we don't overwrite any debhelper-generated files + # + # generate the maintscripts for various php + # modules from the templates. + cat debian/modulelist | while read package extname dsoname; do \ + if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \ + sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g; \ + /#EXTRA#/ r debian/php5-$${package}.postinst.extra" \ + < debian/php5-module.postinst \ + | sed -e'/#EXTRA#/ d' \ + > debian/php5-$${package}.postinst; \ + c=`grep -vE '^(#|set|$$)' < debian/php5-$${package}.postinst | wc -l`; \ + [ "$$c" != "0" ] || $(RM) debian/php5-$${package}.postinst; \ + done + + # generate the config snippets for various php + # modules from the templates. + cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \ + if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \ + mkdir -p debian/php5-$$package/etc/php5/conf.d; \ + sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \ + < debian/php5-module.ini \ + > debian/php5-$${package}/etc/php5/conf.d/$${dsoname}.ini; \ + done + + # likewise, for the different sapi implementations + for tmpl in postrm links; do \ + for sapi in cgi cli fpm; do \ + sed -e "s/@sapi@/$$sapi/g;s/@package@/php5-$${sapi}/g" \ + < debian/php5-sapi.$$tmpl \ + > debian/php5-$${sapi}.$$tmpl; \ + done; \ + done + for tmpl in postrm links; do \ + sed -e "s/@sapi@/apache2/g;s/@package@/libapache2-mod-php5/g" \ + < debian/php5-sapi.$$tmpl \ + > debian/libapache2-mod-php5.$$tmpl; \ + sed -e "s/@sapi@/apache2filter/g;s/@package@/libapache2-mod-php5filter/g" \ + < debian/php5-sapi.$$tmpl \ + > debian/libapache2-mod-php5filter.$$tmpl; \ + done + + sed -i -e 's/exit 0/dpkg-maintscript-helper mv_conffile \/etc\/php5\/fpm\/main.conf \/etc\/php5\/fpm\/php-fpm.conf 5.3.5-1 -- \"\$\@\"\n\nexit 0/' debian/php5-fpm.postrm + + cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright + dh_installdocs -s + + cat debian/modulelist | while read package extname dsoname; do \ + rm -rf debian/php5-$$package/usr/share/doc/php5-$$package; \ + ln -s php5-common debian/php5-$$package/usr/share/doc/php5-$$package; \ + done + + for package in php5-dbg php5-dev php5-cgi php5-cli php5-fpm libapache2-mod-php5 libapache2-mod-php5filter; do \ + rm -rf debian/$$package/usr/share/doc/$$package; \ + ln -s php5-common debian/$$package/usr/share/doc/$$package; \ + done + dh_installcron -pphp5-common --name=php5 + dh_installchangelogs -pphp5-common NEWS + dh_installinit + dh_strip -s --dbg-package=php5-dbg + dh_link -s + dh_compress -s -Xphp.ini + dh_fixperms -s -X /var/lib/php5 + dh_installdeb -s + dh_shlibdeps -s + + phpapi=`./debian/php5-dev/usr/bin/php-config5 --phpapi`; \ + for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli php5-fpm; do \ + echo "php:Provides=phpapi-$${phpapi}" >> debian/$$i.substvars; \ + done; \ + cat debian/modulelist | while read package extname dsoname; do \ + echo "php:Depends=phpapi-$${phpapi}" >> debian/php5-$$package.substvars; \ + done + + for i in cgi cli fpm; do \ + "$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \ + >> debian/php5-"$$i".substvars; \ + done + for i in apache2; do \ + "$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \ + >> debian/lib"$$i"-mod-php5.substvars; \ + "$$i"filter-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \ + >> debian/lib"$$i"-mod-php5filter.substvars; \ + done + + echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5.substvars + echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5filter.substvars + + echo "libtool:Conflicts=$(LIBTOOL_CONFLICTS)" >>debian/php5-dev.substvars + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install configure --- php5-5.3.6.orig/debian/php5-cli.postinst +++ php5-5.3.6/debian/php5-cli.postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +phpini="/etc/php5/cli/php.ini" + +ucf /usr/share/php5/php.ini-production.cli $phpini +ucfr php5-cli $phpini + +update-alternatives \ + --install /usr/bin/php php /usr/bin/php5 50 \ + --slave /usr/share/man/man1/php.1.gz php.1.gz /usr/share/man/man1/php5.1.gz + +exit 0 --- php5-5.3.6.orig/debian/php5-dev.prerm +++ php5-5.3.6/debian/php5-dev.prerm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +for i in php-config phpize; do + update-alternatives --remove $i /usr/bin/"$i"5 +done + +exit 0 --- php5-5.3.6.orig/debian/README.Debian.security +++ php5-5.3.6/debian/README.Debian.security @@ -0,0 +1,25 @@ +the Debian stable security team does not provide security support +for certain configurations known to be inherently insecure. This +includes the interpreter itself, extensions, and code written in the +PHP language. Most specifically, the security team will not provide +support for flaws in: + +- problems which are not flaws in the design of php but can be problematic + when used by sloppy developers (for example: not checking the contents + of a tar file before extracting it, using unserialize() on + untrusted data, or relying on a specific value of short_open_tag). + +- vulnerabilities involving register_globals being activated, unless + specifically the vulnerability activates this setting when it was + configured as deactivated. + +- vulnerabilities involving any kind of safe_mode or open_basedir + violation, as these are security models flawed by design and no longer + have upstream support either. + +- any "works as expected" vulnerabilities, such as "user can cause php + to crash by writing a malcious php script", unless such vulnerabilities + involve some kind of higher-level DoS or privilege escalation that would + not otherwise be available. + + -- sean finney Tue, 10 Oct 2006 12:42:06 +0200 --- php5-5.3.6.orig/debian/php5-cgi.dirs +++ php5-5.3.6/debian/php5-cgi.dirs @@ -0,0 +1,4 @@ +/etc/php5/cgi +/usr/lib/cgi-bin +/usr/bin +/usr/share/man/man1 --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.load +++ php5-5.3.6/debian/libapache2-mod-php5filter.load @@ -0,0 +1 @@ +LoadModule php5_module /usr/lib/apache2/modules/libphp5filter.so --- php5-5.3.6.orig/debian/libapache2-mod-php5.triggers +++ php5-5.3.6/debian/libapache2-mod-php5.triggers @@ -0,0 +1 @@ +interest /etc/php5/conf.d --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.postinst +++ php5-5.3.6/debian/libapache2-mod-php5filter.postinst @@ -0,0 +1,48 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +reload_apache() +{ + if apache2ctl configtest 2>/dev/null; then + invoke-rc.d apache2 force-reload || true + else + echo "Your apache2 configuration is broken, so we're not restarting it for you." + fi +} + +# we've registered a trigger to handle extension updates. +if [ "$1" = "triggered" ] && [ "$2" = "/etc/php5/conf.d" ]; then + reload_apache + exit 0 +elif [ "$1" != "configure" ]; then + exit 0 +fi + +phpini="/etc/php5/apache2filter/php.ini" + +ucf /usr/share/php5/php.ini-production $phpini +ucfr libapache2-mod-php5filter $phpini + +if [ -n "$2" ]; then + # recover the previous state + if [ -e /etc/php5/apache2filter/.start ]; then + a2enmod php5filter >/dev/null || true + fi +# we're upgrading. test if we're enabled, and if so, restart to reload the module. + if [ -e /etc/apache2/mods-enabled/php5filter.load ]; then + reload_apache + fi + exit 0 +fi + +if [ -e /etc/apache2/apache2.conf ]; then +# Enable the module, but hide a2enmod's misleading message about apachectl +# and force-reload the thing ourselves. + a2enmod php5filter >/dev/null || true + reload_apache +fi + +exit 0 --- php5-5.3.6.orig/debian/php5-cli.prerm +++ php5-5.3.6/debian/php5-cli.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then + update-alternatives --remove php /usr/bin/php5 +fi + +exit 0 --- php5-5.3.6.orig/debian/php5-cli.dirs +++ php5-5.3.6/debian/php5-cli.dirs @@ -0,0 +1,3 @@ +/etc/php5/cli +/usr/bin +/usr/share/man/man1 --- php5-5.3.6.orig/debian/maxlifetime +++ php5-5.3.6/debian/maxlifetime @@ -0,0 +1,19 @@ +#!/bin/sh -e + +max=1440 + +if which php5 >/dev/null 2>&1 && [ -e /etc/php5/apache2/php.ini ]; then + cur=$(php5 -c /etc/php5/apache2/php.ini -d "error_reporting='E_ALL & ~E_DEPRECATED'" -r 'print ini_get("session.gc_maxlifetime");') + [ -z "$cur" ] && cur=0 + [ "$cur" -gt "$max" ] && max=$cur +else + for ini in /etc/php5/*/php.ini; do + cur=$(sed -n -e 's/^[[:space:]]*session.gc_maxlifetime[[:space:]]*=[[:space:]]*\([0-9]\+\).*$/\1/p' $ini 2>/dev/null || true); + [ -z "$cur" ] && cur=0 + [ "$cur" -gt "$max" ] && max=$cur + done +fi + +echo $(($max/60)) + +exit 0 --- php5-5.3.6.orig/debian/README.source +++ php5-5.3.6/debian/README.source @@ -0,0 +1,53 @@ + == Generation of the php5-dbg package Depends == + +The following command can be used to generate a heuristic list of +packages the php5-dbg package probably needs to Depend on: + +dh_testdir && egrep '^Package' debian/control | cut '-d ' -f2 | \ + egrep -v '(^php5|dbg|dev|common|pear)$' | tr "\n" "|" | sed 's/|$//' |\ + sed -r 's/([^|]+)(\||$)/ \1 (= ${binary:Version}) \2/g'; echo + + == Used patch system == + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + + == Making some sense out of the configure options == + +The COMMON_CONFIG variable contains the configure options that are to +be used on all the SAPIs. Built-in extensions and other general options +should be set here. +The shared extensions are built when building the apache2 SAPI and as +such they need to be specified there. +The calls to configure for the other SAPIs usually only need +--without-foo when the extension or feature is otherwise enabled by +default. + + == The *modulelist files == + +When building a new module (or extension) on an individual binary +package, it must be added to the debian/modulelist file. However, if +the extension is to be included in an existing binary package, it +must be added to the debian/extramodulelist file. + +The format of these files is: +" " + +E.g. for, if we want the mysql extension to be shipped in the +php5-mysql package we use: +"mysql MySQL mysql" +But we also want mysqli and the PDO in the same package, so we add the +following lines to extramoduleslist: +"mysql MySQLi mysqli +mysql MySQL_PDO pdo_mysql" + + == More debian/rules foo == + +* The shared extensions are built under the apache2 target (see above). +* The CLI SAPI is built on the build-cli-stamp AND build-cgi-stamp, with + different configure options. + + -- Ondřej Surý , Wed, 16 Feb 2011 15:24:44 +0100 --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.triggers +++ php5-5.3.6/debian/libapache2-mod-php5filter.triggers @@ -0,0 +1 @@ +interest /etc/php5/conf.d --- php5-5.3.6.orig/debian/php5.lintian-overrides +++ php5-5.3.6/debian/php5.lintian-overrides @@ -0,0 +1,3 @@ +php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755 +php5-common: package-contains-empty-directory usr/lib/php5/libexec/ +php5-common: missing-dependency-on-phpapi --- php5-5.3.6.orig/debian/libapache2-mod-php5.load +++ php5-5.3.6/debian/libapache2-mod-php5.load @@ -0,0 +1 @@ +LoadModule php5_module /usr/lib/apache2/modules/libphp5.so --- php5-5.3.6.orig/debian/changelog +++ php5-5.3.6/debian/changelog @@ -0,0 +1,4120 @@ +php5 (5.3.6-13ubuntu3.5) oneiric-security; urgency=low + + * SECURITY UPDATE: memory allocation failure denial of service + - debian/patches/php5-CVE-2011-4153.patch: check result of + zend_strdup() and calloc() for failed allocations + - CVE-2011-4153 + * SECURITY UPDATE: predictable hash collision denial of service + (LP: #910296) + - debian/patches/php5-CVE-2011-4885.patch: add max_input_vars + directive with default limit of 1000 + - ATTENTION: this update changes previous php5 behavior by + limiting the number of external input variables to 1000. + This may be increased by adding a "max_input_vars" + directive to the php.ini configuration file. See + http://www.php.net/manual/en/info.configuration.php#ini.max-input-vars + for more information. + - CVE-2011-4885 + * SECURITY UPDATE: remote code execution vulnerability introduced by + the fix for CVE-2011-4885 (LP: #925772) + - debian/patches/php5-CVE-2012-0830.patch: return rather than + continuing if max_input_vars limit is reached + - CVE-2012-0830 + * SECURITY UPDATE: XSLT arbitrary file overwrite attack + - debian/patches/php5-CVE-2012-0057.patch: add xsl.security_prefs + ini option to define forbidden operations within XSLT stylesheets + - CVE-2012-0057 + * SECURITY UPDATE: PDORow session denial of service + - debian/patches/php5-CVE-2012-0788.patch: fail gracefully when + attempting to serialize PDORow instances + - CVE-2012-0788 + * SECURITY UPDATE: magic_quotes_gpc remote disable vulnerability + - debian/patches/php5-CVE-2012-0831.patch: always restore + magic_quote_gpc on request shutdown + - CVE-2012-0831 + + -- Steve Beattie Wed, 08 Feb 2012 20:56:28 -0800 + +php5 (5.3.6-13ubuntu3.3) oneiric-security; urgency=low + + * SECURITY UPDATE: Denial of service and possible information disclosure + via exif integer overflow + - debian/patches/php5-CVE-2011-4566.patch: fix count checks in + ext/exif/exif.c. + - CVE-2011-4566 + + -- Marc Deslauriers Mon, 12 Dec 2011 15:18:34 -0500 + +php5 (5.3.6-13ubuntu3.2) oneiric-security; urgency=low + + * SECURITY UPDATE: DoS in zip handling due to addGlob() crashing + on invalid flags + - debian/patches/php5-CVE-2011-1657.patch: check for valid flags + - CVE-2011-1657 + * SECURITY UPDATE: DoS due to failure to check for memory allocation errors + - debian/patches/php5-CVE-2011-3182.patch: check the return values + of the malloc, calloc, and realloc functions + - CVE-2011-3182 + * SECURITY UPDATE: DoS in errorlog() when passed NULL + - debian/patches/php5-CVE-2011-3267.patch: fix NULL pointer crash in + errorlog() + - CVE-2011-3267 + * debian/control: enforce timestamp difference large enough for make + to detect before editing configure.in, so that aclocal.m4 will be + regenerated. + * debian/patches/php5-CVE-2011-1938_fix.patch: fix the fix for + CVE-2011-1938 to remove the extra argument. + + -- Steve Beattie Thu, 13 Oct 2011 13:42:19 -0700 + +php5 (5.3.6-13ubuntu3.1) oneiric; urgency=low + + * Test + + -- Matthias Klose Thu, 25 Aug 2011 22:21:30 +0000 + +php5 (5.3.6-13ubuntu3) oneiric; urgency=low + + * debian/rules: export DEB_HOST_MULTIARCH properly, so that I don't spend + an hour scratching my head at './debian/rules configure' not working + right. + * Only build php5-sqlite for sqlite3, dropping the obsolete sqlite2. + * Add build-dependency on lemon, which we now need. + + -- Steve Langasek Wed, 24 Aug 2011 21:40:27 +0000 + +php5 (5.3.6-13ubuntu2) oneiric; urgency=low + + * debian/rules: build with --with-openssl instead of --with-openssl=/usr, + to autodetect libraries in multiarch directories. + * debian/patches/temporary-path-fixes-for-multiarch.patch: add ldap + multiarch checks. LP: #826601. + + -- Steve Langasek Tue, 16 Aug 2011 06:14:55 +0000 + +php5 (5.3.6-13ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libcurl-dev not in the archive. + * debian/control: replace build-depends on mysql-server with + mysql-server-core-5.1 and mysql-client-5.1 to avoid upstart and + mysql-server-5.1 postinst confusion with starting up multiple + mysqlds listening on the same port. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions + already in universe. + * Suggest php5-suhosin rather than recommends. + * Dropped libonig-dev and libqgdbm since its in universe. (libonig MIR + has been declined due to an inactive upstream. So this is probably + a permanent change). + * modulelist: Drop imap, interbase, sybase, and mcrypt. + * debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + * stop mysql instance on clean just in case we failed in tests + * debian/control: Recommend php5-dev for php-pear. + * debian/rules: --enable-pcntl for cgi as well. + * debian/patches/temporary-path-fixes-for-multiarch.patch: as a stopgap + for natty, patch the various config.m4 files for modules whose + libraries have moved to the multiarch dir; we can't use --with-libdir + yet because that requires all the build-deps to have moved. Thanks to + Jonathan Marsden for preparing this patch. + * debian/patches/fpm-config.patch: Update php-fpm.conf(pool.d/con) + to do initial chdir to / as suggest by Olaf van van der Spek + to detect early problems if php5-fpm needs a write access to + initial chdir. + * SECURITY UPDATE: use-after-free vulnerability + - debian/patches/php5-CVE-2011-1148.patch: improve reference + counting + - CVE-2011-1148 + * debian/rules: set DEB_HOST_MULTIARCH to enable 'debian/rules' for + building. + + -- Chuck Short Mon, 25 Jul 2011 19:14:12 +0100 + +php5 (5.3.6-13) unstable; urgency=low + + * Fix CVE-2011-2483: 8-bit character mishandling allows different + password pairs to produce the same hash (Closes: #631347) + * Add support for $2x$ identifier as blowfish variant in crypt.c to + allow backward compatibility with old invalid hashes + * Return fail string (*0) on invalid Blowfish salt rounds + * Add NEWS item about incompatible blowfish hashes + * Fix CVE-2011-1938: Stack-based buffer overflow in the socket_connect + function in ext/sockets/sockets.c in PHP 5.3.3 through 5.3.6 might + allow context-dependent attackers to execute arbitrary code via a + long pathname for a UNIX socket. + + -- Ondřej Surý Mon, 04 Jul 2011 12:41:07 +0200 + +php5 (5.3.6-12) unstable; urgency=low + + * Bump standards version to 3.9.2 + * Update cron.d code to even safer variant (Courtesy of Bob Proulx) + * Small optimization in cron.d script (Courtesy of Marcus Cobden) + * Add firebird2.1-dev option to allow backports + * Pull (and fix broken patch) multiarch workaround from obuntu nattybuntu natty + Add error message when phpeze is not found (Closes: #627937) + * Enable pcntl extension for CGI builds (Closes: #627941), but + disable all pcntl functions by default + * File path injection vulnerability in RFC1867 File upload filename + [CVE-2011-2202] + + -- Ondřej Surý Wed, 15 Jun 2011 11:06:40 +0200 + +php5 (5.3.6-11ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libcurl-dev not in the archive. + * debian/control: replace build-depends on mysql-server with + mysql-server-core-5.1 and mysql-client-5.1 to avoid upstart and + mysql-server-5.1 postinst confusion with starting up multiple + mysqlds listening on the same port. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions + already in universe. + * Suggest php5-suhosin rather than recommends. + * Dropped libonig-dev and libqgdbm since its in universe. (libonig MIR + has been declined due to an inactive upstream. So this is probably + a permanent change). + * modulelist: Drop imap, interbase, sybase, and mcrypt. + * debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + * stop mysql instance on clean just in case we failed in tests + * debian/control: Recommend php5-dev for php-pear. + * debian/rules: --enable-pcntl for cgi as well. + * debian/patches/temporary-path-fixes-for-multiarch.patch: as a stopgap + for natty, patch the various config.m4 files for modules whose + libraries have moved to the multiarch dir; we can't use --with-libdir + yet because that requires all the build-deps to have moved. Thanks to + Jonathan Marsden for preparing this patch. + * debian/patches/fpm-config.patch: Update php-fpm.conf(pool.d/con) + to do initial chdir to / as suggest by Olaf van van der Spek + to detect early problems if php5-fpm needs a write access to + initial chdir. + * SECURITY UPDATE: use-after-free vulnerability + - debian/patches/php5-CVE-2011-1148.patch: improve reference + counting + - CVE-2011-1148 + * debian/rules: set DEB_HOST_MULTIARCH to enable 'debian/rules' for + building. + * Dropped Changes: + * Dropped libmysqlclient15-dev, build against mysql 5.1. -- Dropped in debian. + * Dropped locales-all. -- Now has alternative language-pack-de for use in tests. + * debian/php5-fpm.init: backport changes from Debian package to run + configuration check. Removes check for /var/www which broke stand- + alone installation of php5-fpm. -- superseded upstream + * All CVE's not mentioned above (applied upstream or in Debian) + * debian/patches/configure-as-needed.patch. Work around suspicious + configure macros to fix a build failure with --as-needed + * debian/patches/backport-upstream-lp592442.patch: Backport upstream fix + for ssl fopen issues. -- applied in Debian + * debian/patches/lp564920-fix-big-files.patch: Fix downloading of large + files -- applied in Debian + + -- Clint Byrum Wed, 25 May 2011 10:34:40 -0700 + +php5 (5.3.6-11) unstable; urgency=low + + * Use more reasonable default number of processes for PHP5-FPM + * Enable firebird support everywhere also in debian/rules + * Don't delete still used session files (Closes: #626640) + * Enable building of php5-interbase by adding Architecture: any + to debian/control + * Use dh_prep instead of dh_clean -k + + -- Ondřej Surý Sat, 14 May 2011 22:15:32 +0200 + +php5 (5.3.6-10) unstable; urgency=low + + * Purge .start files in postrm, not in prerm (Closes: #607520) + * Register config files to UCF Registry + + -- Ondřej Surý Sat, 30 Apr 2011 13:16:27 +0200 + +php5 (5.3.6-9) unstable; urgency=low + + * Make sure even harded to not left any stale file after purging the + package (Closes: #607520) + * Move libapache2-mod-php5filter to extra to satisfy policy + * Remove oldstable dependcy on firebird2.0-dev + * Enable php5-interbase on all platforms and update build dependency + on firebird2.5-dev + * Import backported upstream fix for fopen fails on some SSL urls + * Remove windows devel file from php5-dev + * Add more lintian-overrides: + + Missing dependency on phpapi for php5-common is not missing + + php-pear is keeping it's original directory structure + + Double the filenames (./usr vs usr) to fix difference between + lintian versions + + the embedded file library (libmagic) is unfortunately a custom + one and cannot be replaced by system one (it's on the TODO list) + + -- Ondřej Surý Thu, 28 Apr 2011 13:37:07 +0200 + +php5 (5.3.6-8) unstable; urgency=low + + * Provides/Replaces/Conflicts: php5-idn (Closes: #547117) + * Build depend on libdb-dev (>= 5.1) (Closes: #621443) + + -- Ondřej Surý Sun, 10 Apr 2011 23:27:44 +0200 + +php5 (5.3.6-7) unstable; urgency=low + + * Disable SSLv2 when disabled in OpenSSL (Closes: #620776) + + -- Ondřej Surý Mon, 04 Apr 2011 08:40:25 +0200 + +php5 (5.3.6-6) unstable; urgency=low + + * Fix order of do_check in php5-fpm.init to check for the right return + code + + -- Ondřej Surý Thu, 31 Mar 2011 11:46:49 +0200 + +php5 (5.3.6-5) unstable; urgency=low + + * Don't fail the php5-fpm init.d script if VERBOSE is `no' + * Fix some compile errors with --enable-maintainer-zts as reported by + Raphaël Gertz + * Make php5-fpm init.d script even less verbose on startup + + -- Ondřej Surý Mon, 28 Mar 2011 17:05:17 +0200 + +php5 (5.3.6-4) unstable; urgency=low + + * Merged r308688 fix s/raiseErro/raiseError/ and fixed parenthese in + r309043 (Closes: #619307) (Courtesy of upstream and Ernesto Domato) + * Make locales-all build dependency useful by fixing language tests + to use de_DE.UTF-8 + * Debian packaging: + + Allow easy porting to Ubuntu by adding alternate dependency for + locales-all -> language-pack-de, because only german locale is used + in the tests + + Fix missing debhelper token in php5-fpm.preinst + * Explicitly set pm.start_servers in php5-fpm to make it quiet + * Update php5-fpm.init according to latest /etc/init.d/skeleton + (Closes: #619383) + + -- Ondřej Surý Wed, 23 Mar 2011 16:44:28 +0100 + +php5 (5.3.6-3) unstable; urgency=low + + * Update php-fpm.conf(pool.d/www.conf) to do initial chdir to / as + suggested by Olaf van der Spek to detect early problems if php5-fpm + needs a write access to initial chdir. Also fix brown-paper-bug + which made the setting new chdir not work because we already modify + it elsewhere (Closes: #601243) + + -- Ondřej Surý Mon, 21 Mar 2011 16:27:01 +0100 + +php5 (5.3.6-2) unstable; urgency=low + + * Update default configuration file for php5-fpm (Closes: #619104) + * Depend only on libdb4.8-dev | libdb4.6-dev to match apache2 + (Closes: #619036) + + Will coordinate change to db5.1 with apache2 maintainer + + -- Ondřej Surý Mon, 21 Mar 2011 11:54:04 +0100 + +php5 (5.3.6-1) unstable; urgency=low + + * Imported Upstream version 5.3.6 + + PEAR updated to 1.9.2 (CVE-2011-1072) + * Cherry-pick CVE-2011-1144 from PEAR 1.9.3 (Closes: #546164) + * Debian packaging: + + Start using pristine-tar + + Remove patches merged upstream or otherwise deprecated + + Move php5-fpm.postrm extras to debian/rules + * FPM SAPI changes: + + Set initial chdir to /tmp in www pool (Closes: #601243) + + Rename main configuration file to php-fpm.conf to match upstream + + Enable error reporting in init.d file + + Patch FPM SAPI to use Debian php-fpm.conf as default + * Fix regression with missing CRYPT_SALT_LENGTH (Closes: #603012) + * Generate SHA512 salt string when provided salt is null (Closes: #581170) + * Fix FTBFS with gold or ld --no-add-needed (Closes: #615770) + * Don't mmap large >4GB files + * CVE-2011-0441: Be more careful when removing session files + (Closes: #618489) + + -- Ondřej Surý Fri, 18 Mar 2011 15:51:50 +0100 + +php5 (5.3.5-1ubuntu7.2) natty-security; urgency=low + + * debian/patches/php5-pear-CVE-2011-1144-regression.patch: fix + mkdir parenthesis issue and PEAR::raiseErro typo (LP: #774452) + + -- Steve Beattie Sat, 30 Apr 2011 16:00:39 -0700 + +php5 (5.3.5-1ubuntu7.1) natty-security; urgency=low + + * SECURITY UPDATE: arbitrary files removal via cronjob + - debian/php5-common.php5.cron.d: take greater care when removing + session files. + - http://git.debian.org/?p=pkg-php%2Fphp.git;a=commitdiff_plain;h=d09fd04ed7bfcf7f008360c6a42025108925df09 + - CVE-2011-0441 + * SECURITY UPDATE: symlink tmp races in pear install + - debian/patches/php5-pear-CVE-2011-1072.patch: improved + tempfile handling. + - debian/rules: apply patch manually after unpacking PEAR phar + archive. + - CVE-2011-1072 + * SECURITY UPDATE: more symlink races in pear install + - debian/patches/php5-pear-CVE-2011-1144.patch: add TOCTOU save + file handler. + - debian/rules: apply patch manually after unpacking PEAR phar + archive. + - CVE-2011-1144 + * SECURITY UPDATE: denial of service through application crash with + invalid images + - debian/patches/php5-CVE-2010-4698.patch: verify anti-aliasing + steps are either 4 or 16. + - CVE-2010-4698 + * SECURITY UPDATE: denial of service through application crash + - debian/patches/php5-CVE-2011-0420.patch: improve grapheme_extract() + argument validation. + - CVE-2011-0420 + * SECURITY UPDATE: denial of service through application crash + - debian/patches/php5-CVE-2011-0421.patch: fail operation gracefully + when handling zero sized zipfile with the FL_UNCHANGED argument + - CVE-2011-0421 + * SECURITY UPDATE: denial of service through application crash when + handling images with invalid exif tags + - debian/patches/php5-CVE-2011-0708.patch: stricter exif checking + - CVE-2011-0708 + * SECURITY UPDATE: denial of service and possible data disclosure + through integer overflow + - debian/patches/php5-CVE-2011-1092.patch: better boundary + condition checks in shmop_read() + - CVE-2011-1092 + * SECURITY UPDATE: use-after-free vulnerability + - debian/patches/php5-CVE-2011-1148.patch: improve reference + counting + - CVE-2011-1148 + * SECURITY UPDATE: format string vulnerability + - debian/patches/php5-CVE-2011-1153.patch: correctly quote format + strings + - CVE-2011-1153 + * SECURITY UPDATE: denial of service through buffer overflow crash + (code execution mitigated by compilation with Fortify Source) + - debian/patches/php5-CVE-2011-1464.patch: limit amount of precision + to ensure fitting within MAX_BUF_SIZE + - CVE-2011-1464 + * SECURITY UPDATE: denial of service through application crash + - debian/patches/php5-CVE-2011-1467.patch: check for invalid + attribute symbols in NumberFormatter::setSymbol() + - CVE-2011-1467 + * SECURITY UPDATE: denial of service through memory leak + - debian/patches/php5-CVE-2011-1468.patch: fix memory leak of + openssl contexts + - CVE-2011-1468 + * SECURITY UPDATE: denial of service through application crash + when using HTTP proxy with the FTP wrapper + - debian/patches/php5-CVE-2011-1469.patch: improve pointer handling + - CVE-2011-1469 + * SECURITY UPDATE: denial of service through application crash when + handling ziparchive streams + - debian/patches/php5-CVE-2011-1470.patch: set necessary elements of + the meta data structure + - CVE-2011-1470 + * SECURITY UPDATE: denial of service through application crash when + handling malformed zip files + - debian/patches/php5-CVE-2011-1471.patch: correct integer + signedness error when handling zip_fread() return value. + - CVE-2011-1471 + * debian/control: replace build-depends on mysql-server with + mysql-server-core-5.1 and mysql-client-5.1 to avoid upstart and + mysql-server-5.1 postinst confusion with starting up multiple + mysqlds listening on the same port. + + -- Steve Beattie Tue, 26 Apr 2011 08:34:26 -0700 + +php5 (5.3.5-1ubuntu7) natty; urgency=low + + * debian/php5-fpm.init: backport changes from Debian package to run + configuration check. Removes check for /var/www which broke stand- + alone installation of php5-fpm. (LP: #753924) + * debian/rules: set DEB_HOST_MULTIARCH to enable 'debian/rules' for + building. + + -- Clint Byrum Tue, 12 Apr 2011 14:21:14 -0700 + +php5 (5.3.5-1ubuntu6) natty; urgency=low + + * debian/patches/fpm-config.patch: Update php-fpm.conf(pool.d/con) + to do initial chdir to / as suggest by Olaf van van der Spek + to detect early problems if php5-fpm needs a write access to + initial chdir. + * debian/patches/backport-upstream-lp592442.patch: Backport upstream fix + for ssl fopen issues. (LP: #592442) + + -- Chuck Short Fri, 01 Apr 2011 09:29:49 -0400 + +php5 (5.3.5-1ubuntu5) natty; urgency=low + + * debian/patches/temporary-path-fixes-for-multiarch.patch: as a stopgap + for natty, patch the various config.m4 files for modules whose + libraries have moved to the multiarch dir; we can't use --with-libdir + yet because that requires all the build-deps to have moved. Thanks to + Jonathan Marsden for preparing this patch. LP: #739977. + * debian/patches/ubuntu/ubuntu-php-version.patch: drop. This is an + autogenerated file. + + -- Steve Langasek Thu, 24 Mar 2011 22:34:00 +0000 + +php5 (5.3.5-1ubuntu4) natty; urgency=low + + * debian/control: Recommend php5-dev for php-pear. (LP: #634359) + * debian/rules: --enable-pcntl for cgi as well. (LP: #658346) + + -- Chuck Short Mon, 14 Mar 2011 10:34:00 -0400 + +php5 (5.3.5-1ubuntu3) natty; urgency=low + + * debian/php5-fpm.init: Fix logic from previous commit. + + -- Chuck Short Mon, 14 Mar 2011 08:18:17 -0400 + +php5 (5.3.5-1ubuntu2) natty; urgency=low + + * debian/php5-fpm.init: Dont start fpm if /var/www doesnt exist. + (LP: #731572) + + -- Chuck Short Fri, 11 Mar 2011 16:29:24 -0500 + +php5 (5.3.5-1ubuntu1) natty; urgency=low + + * Merge from debian/unstable. Remaining changes: + - debian/control: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libmysqlclient15-dev, build against mysql 5.1. + * Dropped libcurl-dev not in the archive. + * Suggest php5-suhosin rather than recommends. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions + already in universe. + * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1) + - modulelist: Drop imap, interbase, sybase, and mcrypt. + - debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + * stop mysql instance on clean just in case we failed in tests + + -- Chuck Short Tue, 22 Feb 2011 09:46:37 -0500 + +php5 (5.3.5-1) unstable; urgency=low + + * Imported Upstream version 5.3.5 + * Updated suhosin patch to 0.9.10 + * Add Conflict: with php5-idn to php5-intl (Closes: #610935) + * Build the FPM SAPI (Closes: #603174) + * Adapted (and removed upstream-applied) patches to php 5.3.5 + + -- Ondřej Surý Wed, 16 Feb 2011 15:17:32 +0100 + +php5 (5.3.3-7ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libmysqlclient15-dev, build against mysql 5.1. + * Dropped libcurl-dev not in the archive. + * Suggest php5-suhosin rather than recommends. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions + already in universe. + * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1) + * Dropped locales-all. + - modulelist: Drop imap, interbase, sybase, and mcrypt. + - debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + * stop mysql instance on clean just in case we failed in tests + - Dropped debian/patches/fix-upstream-bug53632.patch, used debian's instead. + - Dropped debian/patches/mssql-fix-segfault.patch, use debian's instead. + - debian/patches/configure-as-needed.patch. Work around suspicious + configure macros to fix a build failure with --as-needed + - debian/patches/php52389-pgsql-segfault.patch: removing, causes error + handling to fail. + + -- Chuck Short Fri, 07 Jan 2011 22:44:56 +0000 + +php5 (5.3.3-7) unstable; urgency=low + + * Cherry pick patches for: + + double free vulnerability in the imap_do_open function in the IMAP + extension (CVE-2010-4150) + + infinite loop with x87 CPU + + extract() to not overwrite $GLOBALS and $this when using + EXTR_OVERWRITE + + crash if aa steps are invalid in GD extension + + crash with entitity declaration in simplexml.c + + NULL dereference in Zend language scanner + + integer overflow in SdnToJulian + + memory leaks and possible crash introduced by NULL poisoning patch + + leaks and crash when passing the callback as a variable + + leak in highlight_string + + segmentation fault in pgsql_stmt_execute when postgres is down + + segmentation fault when extending SplFixedArray + + segmentation fault when node is NULL in simplexml.c + + segmentation fault when using several cloned intl objects + + segmentation fault when using bad column_number in sqlite3 columnName + * Add comment about cherry picked patches (and last revision) from + upstream SVN to README.source + + -- Ondřej Surý Wed, 05 Jan 2011 11:06:20 +0100 + +php5 (5.3.3-6) unstable; urgency=medium + + * Cherry-pick fix for crashes on invalid parameters in intl extension. + (CVE-2010-4409). + * Cherry pick fix for crash in zip extract method (possible CWE-170) + * Cherry pick fix for unaligned memory access in ext/hash/hash_tiger.c + * Update CVE-2010-3870 to include test case + * Cherry pick complete fix to reject filenames with NULL (CVE requested) + + -- Ondřej Surý Tue, 07 Dec 2010 11:15:58 +0100 + +php5 (5.3.3-5) unstable; urgency=high + + * Add firebird support for armhf (Closes: #604526) + * More updates to open_basedir (Closes: #605391) + + -- Ondřej Surý Tue, 30 Nov 2010 12:00:37 +0100 + +php5 (5.3.3-4) unstable; urgency=low + + * Cherry pick patches for (Closes: #603751): + + NULL pointer dereference in ZipArchive::getArchiveComment + (CVE-2010-3709) + + utf8_decode xml_utf8_decode vulnerability (CVE-2010-3870) + + mb_strcut() returns garbage with the excessive length parameter + (CVE-2010-4156) + + possible flaw in open_basedir (CVE-2010-3436) + + segfault in SplFileObject::fscanf + + memory leak in PDO::FETCH_INTO + + crash when storing many SPLFixedArray in an array + + possible crash in php_mssql_get_column_content_without_type() + + cURL leaks handle and causes assertion error (CURLOPT_STDERR) + + segfault when optional parameters are not passed in to mssql_connect + + segfault when ssl stream option capture_peer_cert_chain used + + crash in GC because of incorrect reference counting + + crash when calling enchant_broker_get_dict_path before set_path + + crash in pdo_firebird getAttribute() + + -- Ondřej Surý Wed, 17 Nov 2010 10:31:58 +0100 + +php5 (5.3.3-3) unstable; urgency=high + + * Fix segfault in filter_var with FILTER_VALIDATE_EMAIL with large + amount of data (CVE-2010-3710, Closes: #601619) + + -- Ondřej Surý Wed, 27 Oct 2010 23:39:37 +0200 + +php5 (5.3.3-2) unstable; urgency=low + + * Upload 5.3.3 to unstable + + Fixes CVE-2010-2225, CVE-2010-2094, CVE-2010-1917, CVE-2010-1866, + CVE-2010-2531, CVE-2010-3065. + * Don't build FPM SAPI now + * Bump standards version to 3.9.1 + * Synchronize system crypt patch + * Cherry pick upstream fix for format vulnerability in phar/stream.c + + Fixes CVE-2010-2950. + * Set explicit error level to hide warnings on systems with modified + php.ini (Closes: #590485) + * Apply patch to fix loading of extensions without [PHP] section + (Closes: #595761) + * Set session.gc_probability back to 0 (Closes: #595706) + * Update PHP5 description to not include references to C, Java and + Perl (Closes: #351032) + + -- Ondřej Surý Thu, 21 Oct 2010 16:57:53 +0200 + +php5 (5.3.3-1ubuntu12) natty; urgency=low + + * debian/patches/fix-upstream-bug53632.patch: Fix infinite loop bug (php bug #53632) + (LP: #697181) + + -- Chuck Short Fri, 07 Jan 2011 12:57:59 -0500 + +php5 (5.3.3-1ubuntu11) natty; urgency=low + + * Add debian/patches/mssql-fix-segfault.patch: Fixes segfault on missing + parameters for mssql. Upstream php bug #52843 and LP: #611316. + + -- Clint Byrum Fri, 03 Dec 2010 23:45:19 -0800 + +php5 (5.3.3-1ubuntu10) natty; urgency=low + + * debian/patches/configure-as-needed.patch. Work around suspicious + configure macros to fix a build failure with --as-needed (Clint Byrum). + Addresses #676672. + + -- Matthias Klose Wed, 24 Nov 2010 10:44:36 +0100 + +php5 (5.3.3-1ubuntu9.1) maverick-proposed; urgency=low + + * debian/patches/php52389-pgsql-segfault.patch: removing, + causes error handling to fail (LP: #660227) + + -- Clint Byrum Thu, 14 Oct 2010 06:46:02 -0700 + +php5 (5.3.3-1ubuntu9) maverick; urgency=low + + * SECURITY UPDATE: arbitrary memory disclosure and possible code + execution via phar extension + - debian/patches/CVE-2010-2950.patch: use correct format string in + ext/phar/stream.c. + - CVE-2010-2094 + - CVE-2010-2950 + + -- Marc Deslauriers Mon, 20 Sep 2010 14:56:33 -0400 + +php5 (5.3.3-1ubuntu8) maverick; urgency=low + + * Build-depend on netcat-openbsd | netcat, instead of just netcat (only + in universe). + + -- Matthias Klose Fri, 17 Sep 2010 14:33:13 +0200 + +php5 (5.3.3-1ubuntu7) maverick; urgency=low + + * debian/setup-mysql.sh: Copy mysqld to local dir during build to avoid + apparmor restrictions (LP: #638401) + * debian/rules: stop mysql instance on clean just in case we failed in tests + + -- Clint Byrum Wed, 15 Sep 2010 10:48:32 -0700 + +php5 (5.3.3-1ubuntu6) maverick; urgency=low + + * Undo sybase debugging libraries split: keeping a smaller delta with Debian + is more important than demoting sybase to universe. + + -- Mathias Gug Wed, 25 Aug 2010 14:04:57 -0400 + +php5 (5.3.3-1ubuntu5) maverick; urgency=low + + * Drop sybase libraries to universe: + Move debugging libraries to php5-sybase-dbg: + - debian/control: + + create php5-sybase-dbg package. + + drop php5-sybase as php5-dbg dependency. + - debian/rules: move sybase debugging libraries to php5-sybase-dbg. + + -- Mathias Gug Fri, 20 Aug 2010 19:13:55 -0400 + +php5 (5.3.3-1ubuntu4) maverick; urgency=low + + * debian/php5-module.ini: # replaced with ; (LP: #591286) + * debian/patches/php52389-pgsql-segfault.patch (LP: #607646) + - Applying patch for upstream bug that causes segfaults in pgsql + + -- Clint Byrum Fri, 13 Aug 2010 00:07:15 -0700 + +php5 (5.3.3-1ubuntu3) maverick; urgency=low + + * debian/patches/lp564920-fix-big-files.patch: Fix downloading of large + files (LP: #564920) + + -- Clint Byrum Fri, 06 Aug 2010 13:10:17 -0700 + +php5 (5.3.3-1ubuntu2) maverick; urgency=low + + * debian/control: Use netcat rather than netcat-traditional. + + -- Chuck Short Thu, 05 Aug 2010 20:00:34 -0500 + +php5 (5.3.3-1ubuntu1) maverick; urgency=low + + * Merge from debian experimental: + - debian/control: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libmysqlclient15-dev, build against mysql 5.1. + * Dropped libcurl-dev not in the archive. + * Suggest php5-suhosin rather than recommends. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in + universe. + * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1) + * Dropped locales-all. + - modulelist: Drop imap, interbase, and mcrypt. + - debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + + -- Chuck Short Sun, 01 Aug 2010 14:28:03 -0500 + +php5 (5.3.3-1) experimental; urgency=low + + * Upload PHP 5.3.3 to experimental for further testing + + Fixes odbc_autocommit (Closes: #586570) + + Adds support for sqlite3_busy_timout (Closes: #589473) + + Fixes CVE-2010-2225, CVE-2010-2094, CVE-2010-1917, CVE-2010-1866 + and other CVEs that do not apply to the Debian packages or are + irrelevant as per the pre-5.3.2-2 security policy. + * Changes pending update from unstable: + + Use system crypt + * Build the FPM SAPI. + + -- Raphael Geissert Sat, 31 Jul 2010 15:53:12 -0400 + +php5 (5.3.2-2) unstable; urgency=low + + [ Ondřej Surý ] + * Fix unittest about failing crypt() calls with invalid salt + + [ Raphael Geissert ] + * Cherry pick upstream fix for mysqli_ssl_set (Closes: #572122) + * Cherry pick patch to reset error status on beginTransaction() + * Cherry pick patch to add missing definition of JSON_ERROR_UTF8 + * Cherry pick patch to fix SplFileInfo::getPathName() + * Cherry pick patch to fix a memory leak in the cyclical gc + * Cherry pick fix for memory leak in date when gc is enabled + * Cherry pick patch to fix an unaligned mem access in the dba ext + * Cherry pick fix for memory issues in mysqli_options (Closes: #577784) + * Set default session.save_path to /var/lib/php5 (Closes: #576593) + * Don't install an extra copy of php.ini-production + * Remove obsolete TODO list + * Add debian/source/format and set it to 1.0 + * Add doc-base registration for Structuctures_Graph documentation + * Cherry pick patch to fix multiple typos + * Synchronize enchant patch with changes committed upstream + * Cherry pick patch to workaround BDB 4.8 bc changes (Closes: #570149) + * Cherry pick patch to allow the timeout on mssql to be effective p/query + * Cherry pick patch to correctly determine length of doc_root + * Cherry pick patch to fix a memory leak in SoapServer::handle + * Cherry pick patch to fix SplFileInf::fscanf()'s prototype + * Test the mysql extensions too + * Update the security policy for Squeeze and greater + * Include ext_skel script (Closes: #530757) + + [ Sean Finney ] + * Fix for parallel FTBFS in (Closes: #584348) + * Import upstream fix for pdo_mysql segfaults (Closes: #581911) + - thanks to Richard van den Berg + * Dynamically determine maxlifetime if possible. (Closes: #504053) + - thanks to Chris Butler + + -- Raphael Geissert Sun, 18 Jul 2010 15:35:06 -0500 + +php5 (5.3.2-1ubuntu5) maverick; urgency=low + + * debian/php5-module.ini: Comment should be "#" not ";". (LP: #573436) + * debian/patches/cherrypick-upstream-51740.diff: Fix acinclude.ac macro check. (LP: #576910) + * debian/patches/cherrypick-upstream-48361.diff: Fix regression with getPathInfo() + doesn't return parent info (LP: #576910) + * debian/patches/session_save_path.patch: ave PHP sessions to + /var/lib/php rather than /tmp. (LP: #573222) + + -- Chuck Short Tue, 25 May 2010 10:17:00 -0400 + +php5 (5.3.2-1ubuntu4.1) lucid-proposed; urgency=low + + * debian/patches/fix-mysql-badmem.patch: Fix mysql crash when using php5-cgi. (LP: #567043) + + -- Chuck Short Mon, 03 May 2010 11:23:43 -0400 + +php5 (5.3.2-1ubuntu4) lucid; urgency=low + + * debian/control, debian/rules: Re-enable libedit-dev. (LP: #548823) + + -- Chuck Short Mon, 05 Apr 2010 15:33:21 -0400 + +php5 (5.3.2-1ubuntu3) lucid; urgency=low + + * debian/control: Fix upgrade of php5-ldap from 5.3.1. (LP: #) + + -- Chuck Short Sun, 28 Mar 2010 15:41:34 -0400 + +php5 (5.3.2-1ubuntu2) lucid; urgency=low + + * debian/control: Dont build with libmcrypt-dev. + + -- Chuck Short Fri, 26 Mar 2010 14:39:36 -0400 + +php5 (5.3.2-1ubuntu1) lucid; urgency=low + + * Merge from debian unstable: + - debian/control: + * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. + * Dropped libmysqlclient15-dev, build against mysql 5.1. + * Dropped libcurl-dev not in the archive. + * Suggest php5-suhosin rather than recommends. + * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in + universe. + * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1) + * Dropped locales-all. + - modulelist: Drop imap, interbase, and mcrypt. + - debian/rules: + * Dropped building of mcrypt, imap, and interbase. + * Install apport hook for php5. + - Dropped debian/patches/libedit_is_editline.patch. + + -- Chuck Short Tue, 16 Mar 2010 09:09:50 -0400 + +php5 (5.3.2-1) unstable; urgency=high + + [ Sean Finney ] + * Fix improper signed overflow detection in filter extension + (Closes: #570287) + * Another integer overflow/underflow logic fix. (Closes: #570144) + * new debian patch fix_filter_var_email_test.patch (Closes: #571764) + * New debian patch fix_var_dump_64bit.phpt.patch (Closes: #571772) + * New debian patch use_embedded_timezonedb_fixes.patch (Closes: #571762) + + [ Raphael Geissert ] + * Build with qdbm support + * Really run extensions' tests + * Add a note about user_dirs in apache conf file (Closes: #571714) + * Fix typo in debian/NEWS + * Don't install a(nother) useless Structures_Graph sh script + * Re-enable short_open_tag for CLI too (Closes: #573367) + * Disable memory limit in CLI, letting ulimit do its job (Closes: #407425) + * Fix the locale name in some tests (Closes: #573511) + * Fix some gd tests that need the bundled library + * Fix a null pointer dereference when processing invalid XML-RPC + requests (CVE-2010-0397, Closes: #573573) + * Fix an unaligned memory access in enchant_dict_suggest() + * Fix another unaligned memory access in enchant + * Test that the list of extensions to test is never empty + * Update the list of alternative dependencies of php5-dbg + * debian/rules cleanup + * debian/control cleanup + * Build against the system oniguruma library + * Add libjpeg-dev as an alternative to libjpeg62-dev for future + transitions + + [ Ondřej Surý ] + * Imported Upstream version 5.3.2 + * Updated suhosin patch to 0.9.9.1 version. + * Removed debian/patches/suhosin_page_size_fixes.patch. (Closes: #571974) + * Refreshed debian/patches/001-libtool_fixes.patch + * Refreshed debian/patches/006-debian_quirks.patch + * Adapt debian patches to 5.3.2. + * Remove "binary" contents from + debian/patches/fix_var_dump_64bit.phpt.patch + * New debian patch fix_broken_sha2_test.patch + * New debian patch always_use_system_crypt.patch (Closes: #572601) + * New debian patch php_crypt_revamped.patch (Closes: #572601) + + -- Raphael Geissert Sat, 13 Mar 2010 15:11:48 -0600 + +php5 (5.3.1-5) unstable; urgency=low + + [ Sean Finney ] + * Pass full path to php cli executable for unit tests + * dont-gitclean-in-build.patch: Don't run git-clean via buildconf + * update debian patch page_size_fixes.patch with upstream bug ref + * new debian patch broken_5.3_test-posix_uname.patch (Closes: #570286) + + [ Raphael Geissert ] + * Add build-dependency on netbase to fix a test (Closes: #570291) + * Suhosin PAGE_SIZE fixes have been already forwarded + * Fix a race condition on shtool's mkdir -p (Closes: #570111) + * Actually test the binary that is to be shipped in the -cli package + * Add some more documentation about the build system + * Documentation updates + * Update the suhosin patch version information + * Build-dep on locales-all to enable multiple tests + * Don't ship empty maintainer scripts + * Add patch to allow building with qdbm + * Test the extensions that don't require a special setup + * Get the correct list of built-in extensions of apache2filter + + -- Raphael Geissert Mon, 22 Feb 2010 10:41:51 -0600 + +php5 (5.3.1-4) unstable; urgency=low + + [ Raphael Geissert ] + * Pass -O0 when using 'noopt' to actually disable any optimization + * Add patch to use sysconf() to determine the page size + * Add patch to remove PAGE_SIZE assumptions in suhosin code + * Fix an unaligned memory access in the phar extension + * Fix another unaligned memory access + * Print the expected/actual output of failed test + * Add missing PEAR directory (Closes: #542483) + * Build sqlite3 as shared (Closes: #568956) + * Add some more documentation about the source package + + [ Sean Finney ] + * New debian patch fix_broken_5.3_tests.patch + + -- Raphael Geissert Thu, 11 Feb 2010 02:22:47 -0600 + +php5 (5.3.1-3) unstable; urgency=low + + [ Ondřej Surý ] + * get rid of php4 dependencies + * Enable short_open_tag again (Closes: #537099) + * fix dependency on automake1.4 in php5-dev package + * fix typo s/firefox/firebird/ in changelog + * Removed long inactive Adam Conrad and Jeroen van Wolffelaar from uploaders + + [ Raphael Geissert ] + * Fix maintainer scripts to use php.ini-production (Closes: #565130) + * Revert b22a350: Turn the phpapi dependencies into php5 | phpapi + * Allow parallel building via parallel=n + * Build with the hardening wrapper + * Remove no-longer-needed dfsg-repack script + * Add DEP-3-format metadata to some of the patches + * Build the intl extension + * Drop exif_read_data-segfault patch, merged upstream + * Build the enchant extension + * Add ${misc:Depends} where missing + * Disable mod_php in user directories (Closes: #555606) + * Add missing comment character to php.ini-paranoid (Closes: #564622) + * Build the interbase extension on all the supported architectures + + [ Sean Finney ] + * 5.3 upload for unstable. + - Includes backported fix for "ref converted to value" (Closes: #556237). + + -- Raphael Geissert Sun, 07 Feb 2010 23:31:51 -0600 + +php5 (5.3.1-2) experimental; urgency=low + + * Merged changes from 5.2.x sid branch. + * Adapt mssql-null-exception.patch and sybase-alias.patch to 5.3.1 + * Update strcmp_null-OnUpdateErrorLog.patch; merged upstream, leave a + patch with a test case + * Removed check_ini_on_modify_status.patch and gentoo/117- + 4_digit_year_big_endian.patch; merged upstream + * Removed max_file_uploads.patch; no need for backwards compatibility + between major releases + * Refreshed 112-proc_open.patch,exif_read_data-segfault.patch + * Fix duplicate Provides: in debian/control introduced by cherry- + picking 94f0ec3 + * Update sybase aliases to include correct arguments, needed for 5.3.x + * Update Build-Depends: to include firebird2.1-dev as preferred + alternative (Closes: #564691) + * Reformat Build-Depends: to one-dependency-per-line + * Reduce number of libdb*-dev to include only version in + stable/testing/unstable + * Switch to automake (>= 1.11) | automake1.11, depend on autoconf >= + 2.63 (Closes: #549148) + + -- Ondřej Surý Mon, 11 Jan 2010 16:56:01 +0100 + +php5 (5.3.1-1) experimental; urgency=low + + * Imported Upstream version 5.3.1 + * Change dependcy to libdb-dev instead on arbitrary version of + libdb4.x-dev + * Refreshed 006-debian_quirks patch to apply cleanly. + * Removed 114-php_gd_segfault.patch, merged upstream. + * Refreshed 115-autoconf_ftbfs.patch to apply cleanly + * Updated suhosin.patch to 0.9.8 version for php-5.3.1 + * Refreshed 001-libtool_fixes.patch + * Refreshed 004-ldap_fix.patch + * Refreshed 013-force_getaddrinfo.patch + * Refreshed 036-fd_setsize_fix.patch + * Refreshed 052-phpinfo_no_configure.patch + * Refreshed 053-extension_api.patch + * Refreshed 108-64_bit_datetime.patch + * Refreshed 113-php.ini_securitynotes.patch + * Refreshed 116-posixness_fix.patch + * Refreshed gentoo/006_ext-curl-set_opt-crash.patch + * Refreshed gentoo/009_ob-memory-leaks.patch + * Refreshed libedit_is_editline.patch + * Refreshed suhosin.patch + * Add .gitignore file to ignore .pc/ directory + * Removed README.CVS-RULES from debian/php5-common.docs, file is no + longer shipped by upstream. + + -- Ondřej Surý Thu, 07 Jan 2010 17:21:47 +0100 + +php5 (5.3.0-3) experimental; urgency=low + + * Fix segmentation fault in php-gd (Closes: #543496) + * Update suhosin patch to 0.9.8 *BETA* and enable it again + * Fix FTBFS with current autoconf/automake (Closes: #542906, #542088) + * Add avr32-linux-gnu to no -gstabs toolchains (Closes: #543278) + * Fix FTBFS on Debian Hurd (Closes: #530281) + * Use updated (v7) version of use_embedded_timezonedb.patch (Closes: #535770) + + -- Ondřej Surý Tue, 25 Aug 2009 16:12:13 +0200 + +php5 (5.2.12.dfsg.1-2) unstable; urgency=low + + * Update Build-Depends: to include firebird2.1-dev as preferred + alternative (Closes: #564691) + * Reformat Build-Depends: to one-dependency-per-line + * Reduce number of firebird*-dev to include only version in + stable/testing/unstable + * Reduce number of libdb*-dev to include only version in + stable/testing/unstable + * Switch to automake (>= 1.11) | automake1.11, depend on autoconf + (>= 2.63) (Closes: #549148) + + -- Ondřej Surý Mon, 11 Jan 2010 17:31:33 +0100 + +php5 (5.2.12.dfsg.1-1) unstable; urgency=low + + [ Thijs Kinkhorst ] + * Change comment in module .ini snippets from # to ; to avoid deprecation + warnings with PHP 5.3.0. + + [ Ondřej Surý ] + * Imported Upstream version 5.2.12.dfsg.1 + * Removed manpage_spelling.patch, merged upstream. + * Removed libedit_is_editline.patch, merged upstream. + * Refreshed max_file_uploads.patch, patch can be removed, it's kept to + raise max_file_uploads to 50. + * Refreshed and updated suhosin.patch + * Refreshed 001-libtool_fixes.patch, 004-ldap_fix.patch, + 006-debian_quirks.patch, 013-force_getaddrinfo.patch, + 034-apache2_umask_fix.patch, 053-extension_api.patch, + 056-mime_magic_liberal.patch, 115-autoconf_ftbfs.patch, + gentoo/009_ob-memory-leaks.patch, mssql-null-exception.patch, + use_embedded_timezonedb.patch + * Removed autogenerated main/php_config.h.in from suhosin.patch + (Ubuntu: #493761) + * Short open tags are On again in php.ini-dist (Closes: #537099) + * Don't leave .start if we are purging (Closes: #561739) + * Add README.Debian file to /usr/share/doc/php-pear/PEAR, so the + directory is not deleted (Closes: #563437, #542483) + + [ Upstream ] + * Fix default pear.php.net channel definitions (Closes: #559029) + + -- Ondřej Surý Fri, 08 Jan 2010 18:18:43 +0100 + +php5 (5.2.11.dfsg.1-2) unstable; urgency=high + + * max_file_uploads: limit the maximum number of file uploads to 50 + + Reduces the chances of a temporary file exhaustion DoS + * Add libdb4.8-dev as an alternative dependency (Closes: #555945) + * Add libdb-dev as another alternative, hopefully the last one + (Closes: #548486) + * Add a versioned dependency on libtool 2.2 (Closes: #548015) + * Use FilesMatch and SetHandler on apache setups (Closes: #491928) + * Gentoo patch ext-curl-set_opt-crash has already been merged upstream + * Drop unused lintian override + + -- Raphael Geissert Sat, 21 Nov 2009 13:37:51 -0600 + +php5 (5.2.11.dfsg.1-1) unstable; urgency=low + + * New upstream release + + [ Fixes incorporated upstream ] + * Fix 4-year digit year on big-endian platforms (Closes: #542301) + * patch curl_streams_sleep.patch + * patch strcmp_null-OnUpdateErrorLog.patch (partially addresses #540605) + * patch check_ini_on_modify_status.patch + + [ Raphael Geissert ] + * Add aliases to the mssql functions on the sybase extension (Closes: #523073) + * Fix the rows_affected alias, it should be affected_rows + * Avoid possible memory dumps via PG on restored ini values (Closes: #540605) + + [ Ondrej Sury ] + * Fix FTBFS with current autoconf/automake (Closes: #542906, #542088) + * Add avr32-linux-gnu to no -gstabs toolchains (Closes: #543278) + * Fix FTBFS on Debian Hurd (Closes: #530281) + * fix whitespace in libapache2-mod-php5.postinst + + [ Sean Finney ] + * incorporate/ack previous NMU's, thanks Andreas. + * update debian patch 115-autoconf_ftbfs.patch for new upstream version + * update debian patch fix_broken_upstream_tests.patch + * update debian patch mssql-null-exception.patch + * refresh various quilt patches against new upstream version + * remove no longer needed "legacy" support for conffile migration + * add dpkg trigger in the apache2 and apache2filter sapis for reloading + apache2 on extension updates (Closes: #490023, #524206) + * let libmysqlclient15-dev be a fallback alternative for libmysqlclient-dev + in case someone wants to backport the package. + * update list of installed documentation + + -- Sean Finney Sun, 20 Sep 2009 11:05:35 +0200 + +php5 (5.2.10.dfsg.1-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Drop hand-crafted dependency on libmysqlclient15. + + -- Andreas Barth Mon, 31 Aug 2009 09:22:16 +0200 + +php5 (5.2.10.dfsg.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with new autoconf. Thanks to Russ Allbery for the patch. + Closes: #542906 + + -- Andreas Barth Sun, 30 Aug 2009 13:49:40 +0200 + +php5 (5.2.10.dfsg.1-2) unstable; urgency=low + + * Declare that PEAR replaces XML_UTIL (Closes: #534621) + * Bump standards-version, no change needed + * Fix an unconditional limit on dblib_driver.c (Closes: #534881) + * Fix a segfault on exif_data_read with corrupted jpg files (Closes: #535888) + * Recommend php5-suhosin, as suggested by Thijs (Closes: #529760) + * Set sysconfig to /etc, to avoid getting /usr/etc in PHP_SYSCONFDIR + * Add myself to uploaders + * Fix the path to PEAR's config, directly in rules (Closes: #507762) + + -- Raphael Geissert Thu, 09 Jul 2009 18:25:48 -0500 + +php5 (5.3.0-2) experimental; urgency=low + + * update configuration file names to new upstream naming convention + + -- Sean Finney Wed, 01 Jul 2009 09:12:10 +0200 + +php5 (5.3.0-1) experimental; urgency=low + + * New Upstream Version + + [ Sean Finney ] + * use ';' instead of '#' as comments in module ini files + * remove binary package for php5-mhash which is now built-in + * update removed windows modules in 006-debian_quirks.patch + * quilt refresh for new upstream release + + -- Sean Finney Tue, 30 Jun 2009 20:09:07 +0200 + +php5 (5.3.0~RC4-1) UNRELEASED; urgency=low + + * New Upstream Version + + [ Sean Finney ] + * (temporarily) disable suhosin patch while it does not apply to 5.3 + * refresh various debian patches, fixing whitespace and offsets + * copy the gbp.conf from debian-sid and adapt it for experimental + * cherry-pick relevant gentoo patches from unstable + * cherry-pick debian fixes in libtool2.2.patch from unstable + * Update package sections to match override. + + [ Raphael Geissert ] + * Detect the path to ltmain.sh at build time and set conflicts + appropriately + * Add libdb4.7-dev as an ORed build dependency to fix FTBFS + * Update the Vcs-* fields to reflect the move from svn to git + * Turn the phpapi dependencies into php5 | phpapi to fix + installability issues + * Bump Standards-Version to 3.8.1, no change needed + * Add a set of lintian overrides for some FP spelling-error-in-binary + + [ Thijs Kinkhorst ] + * Update php5-cli package description to make it more neutral + + -- Sean Finney Mon, 29 Jun 2009 07:54:51 +0200 + +php5 (5.3.0~RC1-1) unstable; urgency=low + + * New Upstream Version + + -- Mark A. Hershberger Wed, 25 Mar 2009 19:39:48 -0400 + +php5 (5.2.9.dfsg.1-1) unstable; urgency=low + + * New upstream release (closes: #520538). + - fixes regressions with parsing via libxml2 (closes: #520246, #520423). + + [ Sean Finney ] + * Refresh all patches. + * Update suhosin patch to 5.2.9, remove autotools-generated files (configure, + php_config.h.in) and .dsp files from patch. + * remove obsolete configure options from ./configure: --enable-memory-limit, + --enable-track-vars, --enable-trans-sid, --enable-filepro and --enable-dbx. + * Remove obsoleted patches which have been incorporated upstream: + - snmp_leaks.patch + - BG-initializing-fix.patch + - CVE-2008-2829.patch + - CVE-2008-3658.patch + - CVE-2008-3659.patch + - CVE-2008-3660.patch + - CVE-2008-5557.patch + - CVE-2008-5658.patch + - pdo-fetchobject-prototype-error.patch + - zend_object_handlers-invalid-write.patch + - dba-inifile-truncation.patch + - gentoo/freetds-compat.patch + - gentoo/010_ticks-zts-crashes.patch + - gentoo/019_new-memory-corruption.patch + - gentoo/009_array-function-crashes.patch + - gentoo/015_CVE-2008-2665-wrapper-safemode-bypass.patch + - gentoo/017_xmlrpc-invalid-callback-crash.patch + - gentoo/007_dom-setAttributeNode-crash.patch + - gentoo/006_PDORow-crash.patch + - gentoo/005_stream_context_set_params-crash.patch + * Update fix_broken_upstream_tests.patch, one of the tests is fixed. + + -- Sean Finney Tue, 24 Mar 2009 19:05:09 +0100 + +php5 (5.2.6.dfsg.1-3) unstable; urgency=low + + [ Sean Finney ] + * Do not add -O2 to CFLAGS if DEB_BUILD_OPTIONS contains noopt. + * Security related fixes: + - php: inifile handler for the dba functions can be used to truncate a file + Patch: dba-inifile-truncation.patch (closes: #507101). + - CVE-2008-5658.patch: ZipArchive::extractTo directory traversal + Patch: CVE-2008-5658.patch (closes: #507857). + Thanks to Pierre Joye for help with the patch. + + [ Raphael Geissert ] + * Picked up some patches from Gentoo (most included in PHP 5.2.7 and later): + + patches/gentoo/005_stream_context_set_params-crash.patch + + patches/gentoo/006_PDORow-crash.patch + + patches/gentoo/007_dom-setAttributeNode-crash.patch + + patches/gentoo/009_array-function-crashes.patch + + patches/gentoo/010_ticks-zts-crashes.patch + + patches/gentoo/015_CVE-2008-2665-wrapper-safemode-bypass.patch + + patches/gentoo/017_xmlrpc-invalid-callback-crash.patch + + patches/gentoo/019_new-memory-corruption.patch + + patches/gentoo/freetds-compat.patch + - was deprecated_freetds_check.patch + + -- Sean Finney Sat, 24 Jan 2009 21:17:13 +0100 + +php5 (5.2.6.dfsg.1-2) unstable; urgency=low + + [ Sean Finney ] + * Make sure a file used to track state is properly removed in the + postinst, thanks Raphael (closes: #511049). + + [ Thijs Kinkhorst ] + * Fix watch file to mangle version. + + [ Raphael Geissert ] + * Ship script used to take an upstream tarball and remove the non + DFSG-free stuff, update watch file accordingly. + + -- Sean Finney Tue, 13 Jan 2009 08:24:36 +0100 + +php5 (5.2.6.dfsg.1-1) unstable; urgency=high + + [ Sean Finney ] + * Incorporate previous NMU. + * Updated system tzdata patch from Joe Orton. + * Removed tzdb-nofree_ents_ifnotzdata.patch, which is now incorporated + into Joe's patch. + * Two backported fixes from 5.2.8, thanks to Olivier Bonvalet for looking + them up. + - Upstream bug #46157 (PDOStatement::fetchObject prototype error) + Patch: pdo-fetchobject-prototype-error.patch + - Upstream bug #46308 (Invalid write in zend object handler / getter) + Patch: zend_object_handlers-invalid-write.patch + * Security related fixes: + - CVE-2008-5624: Incorporate fix from 5.3 for proper initialization of + uid/gid for apache2 sapi. + Patch: BG-initializing-fix.patch + - CVE-2008-5557: heap overflows in the mbstring extension. + Patch: CVE-2008-5557.patch (closes: #511493). + + [ Thijs Kinkhorst ] + * Correct description typo, thanks Mathias Brodala (Closes: #508989). + + -- Sean Finney Mon, 12 Jan 2009 12:12:36 +0100 + +php5 (5.2.6.dfsg.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove exts/dbase from orig tarball (Closes: #341420) + + -- Ben Hutchings Sat, 29 Nov 2008 19:19:28 +0000 + +php5 (5.2.6-5) unstable; urgency=high + + * Update debian/copyright to document that the DFSG-unfree email + requirement in ext/standard/rand.c has been rescinded by the + copyrightholder (Closes: #498621). + + -- Thijs Kinkhorst Sun, 05 Oct 2008 11:32:35 +0200 + +php5 (5.2.6-4) unstable; urgency=high + + [ Sean Finney ] + * Take three unreleased fixes from upstream CVS: + - CVE-2008-3658: Buffer overflow in the imageloadfont function. + Patch: CVE-2008-3658.patch (closes: #499989) + - CVE-2008-3659: Buffer overflow in the memnstr function. + Patch: CVE-2008-3659.patch (closes: #499988) + - CVE-2008-3660: Remote DoS in fastcgi module + Patch: CVE-2008-3660.patch (closes: #499987) + + [ Raphael Geissert ] + * snmp_leaks.patch: fixes memory leaks in the snmp extension (Closes: #423296) + - Thanks to Rodrigo Campos for the follow up + - Thanks to Federico Cuello for the original patch + * php5-dev.lintian-override: fix it so it actually works + + -- Sean Finney Sun, 14 Sep 2008 14:25:11 +0200 + +php5 (5.2.6-3) unstable; urgency=high + + [ Thijs Kinkhorst ] + * Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts. + * Add documentation about the timezonedb change (Closes: #492025). + + [ Adam Conrad ] + * Modify 033-we_WANT_libtool.patch to cope with newer versions of + libtool that only copy auxilliary files when --install is used, + while still working with older versions that DTRT without. + + [ Raphael Geissert ] + * debian/rules: + + Avoid installing useless test suites in php-pear (Closes: #478995) + + Remove any empty directory in php-pear + + Also get rid of usr/share/php/data/Structures_Graph/* + - Those were meant to be used by upstream maintainer + * debian/php5-dev.lintian-overrides: + - usr/lib/php5/build/run-tests.php is not meant to be used directly + * debian/control: bumped Standards Version to 3.8.0, no changes needed + * bad_whatis_entries.patch: fixes the whatis entries of all the manpages + * deprecated_freetds_check.patch: fixes the freetds detection routine + + Closes: #494230 + - Thanks to jklowden@freetds.org and the Gentoo folks for the patch + (RC bugfix, upload urgency bumped) + * debian/libapache2-mod-php5*-{prerm,postinst}: + - Create a status file when removing the package (but not purging) + while having the mod enabled so reinstallation of the package + does not end up disabling the module (Closes: #471548) + + [ Sean Finney ] + * Bump dependency on libmysqlclient15off to require the version from + lenny or later, in order to avoid subtle problems not previously detected + with libmysqlclient_r on mixed etch/lenny/sid systems (closes: #495575). + + -- Sean Finney Wed, 20 Aug 2008 19:32:02 +0200 + +php5 (5.2.6-2) unstable; urgency=high + + [ Raphael Geissert ] + * Lintian-based changes: + - also install a lintian override for libapache2-mod-php5filter + - fixed the generic lintian overrides so they are meaningful + - dropping linda overrides, linda is gone now + - s/meta-package/metapackage + * debian/control: + - Updated php5's description so it mentions three instead of + only two server-side SAPIs + - Depend on php5-cli in php-pear (Closes: #482517) + + Previous change reverted because of PEAR packages FTBFS + - {B-,}Depend on tzdata to avoid crashes caused by the tz ext patch + - Dropped some versioned {b-,}dependencies that are satisified + even on sarge + * php.ini-*: state that when using a custom save_path, + gc_probability should also be set (Closes: #388808, #321460) + * tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does + not exist (Closes: #483461) + + [ Sean Finney ] + * Fix for CVE-2008-2829: unsafe usage of deprecated imap functions + Patch: CVE-2008-2829.patch + * Modifications to suhosin.patch due to alignment problems on some + architectures. Thanks to Stefan Esser for the initial suggestion. + (Closes: #481737). + * Rename the apache2 filter module to libphp5filter.so, to prevent + conflicting filenames for symbols in the debug package. + + -- Sean Finney Thu, 03 Jul 2008 08:14:45 +0200 + +php5 (5.2.6-1) unstable; urgency=medium + + * New upstream release. Fixes several security issues of unknown impact: + + possible stack buffer overflow in the FastCGI SAPI + + integer overflow in printf() + + unknown issue CVE-2008-0599 + + a safe_mode bypass in cURL + + incomplete multibyte chars inside escapeshellcmd() + + [ Sean Finney ] + * New patch (use_embedded_timezonedb.patch) allows us to default to + using the system provided timezone database instead of the one bundled + with PHP. Many thanks to Joe Orten from Red Hat for the patch! + (closes: #447174, #471104). + * Updated the Suhosin patch to v0.9.6 (5.2.6). + * New patch: force_libmysqlclient_r.patch, forcing the build system + to link against the threadsafe libmysqlclient without having to enable + the other zts features in php. This is required since the apr libraries + are now linking against this as well and mysql exports the same symbols + from both libraries. Thanks to Stefan Fritsch (closes: #469081). + * Massaged/updated various other patches in debian/patches + * Update copyright information to have information about non-trivial + patches worthy of copyright attributions, and update information about + current debian maintainers. + * Add some useful quilt settings in debian/rules to lower the amount of + noise in future quilt updates. + * Now building a php5 apache2 module with filter-module support in a new + libapache2-mod-php5filter package (closes: #438120). + + [ Thijs Kinkhorst ] + * Checked for policy 3.7.3, no changes. + + [ Raphael Geissert ] + * Build a php5-dbg package with the debug symbols of the SAPIs & extensions + + Bump debhelper dependency to >= 5 as dh_strip behaves differently. + * debian/watch: refactored so it can actually be used to download the tarball + * debian/rules: removed bashisms (Closes: #478613) + * debian/control: add a notice about Suhosin being applied (Closes: #471324) + + Additionally make sure the PHP boilerplate is the same for each package + * debian/patches/manpage_spelling.patch: + - fix spelling mistakes in man page (Closes: #413712) + * debian/NEWS: s/suhosin/Suhosin (Closes: #434351) + * debian/control: removed ORed postgresql-dev build-dep (Closes: #429981) + + postgresql-dev is a transitional package since etch + * Override the following lintian messages: + + SAPI packages package-contains-empty-directory usr/lib/php5/20060613+lfs/ + + php5-common package-contains-empty-directory usr/lib/php5/libexec/ + * Set our custom PHP_PEAR_DOWNLOAD_DIR when building the pear stuff + + Avoids the creation of /tmp/pear (Closes: #463979) + * Replaced all 'make' with '$(MAKE)' so any extra flag is preserved + * debian/rules: s/DEB_BUILD_ARCH/DEB_HOST_ARCH + + HOST is the machine the package is built for. + * Recommend php5-cli instead of depending on it in php-pear (Closes: #243214) + + php5-cli is only needed by the, rearely used, pear installer + * debian/README.source: inform how to generate php5-dbg's Depends + * debian/patches/029-php.ini_paranoid.patch: updated (Closes: #459814) + + Thanks to Javier Fernández-Sanguino Peña + Changes: + - includes some variables which were no present in the first version and + removes modules not available in PHP5. Also fixes typos in comments which + have since been fixed in php.ini-dist + - adds notes (Debian-specific) of which security features applications + should not rely on + - add more information of why some variables were enabled + - reorder the description of changes to suit the location in the config file + - add notes of deprecated features in PHP6 + - add more (suggested) changes to the session module to make a more secure + use and storage of session IDs. + - remove the 'include' function from the list of disabled functions as it + is quite common for most applications + - modify the valid 'include_path' to make it really paranoid ('.' is not + allowed anymore) + - adjust locations of directories, including the upload dir and session dir + - proper definition for sql.safe_mode and description (missing in + php.ini-dist of what it is really for) + - added session configuration variables which are not available in + php.ini-dist together with recommended paranoid values + (session.referer_check, session.entropy_file, session.entropy_length) + - added more information to session configuration (not available in php.ini) + based on the information at php.net + * Lintian-based changes: + - debian/php5-common.dirs: do NOT create usr/share/doc/php5-common/PEAR/ + - fixed a hyphen-used-as-minus-sign in php5(1):319 + - get rid of usr/share/php/data/Structures_Graph/LICENSE in php-pear + * Move /usr/share/php/docs to /usr/share/doc/pear-php/PEAR (Closes: #331034) + + [ Steve Langasek ] + * Step down from the PHP maintenance team, removing myself from uploaders. + So long, and thanks for all the fish! + + -- Sean Finney Sun, 04 May 2008 21:15:47 +0200 + +php5 (5.2.5-3) unstable; urgency=high + + * zend_parse_parameters does not handle size_t's, causing issues with + 043-recode_size_t.patch and segmentation faults for recode-using pages. + changed problematic parameters back to "int" and added an overflow check. + thanks to Thomas Stegbauer, Tim Dijkstra, Bart Cortooms, Sebastian Göbel, + and Vincent Tondellier for their reports. closes: #459020. + + -- Sean Finney Thu, 21 Feb 2008 00:59:21 +0100 + +php5 (5.2.5-2) unstable; urgency=low + + * debian/patches/libdb_is_-ldb: reorder the search for db4 instances to + give precedence to -ldb, so that we always get the version that matches + the installed -dev package instead of whichever most recent version php + upstream currently knows about. Closes: #463397. + * Update suhosin patch to not patch .dsp files (and config.w32), which + are irrelevant to Unix builds and seem to cause problems for clean + patching/unpatching. + + -- Steve Langasek Fri, 01 Feb 2008 18:46:15 +0000 + +php5 (5.2.5-1) unstable; urgency=low + + [ Sean Finney ] + * New upstream release + * Updated suhosin patch for 5.2.5 minus ./configure as before. + * Workaround for xargs not handling extra long cmdlines in session + cleanup script (Closes: #461755). + * Remove unneccesary DEB_BUILD_GNU_TYPE fudging (Closes: #429066). Thanks + to Riku Voipio for the report/patch. + + [ Raphael Geissert ] + * debian/rules: now DEB_BUILD_OPTIONS=nocheck aware + * Updated description of the php5 meta-package to reflect removal of apache + (Closes: #418038) + * Capitalise apache where needed (Closes: #439575) + * Homepage is now a control entry (moved from Description), Closes: #439578 + * Fixed test-results.txt target so parallel package building doesn't fail + * Added Suggests: php5-timezonedb to all the SAPIs + + [ Steve Langasek ] + * Add ${shlibs:Depends} to php5-common, since it does build ELF objects now + (pdo.so) + * Update build-deps to libdb4.6-dev now that libaprutil1-dev has switched. + Closes: #461192. + + -- Steve Langasek Thu, 17 Jan 2008 13:39:17 -0800 + +php5 (5.2.4-2) unstable; urgency=low + + [ sean finney ] + * for posterity revised previous changelog to reference the CVE id's + of security issues resolved by the latest upstream release. + * lintian: use debian/compat instead of DH_COMPAT in debian/rules. + * lintian: use source:Version and binary:Version where appropriate, + instead of Source-Version + * lintian: remove a couple pieces of cruft in the changelog that were causing + false-postive wrong-bug-number-in-closes, but were generally useless + anyway. + + [ Raphael Geissert ] + * Using test-results.txt as a target + * cronjob now checks for existance of /usr/lib/php5/maxlifetime (Closes: #439286) + * Fixed memory limit of 1232M in php.ini for cli (Closes: #440624) + * Build the interbase extension using firebird2.0-dev (Closes: #433736) + * Unapply patches with debian/rules clean + + [ Steve Langasek ] + * Don't patch configure or php_config.h.in in suhosin.patch, as these are + auto-generated and including them in the patch results in a race + condition for the necessary build-time regeneration. Thanks to Daniel + Schepler for reporting, and to Damyan Ivanov for helping to sort out the + fix. Closes: #443637. + * Also remove the modified auto-generated files in the clean target, + which triggers a warning about disappearing files when building the + source package but avoids carrying irrelevant diffs to these files + in the Debian diff. + * Now that the testsuite is being run at build time, test failures cause + a bunch of junk files to be left around in the Debian diff. So clean up + several false-positive failures: + - 052-phpinfo_no_configure.patch: we're patching the output of phpinfo(), + so patch the test as well + - fix_broken_upstream_tests.patch: use a local directory for tests that + use sessions, skip the phpinfo test after all because it doesn't appear + to be compatible with current testsuite behavior, and disable the + moneyformat test if en_US locale is not available. + There are still several other failing tests, but these are not false + positives and remain enabled pending investigation. + + -- sean finney Wed, 24 Oct 2007 21:51:14 +0200 + +php5 (5.2.4-1) unstable; urgency=low + + * New upstream release. + * Security issues resolved in the latest release: + - CVE-2007-2519 - Directory traversal vulnerability in PEAR + + + [ sean finney ] + * patch from Jan Wagner to be able to conditionally disable any + patches that break binary-compatibility with official php + binary-only extensions. see debian/rules for more information. + * now incorporate the php unit tests into the build process. for + those interested the output is stored in the file + /usr/share/doc/php5-common/test-results.txt . + * by default we now ship with enable_dl = Off, as there are some + fairly significant ramifications security-wise to having it on. + * we shipping with the suhosin patch enabled by default. + special thanks to Blars Blarson for providing a sparc machine for + testing purposes with 5.2.3 (closes: #397179). + * new binary package php5-gmp, with the newly enabled gmp extension, + since whatever reason for not doing so either never existed or no + no longer exists (closes: #344137). Build-Depends added for libgmp3-dev. + + [ Steve Langasek ] + * php5-module.postinst: don't assume that the postinst is only relevant + when called with 'configure' as an argument, some future debhelper code + could apply in the case of other methods of invocation. + * Clean up build dependencies for recent library transitions: + - libsnmp-dev is now the real package name, and is supported as a virtual + package for backports. + - re-add firebird2-dev as an alternative to firebird1.5-dev, to support + backports. + - the curl -dev package name has changed from libcurl3-openssl-dev to + libcurl4-openssl-dev; update to the proper name, with libcurl-dev as + an alternative. + * Switch php5-sybase to use the mssql extension instead of the sybase_ct + extension. Closes: #418734, #329065. + + -- sean finney Sun, 16 Sep 2007 14:46:06 +0200 + +php5 (5.2.3-1) unstable; urgency=low + + * new upstream release. + * upstream has incorporated the last of the recent CVE fixes, so + the patches have been removed. + * change build dependencies for firebird2-dev -> firebird1.5-dev, + as the firebird maintainer has changed names in order to provide + more clarity since there's also a firebird2.0 now (closes: #427181). + * now include, but do not apply by default, the suhosin patch. see + NEWS.Debian for more information. + + -- sean finney Mon, 04 Jun 2007 22:02:10 +0200 + +php5 (5.2.2-2) unstable; urgency=low + + [sean finney] + - build with --with-ldap-sasl and modify build-depends to include + libsasl2-dev in order to get the ldap_sasl_bind function (closes: #422490). + - the json extension is now on by default in php builds, so there's + no need for the php5-json package. added a Provides/Conflicts to + help set an upgrade path. + - apache 1.x support is soon disappearing. as a consequence we are + no longer building the libapache-mod-php5 module. the php5 metapackage + should as a result bring in libapache2-mod-php5 by default for those who + already have it installed. + + -- sean finney Sun, 20 May 2007 21:59:56 +0200 + +php5 (5.2.2-1) unstable; urgency=low + + [ sean finney ] + * new upstream release (closes: #422405). + * /most/ of the previous CVE patches have been committed upstream, though: + - the patch for MOPB-41 was fixed in a different way and we'll be keeping + our fix for the time being. + - it doesn't seem like MOPB-45 has been fixed yet. + * remove build-dependency option on libmysqlclient12-dev, since the mysqli + option requires it, and 15 is in stable now anyway. thanks to + Henk van de kamer for finding this (closes: #422224). + * now includes requested fix for mysql row counts (closes: #418471). + * needle/haystack issues are reported fixed (closes: #399924). + * oh yeah, because we're using quilt now: (closes: #338315). + * update build-deps to libdb4.5-dev | libdb4.4-dev (closes: #421929). + note that the resulting php packages won't actually build against + libdb4.5 until all of our build-dependant packages do too. + + -- sean finney Sat, 05 May 2007 19:56:30 +0200 + +php5 (5.2.0-12) unstable; urgency=high + + [ sean finney ] + * modify the build-depends to play more nicely when the net-snmp + maintainers decide to change their package names (closes: #421061). + + -- sean finney Tue, 01 May 2007 14:24:01 +0200 + +php5 (5.2.0-11) unstable; urgency=high + + [ sean finney ] + * The following security issues are addressed with this update: + - CVE-2007-0910/MOPB-32 session_decode() Double Free Vulnerability + * note that this is an update to the previous version of the upstream + fix for CVE-2007-0910, which introduced a seperate exploit path. + - CVE-2007-1286/MOPB-04 unserialize() ZVAL Reference Counter Overflow + - CVE-2007-1380/MOPB-10 php_binary Session Deserialization Information Leak + - CVE-2007-1375/MOPB-14 substr_compare() Information Leak Vulnerability + - CVE-2007-1376/MOPB-15 shmop Functions Resource Verification Vulnerability + - CVE-2007-1453/MOPB-18 ext/filter HTML Tag Stripping Bypass Vulnerability + - CVE-2007-1453/MOPB-19 ext/filter Space Trimming Buffer Underflow Vuln. + - CVE-2007-1521/MOPB-22 session_regenerate_id() Double Free Vulnerability + - CVE-2007-1583/MOPB-26 mb_parse_str() register_globals Activation Vuln. + - CVE-2007-1700/MOPB-30 _SESSION unset() Vulnerability + - CVE-2007-1718/MOPB-34 mail() Header Injection + - CVE-2007-1777/MOPB-35 zip_entry_read() Integer Overflow Vulnerability + - CVE-2007-1887-1888/MOPB-41 sqlite_udf_decode_binary() Buffer Overflow + - CVE-2007-1824/MOPB-42 php_stream_filter_create() Off By One Vulnerablity + - CVE-2007-1889/MOPB-44 Memory Manager Signed Comparision Vulnerability + - CVE-2007-1900/MOPB-45 ext/filter Email Validation Vulnerability + * The other security issues resulting from the "Month of PHP bugs" either + did not affect the version of php5 shipped in unstable, or did not merit + a security update according to the established security policy for php + in debian. You are encouraged to verify that your configuration is not + affected by any of the other vulnerabilities by visiting: + http://www.php-security.org/ + * other, less interesting changes: + - now use quilt for managing local patches. + - massage all of the patches, eliminating fuzz and offsets. + + -- sean finney Mon, 23 Apr 2007 19:02:51 +0200 + +php5 (5.2.0-10) unstable; urgency=high + + [ sean finney ] + * The php security update contained a regression in the streams + module. this version contains an updated version of the patch + for CVE-2007-0906 (116-CVE-2007-0906_streams.patch), which should + fix the regression. Thanks to Martin Pitt for noticing this. + * Fix the patch names in the previous changelog entry, and fix a factual + inaccuracy that was accidentally pasted from the php4 changelog. + * The previous update was missing two fixes from CVE-2007-0906: + * interbase: (116-CVE-2007-0906_interbase.patch) + * zip: (116-CVE-2007-0906_zip.patch) + + -- sean finney Wed, 07 Mar 2007 23:11:29 +0100 + +php5 (5.2.0-9) unstable; urgency=high + + [ sean finney ] + * The following security issues are addressed with this update: + - CVE-2007-0906: Multiple buffer overflows in various code: + * session (116-CVE-2007-0906_session.patch) + * imap (116-CVE-2007-0906_imap.patch) + * str_replace: (116-CVE-2007-0906_string.patch) + * the sqlite and mail related vulnerabilities in this CVE do not + affect the php5 source packages. + - CVE-2007-0907: sapi_header_op buffer underflow (116-CVE-2007-0907.patch) + - CVE-2007-0908: wddx information disclosure (116-CVE-2007-0908.patch) + - CVE-2007-0909: More buffer overflows: + * the odbc_result_all function (116-CVE-2007-0909_odbc.patch) + * various formatted print functions (116-CVE-2007-0909_print.patch) + - CVE-2007-0910: Clobbering of super-globals (116-CVE-2007-0910.patch) + - CVE-2007-0988: 64bit unserialize DoS (116-CVE-2007-0988.patch) + Closes: #410995. + * The package maintainers would like to thank Joe Orton from redhat and + Martin Pitt from ubuntu for their help in preparation of this update. + * backport upstream fix for AUTH PLAIN support in imap extension + Closes: #401712. + + -- sean finney Sat, 03 Mar 2007 11:13:33 +0100 + +php5 (5.2.0-8) unstable; urgency=high + + [ sean finney ] + * Update package information to say simply "Apache 2" instead + of "Apache 2.0" (ref: #400306). + * Update package description for php-pear to mention needing + phpN-dev for building PECL extensions (closes: #401825). + * Add mention of Freetype fonts to php5-gd package description, + thanks to Ole Laursen for the suggestion (closes: #387881). + * Include a backported version of upstream's fix for + alignment calculatations which cause FTBFS problems for + some arches. Thanks to Roman Zippel for finding this (closes: #401129). + patch: 114-zend_alloc.c_m68k_alignment.patch + * Remove --enable-yp, as it's no longer used and seperately + packaged. Thanks to Martijn Grendelman for mentioning this + (closes: #402161). + * Add mention to README.Debian of needing to restart apache when + installing modules (closes: #392249). + * Don't strip the DSO modules if building with DEB_BUILD_OPTIONS + containing nostrip + * Backported a patch from upstream CVS to fix a rather nasty + memory leak in zend_alloc (closes: #402506). + patch: 115-zend_alloc.c_memleak.patch + * The memleak and FTBFS are targeted at etch, and there aren't + any other significant changes, so priority=high. + + -- sean finney Sun, 17 Dec 2006 16:49:35 +0100 + +php5 (5.2.0-7) unstable; urgency=high + + [ Steve Langasek ] + * Also disable firebird in the PDO config for archs other than + i386/amd64. + + -- sean finney Fri, 24 Nov 2006 15:20:53 +0100 + +php5 (5.2.0-6) unstable; urgency=high + + [ sean finney ] + * firebird2-dev (and thus php5-interbase) is only available on + i386/amd64, so update the control/rules information accordingly. + thanks to Bastian Blank for reporting this (closes: #399558). + + -- sean finney Wed, 22 Nov 2006 19:04:04 +0100 + +php5 (5.2.0-5) unstable; urgency=high + + [ sean finney ] + * bring some of the mainline php4 modules back into the php source + package instead of distributing them in independant source packages: + - php5-imap + - php5-interbase + - php5-mcrypt + - php5-pspell + - php5-tidy + these modules are still provided in the same binary packages as + before, but will now be built in tandem with the core php packages. + * fix for pdo.so duplicate loading warnings, thanks to Jan Wagner + (closes: #398367, #399248). + + -- sean finney Mon, 20 Nov 2006 12:41:37 +0100 + +php5 (5.2.0-4) unstable; urgency=high + + * Re-re-enable LFS support, forward-porting vorlon's fixes in + the php4 tree. + * Add a bit of support in upgrade scripts to avoid unnecessary + ucf prompting during upgrades (closes: #398363). + * Update build-dependencies to reflect that libpcre3-dev >= 6.6 + is required. Thanks to Jan Wagner for pointing this out. + * loosen dependencys for libapache2-mod-php5 to allow usage with + apache2-mpm-itk as an alternative to prefork. + Closes: #398580, #398481. + + -- sean finney Wed, 15 Nov 2006 08:33:28 +0100 + +php5 (5.2.0-3) unstable; urgency=high + + * Unify PHP options for pear binaries to: + -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1" + (Closes: #397625) + * [debian/rules]: Enable PDO building only in apache2 build. + + -- Ondřej Surý Fri, 10 Nov 2006 14:09:00 +0100 + +php5 (5.2.0-2) unstable; urgency=high + + [ Ondřej Surý ] + * Revert Large File Support for this moment. We will try to found + root of the problem for etch, but we do not promise anything. + (Closes: #397465) + + -- Ondřej Surý Wed, 8 Nov 2006 01:13:48 +0100 + +php5 (5.2.0-1) unstable; urgency=high + + [ sean finney ] + * new upstream release. since this means the 5.1 series is deadware + in the eyes of its developers, we better get on this train before + it's too late. Note: this also fixes the htmlentities() exploit. + Reference: CVE-2006-5465. + Closes: #396766. + * s/postinst/postrm/ on one critical line in debian/rules. whoops. + Thanks to Bart Martens for finding this (closes: #396873). + * as a pennance i've enabled LFS support (closes: #359686). + * new version now includes all mbstring headers (closes: #391368). + * enable new built-in zip support. + * enable pdo support for currently supported db types, and place the + extensions in the respective extension packages. future db + types will be added, but probably post-etch as they will probably + introduce new packages/dependencies (closes: #348882). + * move the mysqli module into the mysql module's package, and remove + the no longer necessary mysqli package. + * massaging/removal of various patches to upstream changes: + D patches/106-strptime_xopen.patch + D patches/110-CVE-2006-4812_zend_alloc.patch + M patches/006-debian_quirks.patch + D patches/111-mbstring-headers.patch + M patches/053-extension_api.patch + + [ Ondřej Surý ] + * Package checked, upload to unstable. + + -- Ondřej Surý Tue, 7 Nov 2006 09:26:51 +0100 + +php5 (5.1.6-6) unstable; urgency=high + + [ sean finney ] + * add notes to php.ini(-dist) about "unsupported" security features. + patch: 113-php.ini_securitynotes.patch + + [ Ondřej Surý ] + * SECURITY: include patch for html buffer overflows in ext/standard/html.c + Reference: CVE-2006-5465 + Patch: 114-CVE-2006-5465_htmlentities.patch + Closes: #396766 + + -- Ondřej Surý Fri, 3 Nov 2006 12:32:50 +0100 + +php5 (5.1.6-5) unstable; urgency=high + + [sean finney] + * add a README.Debian.security to clarify how we handle/respond + to security problems in stable releases. + * SECURITY: include patch for integer overflow in zend_alloc.c. + Reference: CVE-2006-04812 (closes: #391586). + patch: 110-CVE-2006-4812_zend_alloc.patch + * bump the debhelper compatibility level to 4. + * remove cyclic depends for mysql/mysqli. + * the long overdue rework of configuration file handling. this also + removes the need for debconf and template translations + (closes: #361211, #393788, #388697). + * start using ucf to manage the the various SAPI php.ini files. + * cleanup and consolidation of a few things in the ./debian dir + * bump the memory limit to 32M for the cli API (closes: #375070, #340586). + * include a fix for missing mbstring headers reported by Jan Wagner + (closes: #391368). + patch: 111-mbstring-headers.patch. + * include support for PTY's in proc_open, as reported by Eike Dehling. + according to php's BTS (http://bugs.php.net/bug.php?id=39224) the + feature was disabled only because the configure script couldn't + accurately determine whether the feature was available, and we know + it is :) (closes: #381438). + patch: 112-proc_open.patch. + * update standards-version to 3.7.2 + + -- sean finney Sat, 28 Oct 2006 14:29:44 +0200 + +php5 (5.1.6-4) unstable; urgency=high + + [sean finney] + * no longer build against GPL'd gdbm library (closes: #390452). + * updated apache2 module dependencies to build against and coexist + with apache2.2 (closes: #390455). + + -- sean finney Sat, 07 Oct 2006 12:06:09 +0200 + +php5 (5.1.6-3) unstable; urgency=low + + [ sean finney ] + * php5 was building against db4.3 even though db4.4 headers were + installed. fix applied to ./ext/dba/config.m4 while we wait + for a real fix from upstream (closes: #388601). + + -- sean finney Mon, 02 Oct 2006 17:42:50 +0200 + +php5 (5.1.6-2) unstable; urgency=low + + [ sean finney ] + * enable the mysqli extension (closes: #320835). + + -- sean finney Tue, 19 Sep 2006 19:31:27 +0200 + +php5 (5.1.6-1) unstable; urgency=high + + [ Adam Conrad ] + * Drop 041-shut_up_snmp.patch, which was no longer needed as of 5.1.0. + + [ Ondřej Surý ] + * Acknowledge NMU. + * New upstream release (Closes: #383596) + - Added missing safe_mode/open_basedir checks inside the error_log(), + file_exists(), imap_open() and imap_reopen() functions. + - Fixed overflows inside str_repeat() and wordwrap() functions on 64bit + systems. + - Fixed possible open_basedir/safe_mode bypass in cURL extension and + with realpath cache. (CVE-2006-2563) (Closes: #370165) + - Fixed overflow in GD extension on invalid GIF images. + - Fixed a buffer overflow inside sscanf() function. (CVE-2006-4020) + (Closes: #382256) + - Fixed an out of bounds read inside stripos() function. + - Fixed memory_limit restriction on 64 bit system (really with 5.1.6). + * Bump libdb build-dep from libdb4.3 to libdb4.4, to match with apache. + + -- Ondřej Surý Sat, 19 Aug 2006 14:41:43 +0200 + +php5 (5.1.4-0.1) unstable; urgency=high + + * Non-maintainer upload. + * New upstream release. (Closes: #366109) + * Fixes information leak in html_entity_decode() (CVE-2006-1490). + (Closes: #359907) + * Fixes phpinfo() XSS (CVE-2006-0996). (Closes: #361914) + * Fixes copy() safe mode bypass (CVE-2006-1608). (Closes: #361915) + * Fixes tempnam() open_basedir bypass (CVE-2006-1494). (Closes: #361916) + * Fixes wordwrap() buffer overflow (CVE-2006-1990). (Closes: #365312) + * Fixes substr_compare() DoS condition (CVE-2006-1991). + * Fixes crash during too deep recursion (CVE-2006-1549). (Closes: #361917) + * Fixes injection in mb_send_mail() (CVE-2006-1014, CVE-2006-1015); not + mentioned in upstream changelog. (Closes: #368595) + * 044-strtod_arm_fix.patch: Adapted for new upstream; pulled in from + Piotr Roszatycki's packages. + * 108-64bit_datetime.patch: Patch to fix possible segfault on systems where + sizeof(void*) > sizeof(int); patch from David Mosberger-Tang. + + -- Steinar H. Gunderson Tue, 13 Jun 2006 22:38:33 +0200 + +php5 (5.1.2-1) unstable; urgency=low + + * New upstream bugfix and security update release (closes: #347894) + - Fixes multiple cross-site-scripting vulnerabilities; CVE-2006-0208 + - Resolves multiple HTTP response splitting vulnerabilities, allowing + arbitrary header injection via Set-Cookie headers; see CVE-2006-0207 + - While we don't currently build it, this release also fixes a format + string vulnerability in the mysqli extension; see CVE-2006-0200 + - Includes a new version of the PEAR installer that seems to have a + slightly better clue about the difference between INSTALL_ROOT and + PHP_PEAR_INSTALL_DIR, fixing pear.conf (closes: #346479, #346501) + * While the above is partially true, the PEAR installer is still a bit + broken (it won't install correctly under fakeroot anymore, YAY), so + shuffle debian/rules to have a build-pear-stamp target, as a stopgap. + * Add 106-strptime_xopen.patch, moving the _XOPEN_SOURCE definition down + in ext/standard/datetime.c, below the php.h include (closes: #346550) + * Add 107-reflection_is_ext.patch, munging ext/reflection/config.m4 to + properly call the PHP_ARG_ENABLE macro for an extension, not built-in. + * Stop php-pear from Replacing and Conflicting with php-html-template-it, + as we only now ship the bare essential to make the pear installer go. + + -- Adam Conrad Mon, 16 Jan 2006 16:12:31 +1100 + +php5 (5.1.1-1) unstable; urgency=low + + * New upstream bugfix release, skipping the problematic 5.1.0 release: + - Fixes a zend.ze1_compatibility_mode segfault (closes: #333374) + - Remove libtool patch from acinclude.m4, now integrated upstream. + - Remove 038-round_test_fix.patch, now integrated upstream. + - Remove 049-exported-headers.patch, as upstream's build system has + gotten more clever about what they should and shouldn't export. + - Remove 054-open_basedir_slash.patch, now integrated upstream. + - Remove 055-gd_safe_mode_checks.patch, fixed differently upstream. + - Mangle 101-sqlite_is_shared.patch, to deal with upstream changes. + - Remove 104-64_bit_serialize.patch, now integrated upstream. + - Remove 105-64_bit_imagettftext.patch, now integrated upstream. + * Many security vulnerabilities fixed (closes: #341368, #336005, #336654): + - Resolves a local denial of service in the apache2 SAPI, which can + be triggered by using session.save_path in .htaccess; CVE-2005-3319 + - Resolves an infinite loop in the exif_read_data function which can + be triggered with a specially-crafted JPEG image; CVE-2005-3353 + - Resolves a vulnerability in the parse_str function whereby a remote + attacker can fool PHP into turning on register_globals, thus making + applications vulnerable to global variable injections; CVE-2005-3389 + - Resolves a vulnerability in the RFC1867 file upload feature where, if + register_globals is enabled, a remote attacker can modify the GLOBALS + array with a multipart/form-data POST request; see CVE-2005-3390 + - Resolves numerous safe_mode and open_basedir bypasses; CVE-2005-3391 + - Resolves INI settings leaks in the apache2 SAPI, leading to safe_mode + and open_basedir bypasses between virtual hosts; CVE-2005-3392 + - Resolves a CRLF injection vulnerability in the mb_send_mail function, + allowing injection of arbitrary mail headers; see CVE-2005-3883 + - Includes PEAR 1.4.5, resolving a vulnerability in the pear installer + which could lead to arbitrary code execution; see CVE-2005-4154 + * Bump libdb build-dep from libdb4.2 to libdb4.3, to match with apache. + * Bump our MySQL build-dep to 5.0's libmysqlclient15-dev (closes: #343793) + * Automate the process of getting the list of built-in modules into the + package descriptions, so it stays fresh in the future (closes: #341867) + * Intentionally disable PDO support until I've sorted out the best way to + deal with shipping this shiny new feature that won't break the world. + * The new PEAR happens to fix the Command.php greedy match bug filed in + Debian as part of the fix for the wider security issue (closes: #334969) + * Create 056-mime_magic_strings.patch, making the mime_magic extension + more liberal about what mime-types is accepts, as well as making it skip + over ones it dislikes, rather than disabling itself (closes: #335674) + * Add 057-no_apache_installed.patch, to stop spewing a mess of errors in + configure because we don't have the apache binaries in the build chroot. + * Fix small typo in the php5-xsl package description (closes: #344816) + + -- Adam Conrad Thu, 15 Dec 2005 14:46:56 +1100 + +php5 (5.0.5-3) unstable; urgency=low + + * Build-Depend on libcurl3-openssl-dev, since libcurl3-dev is going away + soon. Keep libcurl3-dev as an alternate for backporting (see: #334367) + * Switch from libmysqlclient12 to libmysqlclient14; this puts us on the + *other* side of the line regarding which combinations of DSOs cause + segfaults, so hopefully the others catch up with us soon (closes: #332453) + * Look for magic.mime in /usr/share/file now instead of /usr/share/misc/file, + as the path has been changed to comply with the FHS (see: #334510) + * Make the above backportable as well, by searching for both files, and + picking the one that's currently installed on the user's system. + * Include swedish debconf translation from Daniel Nylander (closes: #330763) + * Make pear use '/usr/bin/php' instead of just 'php' to make sure we don't + get some random binary on $PATH that won't work right (closes: #329415) + * Set PHP_PEAR_SIG_BIN to /usr/bin/gpg, and have php-pear Recommends: gnupg + + -- Adam Conrad Fri, 21 Oct 2005 02:30:19 +1000 + +php5 (5.0.5-2) unstable; urgency=medium + + * Remove Andres Salomon from the Uploaders field, at his request. Thanks + for all your work on the PHP packages, Andres, now fix our kernel bugs. + * Add 054-open_basedir_slash.patch, which fixes a bug where if open_basedir + is set to "/foo/", users can access files in "/foobar/", which is not the + documented behaviour; this addresses CAN-2005-3054 (see: #323585) + * Add 104-64_bit_serialize.patch from Joe Orton, resolving a segfault when + serializing objects on all 64-bit architectures (closes: #329768) + * Add 105-64_bit_imagettftext.patch, fixing a type mismatch in the GD + extension, causing memory corruption on 64-bit arches (closes: #331001) + * Add 055-gd_safe_mode_checks.patch from PHP CVS, adding missing safe_mode + checks to the _php_image_output and _php_image_output_ctx GD functions. + * Make php-pear Provide, Replace, and Conflict php-html-template-it, which + we appear to have absorbed into the main PEAR packaging (closes: #332393) + + -- Adam Conrad Tue, 27 Sep 2005 16:09:29 +1000 + +php5 (5.0.5-1) unstable; urgency=low + + * New upstream release, adjust patch offsets and fuzz, and drop patches: + - Drop 009-snmp-int-sizes.patch, finally fixed upstream. + - Drop 051-gcc-4.0.patch, fixed differently upstream. + - Drop 102-php_streams.patch, fixed upstream. + - Drop 103-catch_segv.patch, also fixed upstream. + - Includes PEAR XML_RPC fix for CAN-2005-2498. + - Includes phpinfo() XSS fix for CVE-2005-3388. + * Distribute the shiny new manpages for php-config and phpize. + + -- Adam Conrad Mon, 12 Sep 2005 02:29:24 +1000 + +php5 (5.0.4-4) unstable; urgency=low + + * Ondřej Surý : + - Add patch from CVS to fix regression in PHP 5.0.4, where file related + functions all stop reading at 2,000,000 bytes (closes: #321930) + * Adam Conrad : + - Enable support for gdbm files in the dba handler; half the base system + already appears to depend on libgdm, so we can't make things worse. + - Add another patch from CVS to fix a segfault in the catch/throw + handler under interesting nesting cases (closes: #322507) + - Rebuild against libsnmp9-dev for new libsnmp SOVER (closes: #327107) + + -- Adam Conrad Thu, 8 Sep 2005 00:36:36 +1000 + +php5 (5.0.4-3) unstable; urgency=low + + * And fix the module/extension API situation one last time, this time + we read ZEND_EXTENSION_API_NO, ZEND_MODULE_API_NO, and PHP_API_VERSION, + pick the most recent of the three, assume things broke in ways we're + not willing to cope with, and both change the extension directory to + use that value, as well as setting it to the provides/depends for the + various SAPI and extension packages. + * Add a new option to php-config, 'php-config --phpapi', which extension + packagers should now be using to get the current phpapi they're building + against and set their dependencies accordingly. + * Strip the -gnu off the end of the DEB_*_* variables and drop the + versioned dpkg-dev build-dep to ease backporting to sarge and hoary; + doing so in such a way as to still allow for easy cross-compiling. + * Add postgresql-dev build-dep alternate for easy hoary/sarge backports. + * Make libapache2-mod-php5 the default alternate dependency for the php5 + metapackage, since we really do want to encourage the apache upgrade. + * Make php5-dev stop shipping copies of files from autotools-dev, shtool, + and libtool, and instead symlink to them and depend on those packages, + thus avoiding the shtool issues from CAN-2005-1751 and CAN-2005-1759. + + -- Adam Conrad Sun, 31 Jul 2005 03:05:08 +1000 + +php5 (5.0.4-2) unstable; urgency=low + + * We now have a mailing list. Set the maintainer to the list, and move + myself to Uploaders where, apparently, I belong. + * Use ZEND_MODULE_API_NO rather than PHP_API_VERSION for extension deps, + as recent upstream ABI breakage in 4.4.0 leads me to believe this is + the only constant they actually bother to update on ABI changes. + * Bring back some concflicts that went missing (libapache-mod-php5 needs + to conflict with libapache-mod-php4 and older versions of php4, while + the two libapache2-mod-php[45] modules also need to conflict). + * Adjust debian/watch to not match on upstream's alpha/beta/rc releases. + + -- Adam Conrad Wed, 27 Jul 2005 22:30:42 +1000 + +php5 (5.0.4-1) unstable; urgency=low + + * Initial PHP5 release; packaging forked from php4 4:4.3.11-1. + - Closes: #262977, #293832 + * Ondrej Sury : + - Removed some obsolete cruft, since there wasn't any previous php5 + packages there is no need, to check /usr/share/doc/*, etc. + - Removed apache2 IfModule hack, it's been fixed in php5. + - Updated patches to php5, removing those which are obsolete. + - Changes xslt extension to xsl (using libxslt). + - Updated debian/* including changelog. + - Raised update-alternatives priority to 50. + * Adam Conrad : + - Merged with php4 4:4.4.0-1 packaging. + - Re-roll upstream tarball to include PEAR::XML_RPC 1.3.3, which + includes a security fix for CVE CAN-2005-1921. + - Bump to Standards-Version 3.6.2, with no source changes. + - Stop distributing the phpextdist binary, as upstream has stopped. + - Drop the ext_skel binary and skeleton dir from php5-dev, as it has + been deemed obsolete upstream and the version in the tarball is not + considered useful anymore. PEAR::PECL_Gen upstream will replace it. + - Fix longstanding broken shebang lines in debconf config scripts. + - Remove lintian overrides for modules; lintian no longer complains + about missing shlibs for libraries outside the linker path. + - Add a linda override for the non-standard directory permissions on + /var/lib/php5 in php5-common. + - Rename php5-pear to php-pear, have it replace php4-pear, and depend + on php5-cli OR php4-cli; make sure it works with both. + - Compile in SOAP extension (closes: #307580) + - Enable SQLite extension as shared, make the xmlrpc extension shared. + - Enabled the pgsql extension, and disabled the imap extension (which + will be moving to another source package and become the example + package for out-of-tree builds). + + -- Adam Conrad Sat, 16 Jul 2005 23:42:36 +1000 + +php4 (4:4.3.11-1) unstable; urgency=low + + * New upstream release (closes: #304052) + - Drop CVS patches, we're back in step with upstream versions. + - Remove 048-x509_multiple_orgUnits.patch, incorporated in 4.3.11. + - Remove 050-4.3.11_file_copy_fix.patch, incorporated in 4.3.11. + - Remove 040-curl_open_basedir.patch, as upstream has solved this + in a different fashion. + - Adjust patches for offset and fuzz. + - Remove bits from debian/rules dealing with the DB PEAR extension, + since it's no longer shipped in the php4-pear package. + * Rebuild against newer version of freetds library (closes: #317369) + * Add 052-phpinfo_no_configure.patch, which disables the display of our + "Configure Command" in phpinfo(), which was the source of many bogus + bug reports over the years, due to people misinterpreting its meaning. + * New translations to Vietnamese and Russian (closes: #316821, #310199) + - vi.po contributed by Clytie Siddall + - ru.po contributed by Yuriy Talakan' + * Mention FastCGI in the description of php4-cgi (closes: #310810) + + -- Adam Conrad Mon, 4 Jul 2005 17:47:32 +1000 + +php4 (4:4.3.10-15) unstable; urgency=low + + * Bring back the shipping of /usr/share/doc symlinks in our packages, + as this, in concert with moving the migration detection from preinst + to postinst (which was done in the last upload), seems to give us the + sanest upgrade path. Thanks to Steve Langasek for smacking me around + with unpack/upgrade scenarios for a while to convince me of this. + + -- Adam Conrad Mon, 9 May 2005 02:13:19 -0600 + +php4 (4:4.3.10-14) unstable; urgency=high + + * Revert the directory->symlink magic to work how it used to, since the + new behaviour broke hideously on upgrades from Woody, causing certain + files (like the changelog) to mysteriously go missing (closes: #307591) + * Move our template php.ini to /usr/share/php4, so we stop violating + policy by using files from /usr/share/doc (as seen in #307591) + * Remove 'readline' from the php4-cli package description, since we don't + actually build with readline support enabled anymore (closes: #306571) + + -- Adam Conrad Wed, 4 May 2005 01:48:19 -0600 + +php4 (4:4.3.10-13) unstable; urgency=low + + * Update email address for Andres Salomon + * Add Portuguese translation from Miguel Figueiredo (closes: #305038) + * Include 051-gcc-4.0.patch, which resolves a build failure in + libxmlrpc (from the xmlrpc extension) with gcc-4.0 (closes: #287956) + + -- Adam Conrad Mon, 18 Apr 2005 00:29:54 -0600 + +php4 (4:4.3.10-12) unstable; urgency=low + + * Add 050-4.3.11_file_copy_fix.patch, which reverts a broken 'fix' + made to the copy() function, causing it to fail in particularly + spectacular ways when used on remote files (closes: #304601) + * Use -g instead of -gstabs on powerpc64-linux (closes: #301571) + + -- Adam Conrad Thu, 14 Apr 2005 03:53:27 -0600 + +php4 (4:4.3.10-11) unstable; urgency=medium + + * Address an FTBFS waiting to happen in the php4-dev package: + - Remove Win32 and Netware specific headers. + - Stop shipping php4-pgsql headers. + - Stop shipping the expat headers, since we don't even + use the bundled expat library. + - Make php4-dev depend on libssl-dev, since it wants to include + ssl.h when you use it to build network-using extensions. + * Stop building extensions twice; we don't need two copies. + + -- Adam Conrad Tue, 12 Apr 2005 03:14:03 -0600 + +php4 (4:4.3.10-10) unstable; urgency=low + + * Update to 200503131325 CVS (AKA: 4.3.11RC1), fixing several bugs + including a segfault in mysql_fetch_field() (closes: #299608) + * Remove 042-remove_windows_paths.patch, incorporated upstream. + * Add 048-x509_multiple_orgUnits.patch to bring the openssl extension + in line with the upcoming 4.3.11 behaviour of listing multiple + Organisational Units in an x509 cert as an array, rather than only + listing the last in the list. + * After much talk with upstream, revert the ZTS changes. We are no + longer building a thread-safe PHP. (closes: #299820, #297223, #297679) + * ZTS was breaking file search paths, leading to errors loading files + from the cwd (closes: #298282, #298518, #299089, #299356) + * Stop building caudium-php4 (closes: #294718, #297702, #295100) + - We can't link against the GPL pike7.2, which we've been doing. Oops. + - Even if the above weren't true, upstream has insisted that ZTS is a + horribly broken solution, slated for eventual removal, and should + never, ever be used. In light of that, caudium users should instead + use php4-cgi, either as a plain CGI, or as a FastCGI backend. + - Not even attempting to provide an upgrade path, as it would be + needlessly complex, and caudium-php4 in previous stable releases + was nothing more than a useless toy, given that it had nearly no + useful extensions built-in or supported. + * Rewrite 041-shut_up_snmp.patch to take a different approach, this time + regrettably reverting a fix for a memory leak, in the name of making + things work properly, including squashing the putenv() intecaction + bug between PHP and other apache modules (closes: #298511, #300628) + * On sidegrades from distributions where different modules may be built + from their own source, and thus have their own doc directories, bad + things happen when we try to replace those with symlinks, so now we + check for this in preinst, and fix stuff up magically to Just Work. + * Add Jeroen van Wolffelaar to Uploaders. + * Fix up modules regexes to use "\.so" instead of ".so" (cf: #300998) + + -- Adam Conrad Wed, 16 Mar 2005 22:46:05 -0700 + +php4 (4:4.3.10-9) unstable; urgency=low + + * Update 040-curl_open_basedir.patch once more to make sure it doesn't + segfault when fed a null or uninitialised URL (closes: #295447) + * Add 047-zts_with_dl.patch, courtesy of Steve Langasek to re-enable the + dl() function in our builds, despite upstream's claim that it "might + not be threadsafe on all platforms"; it is on ours (closes: #297839) + * Make the php4-dev binaries versioned with alternatives (closes: #295903) + * Update build-deps to libmysqlclient12-dev (closes: #290989, #227549) + + -- Adam Conrad Sun, 6 Mar 2005 07:30:35 -0700 + +php4 (4:4.3.10-8) unstable; urgency=high + + * Add 046-zend_plist_buggery.patch which unrolls the changes made to + zend.c in CVS post-4.3.10. The memory leaks fixed by these changes + seem to not have been hurting us terribly so far, while the "fix" + (breaking persistent lists) was, uhm, bad (closes: #295998, #296694) + * Revise 041-shut_up_snmp.patch to call init_snmp with 'snmpapp' as the + appname, rather than 'php', to maintain backward compatibility, and to + wrap our setenv/unsetenv magic only around snmp_shutdown, which seems to + solve a segfault when php4-snmp is loaded with mod_perl (closes: #296282) + * Fix 042-remove_windows_paths.patch to catch both cases where windows + path stripping should occur (closes: #296406) + + -- Adam Conrad Tue, 22 Feb 2005 07:49:32 -0700 + +php4 (4:4.3.10-7) unstable; urgency=high + + * Rewrite 040-curl_open_basedir.patch, so it now does what it's supposed + to (addressing CAN-2004-1392) and no longer segfaults (closes: #295447) + + -- Adam Conrad Thu, 17 Feb 2005 00:06:36 -0700 + +php4 (4:4.3.10-6) unstable; urgency=high + + * Add 044-strtod_arm_fix.patch to fix the FPU confusion FTBFS on arm. + * Add 045-exif_nesting_level.patch to bump the exif header parsing max + nesting level to something that actually works with most JPEG images. + + -- Adam Conrad Mon, 14 Feb 2005 16:04:28 -0700 + +php4 (4:4.3.10-5) unstable; urgency=low + + * Add 043-recode_size_t.patch to fix 32/64-bit issues causing the recode + extension to segfault on alpha/amd64/ia64 (closes: #294986) + * Move the ./buildconf stuff in the unpatch target inside the test + for patch-stamp, as it's uselss unless we're unpatching. + + -- Adam Conrad Sun, 13 Feb 2005 19:09:39 -0700 + +php4 (4:4.3.10-4) unstable; urgency=medium + + * Make php4-dev arch:any, as it contains some arch-specific defines. + * Add 042-remove_windows_paths.patch, a patch to rfc1867.c to strip Windows + paths from uploaded filenames, like it used to. (closes: #294305) + * Fix up caudium description to reflect the fact that caudium it is no + longer restricted from sharing extensions with other SAPIs. + * Build-dep on apache2-threaded-dev (>= 2.0.53-3) to make sure we + get a version with non-broken headers. + + -- Adam Conrad Wed, 9 Feb 2005 11:52:10 -0700 + +php4 (4:4.3.10-3) unstable; urgency=medium + + * Update to CVS, as of 200502060530 (closes: #288672) + - Fixes two vulnerabilities in exif.c, CAN-2005-1042 and CAN-2005-1043 + - Fixes two vulnerabilities in image.c, CAN-2005-0524 and CAN-2005-0525 + - File uploads with "'" in them aren't cut off anymore (closes: #288679) + - unserialize() is no longer ridiculously slow (closes: #291392) + - Add 000-200502060530_CVS.patch + - Adapt debian/rules to the realities of upstream's new buildconf + - Add 033-we_WANT_libtool.patch, to force relibtoolizing with Debian's + libtool, rather than using upstream's broken bundled libtool + - Drop 031_zend_strtod_1.1.2.10.patch and 032_zend_strtod_debian.patch + - Adjust patches for offsets and fuzz + - Force --with-pic, as policy demands it, and the build system doesn't + * Added several patches, yanked from the Fedora PHP sources: + - 034-apache2_umask_fix.patch, fixes umask not being properly reset + after each request (closes: #286225) + - 036-fd_setsize_fix.patch, fixes misuse of FD_SET() + - 038-round_test_fix.patch, makes the rounding test work on gcc-3.3 + * Removed --with-libedit, as being able to background php is more useful, + in my opinion, than using readline functions (see #286356) + * Include zip support in all SAPIs (closes: #288534, #288909) + * Enable Zend Thread Safety for all SAPIs, meaning that our modules + are now compiled for ZTS APIs as well. (closes: #278212, #264015) + - Make sure caudium-php4 now provides phpapi-$(ver), and modules can + be configured with the caudium SAPI. + - Add 039-reentrant_libs.patch to link to the reentrant versions of + libldap and libmysqlclient + * Stop suggesting phpdoc, as it's undistributable anyway. + * Add 040-curl_open_basedir.patch, to make php4-curl respect the value + of open_basedir, thanks to Martin Pitt (closes: #291410) + * Add 041-shut_up_snmp.patch, to prevent libsnmp5 from attempting (and + failing) to write persistent data every time it shuts down. Ugh. + + -- Adam Conrad Sun, 6 Feb 2005 05:32:11 -0700 + +php4 (4:4.3.10-2) unstable; urgency=high + + * Patch Zend/zend_strtod.c twice: + - Patch from upstream CVS to fix FTBFS on Sparc/Linux systems + - Patch from me to fix FTBFS on __mc68000__, __ia64__, and __s390__ + + -- Adam Conrad Sat, 18 Dec 2004 19:35:30 -0700 + +php4 (4:4.3.10-1) unstable; urgency=high + + * New upstream release, including the following security fixes: + - CAN-2004-1018 - shmop_write() out of bounds memory write access. + - CAN-2004-1018 - integer overflow/underflow in pack() and unpack() + functions. + - CAN-2004-1019 - possible information disclosure, double free and + negative reference index array underflow in deserialization code. + - CAN-2004-1020 - addslashes() not escaping \0 correctly. + - CAN-2004-1063 - safe_mode execution directory bypass. + - CAN-2004-1064 - arbitrary file access through path truncation. + - CAN-2004-1065 - exif_read_data() overflow on long sectionname. + - magic_quotes_gpc could lead to one level directory traversal with + file uploads. + * Adjust patch offsets for new upstream, fix 013-force_getaddrinfo.patch + to match with new configure.in and drop 026-4.3.10_session_fixes.patch + which is included in 4.3.10. + + -- Adam Conrad Wed, 15 Dec 2004 17:17:40 -0700 + +php4 (4:4.3.9-2) unstable; urgency=low + + * Adam Conrad : + - Add -fno-strict-aliasing to CFLAGS, as the (several thousand) + warnings I'm getting from GCC are frightening me a tad. + - Remove the php-cgi alternative in php4-cgi's prerm, to avoid + leaving dangling symlinks (closes: #275962, #282315) + - Include 030-imap_getacl.patch, adding the imap_getacl() function + required by the GOsa project (closes: #282484) + - Include php.ini-paranoid in doc/examples, provided and maintained + by Javier Fernández-Sanguino Peña (closes: #274374) + - Make /cgi-bin/php4 an alternative for /cgi-bin/php (closes: #282464) + - Remove obsolete info from README.Debian relating to session_mm, + since we stopped building with libmm a while back. + - Reintroduce /usr/lib/php4/libexec that went missing in a previous + upload, since the build uses it as the default safe_mode exec dir. + * Andres Salomon : + - Add patch to include gd headers in php4-dev, as some PECL modules + (notably, pdflib) expect it; 028-export_gd_headers.patch. + - Lintian fix: Add missing #DEBHELPER# token to php4-common.postrm. + + -- Adam Conrad Wed, 01 Dec 2004 18:48:13 -0700 + +php4 (4:4.3.9-1) unstable; urgency=high + + * New upstream release, removed the following patches fixed upstream: + 014-apache2handler_CVS_fixes.patch, 015-gdNewDynamicCtx_Add_Ex.patch, + 018-unix_socket_fd_leak.patch, 020-4.3.9_overflow_fixes.patch, + 021-4.3.9_sybase_ct_fixes.patch, 022-4.3.9_sprintf_fixes.patch, + 023-4.3.9_array_fixes.patch, 024-4.3.9_glob_fix.patch, + and 025-4.3.9_domxml_segfaults.patch + * Resolves undiscolsed vulnerabilities in GPC processing and rfc1867 + handling of file uploads via the $_FILES array; these have since + been assigned CVE CAN-2004-0958 and CAN-2004-0959 (closes: #274206) + * After some fairly heavy testing from several users and developers, + finally update php4-snmp to use libsnmp5 (closes: #195929) + * Add 026-4.3.10_session_fixes.patch from CVS, which prevents PHP + from segfaulting when a nonexistant or unsupported save_handler or + serialize_handler is specified in php.ini. + * Add /etc/apache/conf.d/php4.conf, setting up our mime-types, on the + off chance that the user's /etc/mime.types is broken (closes: #271171) + * Reintroduce a CGI binary at /usr/bin/php4-cgi, so people who can't + make use of the --force-cgi-redirect CGI binary in /usr/lib/cgi-bin + can instead use #!/usr/bin/php4-cgi scripts (closes: #273143) + * Enable FastCGI for both CGI binaries, now that it no longer conflicts + with, but rather complements, the CGI SAPI (closes: #233849) + * Bump libgd2 build-dep a notch to make sure we build against a version + that actually has XPM support built in (closes: #270435) + * Finally drop the bogus libapache-mod-ssl dependency from the apache1.3 + php4 module, as glibc (>= 2.3.2.ds1-17) has fixed the dlopen refcount + bug that we were hacking around (closes: #205553, #230956, #271000) + * Remove the mm session handler from the apache1.3 build. Since the + files handler now works on all arches, and is configured to be secure + by default, mm seems to have outlived its usefulness. + (closes: #119902, #149430, #166811, #272463, #232840) + * Rename sapi/apache2handler/sapi_apache2.c to mod_php4.c so that + directives aren't ambiguous between php4 and php5. + * Add Czech translation, thanks to Miroslav Kure (closes: #274038) + * Configure CLI with --with-libedit for readline support, and add + 027-readline_is_editline.patch, since Debian's libedit headers are + not installed in /usr/include/readline (closes: #274031) + * libcurl grew a new SONAME somewhere along the way, and upgrading + doesn't seem to cause regressions in php4-curl, so upgrade we shall, + changing build-deps accordingly (closes: #260389) + + -- Adam Conrad Mon, 4 Oct 2004 22:57:37 -0600 + +php4 (4:4.3.8-12) unstable; urgency=high + + * On new php4-cli installations, if php4-cgi is installed, we copy its + php.ini as a starting reference, so that command line scripts that + used to work don't start mysteriously failing (closes: #270153) + * php4-common has grown a postrm script to make sure we completely + clean out and remove /var/lib/php4 during the purge phase. + * Optimize garbage collection cronjob to use 'xargs -r -0 rm', so we + aren't forking for every session file we delete (closes: #268918) + + -- Adam Conrad Sun, 5 Sep 2004 19:17:42 -0600 + +php4 (4:4.3.8-11) unstable; urgency=high + + * Andres Salomon : + - Fix bashism in maxlifetime script (closes: #270015) + * Adam Conrad : + - Clarify setup instructions in README.Debian for using php4-cgi + with the apache and apache2 packages (closes: #228342, #228343) + + -- Adam Conrad Sat, 04 Sep 2004 23:21:21 -0600 + +php4 (4:4.3.8-10) unstable; urgency=high + + * Andres Salomon : + - Change frequency of session file cleansing, based on the maximum value + of session.gc_maxlifetime from all php.ini files (closes: #269688). + - Update README.Debian to mention session cleaning cron job. + * Adam Conrad : + - Drop php4-cgi from the list of alternate dependencies for the php4 + metpackage to smooth upgrades for woody users who have both php4 and + php4-cgi installed (closes: #269628, #269348, #269377) + - Fix cut-n-paste issue in php4-cli postinst (closes: #269466) + - Add 023-4.3.9_array_fixes.patch, which fixes problems with the + extract() function misbehaving with multiple element references. + - Add 024-4.3.9_glob_fix.patch to fix broken return values from glob() + when it succeeds with no matches (closes: #269287) + - Add 025-4.3.9_domxml_segfaults.patch, fixing segfaults in the domxml + extension when it shares memory space with other libxml2-using libs. + - Update the comments in php.ini to point out that, due to dilinger's + changes above, session.gc_maxlifetime is honoured by the gc cronjob. + + -- Adam Conrad Fri, 03 Sep 2004 20:42:56 -0600 + +php4 (4:4.3.8-9) unstable; urgency=high + + * Re-introduce the changelog.Debian that went missing in the last + upload due to the php4-common move from arch:all to arch:any + * Clean up lintian warnings regarding scripts that weren't executable + and executables that weren't scripts. + * Add a lintian override for the non-standard-dir-perm of /var/lib/php4 + * Update to Standards-Version 3.6.1 (no changes, other than the above) + + -- Adam Conrad Thu, 26 Aug 2004 21:53:27 -0600 + +php4 (4:4.3.8-8) unstable; urgency=low + + * Default session.save_path is now compiled in to php4, allowing + us to, again, comment out the value in php.ini. + * Comment out session.gc_probability in the default php.ini, as we've + now compiled in a default of 0, allowing the cronjob to do the + garbage collection for us instead. (closes: #267720) + * Make the 5 SAPI postinsts smarter, allowing them to poke around in + people's configs and make sure that sessions won't be broken + after we upgraded them from a perfectly functional system. + * Add 022-4.3.9_sprintf_fixes.patch, fixing incorrect formatting of + floats with padding by sprintf(). + * Make php4-common arch:any, and loosen up some of the other any->all + package dependencies to make sure binNMUs won't break. + + -- Adam Conrad Tue, 24 Aug 2004 03:09:43 -0600 + +php4 (4:4.3.8-7) unstable; urgency=high + + * Back out LFS support AGAIN, as we're disabling LFS in apache2 for + the Sarge release. (closes: #266869) + * Add 021-4.3.9_sybase_ct_fixes.patch, backporting several fixes + for the sybase_ct extension from 4.3.9rc1. + * Tidy up descriptions a fair bit: + - Disambiguate short descriptions of SAPIs. (closes: #244571) + - Refresh the (now much longer) lists of built-in modules for each SAPI. + - Explain why caudium-php4 can't use any loadable extensions. + - Remove silly advertising blurb for Zend, since very few people are + still using php3, and those who are can't be convinced to upgrade + just by telling them "Hey, it's faster!". + - Add Homepage URI to each SAPI description. + - Fix typo in php4-domxml description. (closes: #146124) + * Make caudium-php4 provide php4-mysql and php4-pgsql, so it can be used + with packages that depend on something like "php4, php4-mysql". + * Enable --with-mime-magic and make sure all SAPIs depend on libmagic1 + to pull in /usr/share/misc/file/magic.mime (closes: #175136) + + -- Adam Conrad Thu, 19 Aug 2004 18:27:17 -0600 + +php4 (4:4.3.8-6) unstable; urgency=high + + * Add libgcrypt11-dev to the build-depends, as something seems to be + pulling it in and causing an FTBFS (closes: #265952) + * Add 020-4.3.9_overflow_fixes, backporting fix for integer overflows + in array_slice(), array_splice(), substr(), substr_replace(), + strspn() and strcspn(). + * Bump the apache2 build-dep to (>= 2.0.50-9) to ensure we're building + against the new ABI-incompatble libapr0, which brings in proper + large file support. Bump the apache2 binary dependency as well. + (closes: #266210, #266192) + * Enable large file support on all SAPIs except for caudium, as I'm not + sure how caudium will react to the change, and I don't want to + destabilise anything just before release. This change has been + heavily tested with apache2/apache/cgi/cli, and all is well there. + * Re-enable 019-z_off_t_as_long.patch, which is needed to make sure + that LFS-enabled SAPIs can still use zlib file functions correctly. + * Rework the apache2 restarting logic to only restart apache2 if + apache2ctl configtest succeeds, otherwise kick out a warning to + the user. Even then, we run force-reload with ||true, in case + apache2 fails to start for other reasons (closes: #264958) + * Make php4-gd Provide php4-gd2, so packages which still depend on + php4-gd2 are installable (and so packaging frontends can take the + provides/conflicts/replaces hint and DTRT with it) + * Split php4-cgi to php4-cgi and php4-cli (closes: #227915) + - Add php4-cli to debian/control, replaces older php4-cgi versions + - php4-cgi depends on php4-cli for smooth transitions + - php4-pear now depends on php4-cli (closes: #243214, #221434) + - Add php4-cli to list of SAPIs configurable for modules + - Munge php.1 manpage to include -cli info + - Enable pcntl and ncurses in -cli (closes: #135861, #190947, #241806) + * Move all of php4's files to libapache-mod-php4, and make php4 a + metapackage that depends on libapache-mod-php4 | libapache2-mod-php4 | + php4-cgi | caudium-php4 (closes: #244573, #246654, #244571, #266517) + * Include skeleton directory in php4-dev (closes: #95832, #211338) + * Include php.ini-recommended in php4-common's examples (closes: #181396) + * Move /var/lib/php4 to php4-common and install a cronjob that cleans + out old sessions every 30 minutes (closes: #256831, #257111) + * Move the libapache-mod-ssl dependency from php4-imap to + libapache-mod-php4 to stop irritating users of other SAPIs + (closes: #240003, #246887, #263381) + * Compile pgsql and mysql support into the caudium SAPI, so it's + slightly less useless (closes: #181175) + + -- Adam Conrad Sun, 15 Aug 2004 19:56:14 -0600 + +php4 (4:4.3.8-5) unstable; urgency=low + + * Build-depend on chrpath and use it to nuke rpath from modules + during the install target of debian/rules. + * Add 018-unix_socket_fd_leak.patch to get rid of UNIX socket file + descriptor leak on failed fsockopen() calls. (closes: #257269) + * It would seem that if we want LFS support, all SAPIs and all extensions + that do file access need to be built with LFS support, and since + apache2 currently doesn't have LFS, this presents a problem. As + such, I'm disabling LFS accross the board until apache2 supports it. + (closes: #263962) + * Add 019-z_off_t_as_long.patch, including local headers for zlib, + forcing off_t = long for gzip file functions, however disable it + for now, as we'll only need it if we reenable LFS (closes: #208608) + * Add the Debian package revision as EXTRAVERSION to PHP, so one can + more easily tell what version is currently running (for instance, + if a user fails to restart Apache after an upgrade of php4, this + would become obvious to them in the version banner and in phpinfo() + * Fixed up debian/patches, adjusting offsets and adding newlines, + so patch stops complaining and applies them cleanly. + * libapache2-mod-php4 postinst now forces a reload of apache2, which + should get the module properly working in all cases where people + previously thought 'apachectl graceful' would cut it. + (closes: #241352, #263424, #228343) + * debian/rules explicitly sets PROG_SENDMAIL during configure so + that builds on buildds with no sendmail installed don't get the + mail() function disabled. (closes: #180734) + * Enable XMLRPC-EPI support for all SAPIs (closes: #228825, #249368) + * Enable sysvmsg support for all SAPIs (closes: #236190) + * Enable dbx support for all SAPIs (closes: #229508, #249797) + * Nuke aclocal.m4 before we run ./buildconf to ensure we get it + regenerated correctly, and we get an up-to-date libtoolization. + + -- Adam Conrad Mon, 9 Aug 2004 07:47:46 -0600 + +php4 (4:4.3.8-4) unstable; urgency=low + + * Drop 016-pread_pwrite_XOPEN_SOURCE_500.patch, as it didn't seem to + solve anything, really, and add 017-pread_pwrite_disable.patch, + wich completely disables pread/pwrite usage, fixing session support + on sparc, and pread/pwrite usage on amd64. (closes: #261311) + + -- Adam Conrad Mon, 26 Jul 2004 06:15:59 -0600 + +php4 (4:4.3.8-3) unstable; urgency=low + + * Steve Langasek : + - Give php4-pear a versioned dependency on php4-cgi, due to + backwards-compatibility issues (closes: #260924). + + * Adam Conrad : + - Added a debian/watch file for the curious, or people running + automated uscan scripts over the entire archive. + - Bump libgd2 build-dep to 2.0.28 to buy us guaranteed GIF + support in php4-gd (closes: #66293) + - Add 015-gdNewDynamicCtx_Add_Ex.patch, which fixes three double-free + errors in php4-gd. This, in concert with the librrd0 update + (see #261323) should clear up all known segfaults in php4-gd + (closes: #220196, #234571, #241270, #246833, #251220, #260790) + Thanks to Klaus Reimer for the tip. + - Add 016-pread_pwrite_XOPEN_SOURCE_500.patch, which fixes use of + pread/pwrite in conjunction with LFS64. This should fix the files + session handler on sparc, as well as the amd64 build failure. + (closes: #234766, #239420, #261311, #248765) + - Clean up debian/rules to remove a bunch of obsolete cruft, as well + as introducing an LFSFLAGS, allowing us to easily turn LFS support + on and off for each SAPI. + - Re-enable LFS for apache 1.3, as it was enable in Woody and we should + remain backward compatible. + + -- Adam Conrad Sun, 25 Jul 2004 18:49:31 -0600 + +php4 (4:4.3.8-2) unstable; urgency=high + + * Urgency "high" to make up for the last upload which contained + security fixes but was uploaded urgency "low". + + * Adam Conrad : + - Bump debhelper build-dep to >= 3, as we were using DH_COMPAT=3 + in debian/rules. Not sure how this was missed for so long. + - Add 014-apache2handler_CVS_fixes.patch, which fixes a memory + leak in the apache2handler SAPI, as well as a logical mishandling + of fatal errors during activation. + + * Steve Langasek : + - Revert large file support, which appears to cause + ABI-incompatibilities (and therefore segfaults) for apache2 + (closes: #259659). + + -- Adam Conrad Mon, 19 Jul 2004 20:44:00 -0600 + +php4 (4:4.3.8-1) unstable; urgency=low + + * Adam Conrad : + - New upstream release (4.3.8). Fixes several security issues: + + Fixed strip_tags() to correctly handle '\0' characters. + + Improved stability during startup when memory_limit is used. + + Replace alloca() with emalloc() for better stack protection. + + Added missing safe_mode checks inside ftok and itpc. + + Fixed address allocation routine in IMAP extension. + + Prevent open_basedir bypass via MySQL's LOAD DATA LOCAL. + + Fixes DoS in readfile() function, see CAN-2005-0596. + - php4-pear now includes PEAR::Mail 1.1.3 (closes: #257688) + - debian/control: change libpng3-dev build-dep to libpng12-dev + - Add Turkish debconf translation, thanks to Osman Yuksel. + (closes: #252940) + + * Andres Salomon : + - New upstream release (4.3.7). The following patches are dropped: + 007-dba_fix.patch + 008-xbithack.patch + 011-curl_api_update.patch + 012-curl_deprecated_opts.patch. + - Add 013-force_getaddrinfo.patch, so that getaddrinfo support is + always enabled (instead of doing check during build). + + * Steve Langasek : + - Enumerate supported SAPIs in both the module postinst and the module + config script, to avoid "question not found" errors from debconf. + This doesn't give us automatic support for new SAPIs as they're + added, but it avoids trying to configure SAPIs that we don't support + (e.g., caudium), and it also sidesteps shell syntax errors caused by + strangely-named subdirectories. + - Remove apache2 from the TODO list, because it's done + (closes: #243793). + - Add /var/lib/php4 to the list of directories for the apache2 module, + so we don't end up with a missing session dir (closes: #240962). + - s/modules-config/apache-modconf/, now that the canonical name of the + apache-common tool has changed + - Drop references to php3 in README.Debian, and document the + simplified process for enabling php4 in apache 1.3 (closes: #244564). + - Enable large files support for all SAPIs (closes: #249500). + - Fix commented-out default include path in php.ini (closes: #250274). + + -- Adam Conrad Wed, 14 Jul 2004 18:06:42 -0600 + +php4 (4:4.3.4-4) unstable; urgency=low + + * Drop apache2 work-around patch and add build-dep on apache2 2.0.48-8, + now that #228840 is fixed. + * Fix FTBFS problem caused by curl api changes, adding patches 011 and + 012 (closes: #239159). + * Add phpapi Provides for libapache2-mod-php4 (closes: #240386). + * Add versioned build-dep for pcre, as apache2 has proven that pcre-3.9 + and older won't work (closes: #215069). + * Tighten build-dep versions to match upstream's autoconf version checks + (closes: #214060). + + -- Andres Salomon Fri, 26 Mar 2004 23:27:27 -0500 + +php4 (4:4.3.4-3) unstable; urgency=low + + * Andres Salomon : + - Fix incorrect php.ini path in CLI manpage (closes: #233757). + - Add libapache2-mod-php4 module (closes: #214611). + * Updated Japanese debconf translation; thanks to Kenshi Muto + (closes: #222424). + * Build php4-gd against libgd2-xpm, removing the need for a separate + php4-gd2 package (closes: #235390, #206045, #135664). + * Add new Catalan debconf translation; thanks to Aleix Badia i Bosch + (closes: #236630). + * Add new Spanish debconf translation; thanks to Carlos Valdivia + Yagüe (closes: #235052). + + -- Steve Langasek Sat, 28 Feb 2004 12:11:57 -0600 + +php4 (4:4.3.4-2) unstable; urgency=low + + * Add build-depends on autoconf, missed earlier (closes: #235012). + * Minor updates to README.Debian list of supported extensions. + * Fix integer size mismatch in snmp extension affecting 64-bit + platforms + + -- Steve Langasek Thu, 26 Feb 2004 22:25:27 -0600 + +php4 (4:4.3.4-1) unstable; urgency=low + + * New upstream version. Update local patch set accordingly, with help + from Andres Salomon . + - includes fix for snmpget() not closing its socket + (closes: #207363). + * Update build-depends to libdb4.2-dev, to match apache-dev + (closes: #231692). + * Drop translations of stale templates, and add new German debconf + translation; thanks to Alwin Meschede + (closes: #232270). + * Add new Danish debconf translation; thanks to Claus Hindsgaul + (closes: #233887). + * Move local patches into debian/patches/ for easier management, and + add debian/rules targets for build-time application of patches. + * Fix a problem with PHP "xbithack" causing ini scope leakage + (closes: #230047). + * Re-enable the openssl extension statically, since we now know for + sure that the php4-imap problems are a glibc bug (closes: #197450). + * Fix pear to set /usr/bin/php4 instead of /usr/bin/php for the value + of php_bin, so PEAR-managed scripts work correctly + (closes: #228381). In addition, use alternatives for /usr/bin/php + for the benefit of user scripts (closes: #185283). + * Set the default session save_path to /var/lib/php4 instead of to + /tmp, and create this directory such that all users (for php4-cgi) + can create files there and access their own files once created, but + not see the names of other files in the directory (closes: #139810). + * Drop our override of upstream's register_globals default + (closes: #230878). + + -- Steve Langasek Sat, 14 Feb 2004 10:23:24 -0600 + +php4 (4:4.3.3-5) unstable; urgency=low + + * Have php4-pear Suggest: php4-dev, for PECL extensions + (closes: #225969). + * Recompiled against the new version of libxslt, to get rid of the + dependency on libxsltbreakpoint (closes: #224806). + * Also recompiled against the new version of libc-client (closes: #227347). + * Fix pear to not expect to be able to twiddle locks when running as + non-root, which also seems to fix a memory utilization problem + (closes: #225026). + * Make php4-imap depend on libapache-mod-ssl, since this seems to be + the only reliable way of getting apache to stop segfaulting. + * Build-depend on libt1-dev, which replaces t1lib-dev. + + -- Steve Langasek Mon, 5 Jan 2004 22:53:18 -0600 + +php4 (4:4.3.3-4) unstable; urgency=low + + * Fix prerm script to remove mod_php4, *not* mod_perl, from the + config (Closes: #216889). + * Use /etc/$i/httpd.conf instead of /etc/$i to decide whether to + call modules-config. + * Don't invoke debconf unless we have to in the postinst, to reduce + the risk of interactions between modules-config and our questions. + * Add Dutch debconf translation; thanks to Tim Dijkstra + (closes: #221439). + * Sync dba lock handling against upstream CVS HEAD, to fix a bug with + truncating db4 files when opening with 'c' (create). + (Closes: #221559). + + -- Steve Langasek Tue, 21 Oct 2003 16:49:03 -0500 + +php4 (4:4.3.3-3) unstable; urgency=low + + * Disable -gstabs on ia64, since this debugging symbol type is + apparently unknown there; we should now have clean builds (with + appropriate debugging symbols) on all archs. + + -- Steve Langasek Mon, 20 Oct 2003 19:07:40 -0500 + +php4 (4:4.3.3-2) unstable; urgency=low + + * Don't call db_stop in the postinst, as this seems to cause problems + for modules-config (closes: #215663, #215584). + * Remove duplicate -prefer-pic flag on caudium build, in hope of + making libtool do something sensible on ia64,hppa (closes: #216020). + * Always build with debugging symbols, per current policy. + * Unconditionally call dh_strip, which knows about DEB_BUILD_OPTIONS; + and call install -s when installing shared extensions by hand. + * Fix upstream build rules to not call libtool --silent. + + -- Steve Langasek Wed, 15 Oct 2003 23:19:55 -0500 + +php4 (4:4.3.3-1) unstable; urgency=low + + * New upstream release. + * Add Japanese debconf translation; thanks to Kenshi Muto + (closes: #211961). + * Fix caudium handling to always grab the current pike version from + dpkg when constructing include paths (closes: #212585). + * Bump the c-client build dependencies to use the new -dev package + name. + * Convert php4 postinst/prerm scripts to use the new apache + modules-config interface. + + -- Steve Langasek Sun, 21 Sep 2003 17:26:31 -0500 + +php4 (4:4.3.2+rc3-6) unstable; urgency=low + + * Add Brazilian Portuguese debconf translation; thanks to André Luís + Lopes (closes: #207078). + * Catch debian/control up with debian/rules for the zendapi -> phpapi + transition. + + -- Steve Langasek Sun, 31 Aug 2003 20:35:57 -0500 + +php4 (4:4.3.2+rc3-5) unstable; urgency=low + + * Kill the lintian warning on the grammar in the copyright file. + * Redirect apacheconfig I/O to /dev/tty, to work around debconf + behavior (for real this time). Closes: #207468, #206404. + * Replace 'zendapi' with 'phpapi', since the former does not + accurately describe the ABI changes that affect modules and can + leave some packages installable but broken (closes: #208020). Also, + remove the versioned conflicts with php4-{mysql,pgsql}, since this + now supersedes. + * Add French debconf translation; thanks to Michel Grentzinger + (closes: #207662). + + -- Steve Langasek Sat, 23 Aug 2003 21:43:24 -0500 + +php4 (4:4.3.2+rc3-4) unstable; urgency=low + + * Have all php extensions automatically detect and configure for any + installed SAPIs (closes: #143436). + * Remove spurious dependencies from php4-dev, and replace autoconf2.13 + with autoconf (closes: #180497). + * Conflict with old php4-pgsql as we do with php4-mysql, as it + manifests the same bug. + * Add preliminary rules for building apache2 SAPI, but don't enable. + * Call db_stop before trying to run apacheconfig (closes: #206404). + * Check for the existence of /etc/php4 before trying to rmdir it, + since there are apparently those who remove such directories + prematurely (closes: #206120). + + -- Steve Langasek Sun, 17 Aug 2003 00:19:38 -0500 + +php4 (4:4.3.2+rc3-3) unstable; urgency=low + + * Fixes for spurious package dependencies + * Fix the paths emitted by php-config, so we can build php4-pgsql et al. + + -- Steve Langasek Fri, 15 Aug 2003 23:44:55 -0500 + +php4 (4:4.3.2+rc3-2) unstable; urgency=low + + * Make sure pear.conf is properly marked as a conffile, by bumping + DH_COMPAT to 3. + * Generate all per-extension postinsts/prerms at build time, instead + of managing them by hand. + * Get rid of bogus, non-FHS directories from the caudium build. + * Install the upstream php manpage in the php4-cgi package + (closes: #175836). + * Prevent null dereferencing in ldap_explode_dn() (closes: #205405). + * Hard-code /usr/share/pear at the end of the include path, for + backwards compatibility. + * Debconf support for PHP extension registration, including + po-debconf support (closes: #122353). + * Fix interpreter path in /usr/bin/pear. + * Make php4-pear depends: php4-cgi (closes: #182393). + + -- Steve Langasek Wed, 13 Aug 2003 22:39:08 -0500 + +php4 (4:4.3.2+rc3-1) unstable; urgency=low + + * New upstream version. + - includes fix for buffer overflow crashes in imap module + (closes: #191640) + - includes fix for dysfunctional open_basedir directive + (closes: #197803) + - include fix for various XSS vulnerabilities (closes: #200736) + * Recompile against newest libc-client libs, following another soname + change (closes: #199049) + * Replace db2 with db4. + * Trim down the cgi sapi rules, since it will now build both cli and + cgi for us by default. + * Kludge the caudium sapi, by hard-coding the include path we need for + pike headers. + * Copy the lex/yacc-generated .c and .h files into the build + directories, since generating them at build time gives wildly + different, and undisputably broken, results. + * Update the install rules so they're compatible with current upstream + handling of pear and the various SAPIs. + * Add '=shared' to the --enable-xslt option, to get the right results + for that extension. + * Move PEAR extensions from /usr/share/pear to /usr/share/php. + * Conflict with php4-mysql=4:4.2.3-14, due to bizarre Zend errors. + + -- Steve Langasek Wed, 6 Aug 2003 22:43:28 -0500 + +php4 (4:4.2.3-14) unstable; urgency=low + + * Disable openssl extensions AGAIN. It appears that this double-linking mess + is still causing nasty segfaults. + (closes: #188014, #188025, #188058, #189202, #189653) + + -- Adam Conrad Sun, 20 Apr 2003 17:31:59 -0600 + +php4 (4:4.2.3-13) unstable; urgency=low + + * Revert NET-SNMP patch and build php4-snmp against UCD-SNMP again + (closes: #185534) + * Build against libmm13, as libmm12 no longer exists (closes: #187401) + * Rebuild caudium-php4 against latest caudium-dev + * Re-enable openssl linking and functions, now that our glibc 2.3 + problems appear to be ironed out. + * Enable xslt and exslt support in php4-domxml (closes: #172881) + + -- Adam Conrad Thu, 3 Apr 2003 05:53:24 -0700 + +php4 (4:4.2.3-12) unstable; urgency=low + + * Rebuild php4-sybase against libct1 (closes: #184461) + + -- Steve Langasek Sat, 8 Mar 2003 20:03:33 -0600 + +php4 (4:4.2.3-11) unstable; urgency=low + + * Remove pike header location detection from debian/rules and do it + properly in sapi/caudium/config.m4, using pike7.2-config --version + + -- Adam Conrad Mon, 3 Mar 2003 23:33:26 -0700 + +php4 (4:4.2.3-10) unstable; urgency=low + + * Added patch to build with NET-SNMP 5.x + * Updated build-dep for libc-client to 2003debian + (closes: #181565, #182854, #169886) + * Updated build-dep for libcurl to libcurl2-dev (closes: #179722) + * Added -mieee to alpha build to solve FPE errors (closes: #180656) + * Removed arch-specific logic to build with gcc-3.2 on arm, since gcc-3.2 + is now the default compiler on all architectures. + * Add libwrap0-dev to the end of the build-depends to work around #183041. + Someone remember to remove this later when the bug is fixed. :) + * Build against newer libsablot0-dev (closes: #179886, #181550) + * Introduce ugly hack in debian/rules to get the pike includes + directory right for the caudium SAPI. + + -- Adam Conrad Sun, 2 Mar 2003 12:49:07 -0700 + +php4 (4:4.2.3-9) unstable; urgency=low + + * Fix caudium-php4 to not conflict with php4-pear (closes: #175415). + + -- Steve Langasek Sun, 5 Jan 2003 16:40:20 -0600 + +php4 (4:4.2.3-8) unstable; urgency=low + + * Fix typo in debian/rules + * Rebuild to bring in sync with latest caudium packages + + -- Adam Conrad Wed, 25 Dec 2002 20:00:59 -0700 + +php4 (4:4.2.3-7) unstable; urgency=low + + * Set a sane default for safe_mode_exec_dir (closes: #122920). + * Rebuild against libmm-dev on i386, instead of against the + no-longer-available libmm11-dev which Provides: the same + (closes: #173509). + + -- Steve Langasek Mon, 16 Dec 2002 22:48:40 -0600 + +php4 (4:4.2.3-6) unstable; urgency=low + + * Build with PEAR for all SAPIs, so that the built-in include_path is + set correctly (overkill?). Closes: #169786, #172321 + * Change section of php4-dev package to devel. + * Add libkrb5-dev to build-depends, since libc-client2002-dev doesn't + pull it in (closes: #173313). + * Depend on coreutils instead of fileutils, since the latter is now an + empty package (closes: #171265). + + -- Steve Langasek Sun, 15 Dec 2002 23:20:30 -0600 + +php4 (4:4.2.3-5) unstable; urgency=low + + * Fix (snip, snip) the upstream build scripts, so that libphp4.so + isn't worthlessly linked against the problematic openssl libs + (closes: #165699, #165718, #165719, #166414). + * Update config.{sub,guess} so that the package builds on mips + platforms (closes #173218) + * Replace libc-client-ssl2001-dev with libc-client2002-dev in build + dependencies, fixing various php4-imap segfaults (closes: #169610, + #169769). + + -- Steve Langasek Sun, 15 Dec 2002 19:42:43 -0600 + +php4 (4:4.2.3-4) unstable; urgency=low + + * Remove build dependency on non-extant libmagick5-dev, which is no + longer used anyway (closes: #169829, #172402). + * Add myself to the Uploaders: field of the control file. + + -- Steve Langasek Sat, 14 Dec 2002 12:52:06 -0600 + +php4 (4:4.2.3-3) unstable; urgency=low + + * Backport a patch from CVS to sanitize control characters in php_url_parse() + to prevent ASCII control injection in fopen() calls. + + -- Adam Conrad Thu, 12 Sep 2002 16:29:46 -0600 + +php4 (4:4.2.3-2) unstable; urgency=low + + * I'm a moron (thanks to James Troup for pointing this out). + * Change gcc-3.1 references in debian/rules to gcc-3.2. + * Change GD build-dep to libgd-xpm-dev until GD package mess is worked out. + + -- Adam Conrad Tue, 10 Sep 2002 12:18:21 -0600 + +php4 (4:4.2.3-1) unstable; urgency=low + + * New upstream version + * Added a patch from Ginger Alliance to eliminate warnings in xslt compile + * Messed with the php4-imap build: + - compiling with SSL support (closes: #122700) + - commented out the static-on-i386 hack, libc-client is now linked dynamically + * Sessions should finally be fixed, however I won't tag the bugs "woody" + until I know for sure. (if you were affected, please test and send + followups to me) + * Updated arm build-dep to use gcc-3.2 since gcc-3.1 is gone now. + + -- Adam Conrad Tue, 10 Sep 2002 09:02:51 -0600 + +php4 (4:4.2.2-3) unstable; urgency=low + + * Fix typo resulting in php4-odbc not having a postinst + (closes: #157116, #157927) + * Build against latest caudium-dev to made caudium-php4 installable + again. (closes: #158247) + * Update build-deps to swap libpng3 for libpng2. (closes: #158908) + + -- Adam Conrad Sat, 7 Sep 2002 01:22:57 -0600 + +php4 (4:4.2.2-2) unstable; urgency=low + + * Pulled --with-ndbm out of ./configure, as libc6 no longer ships with + headers or the library for db1 (closes: #156141, #155889) + * Update build deps to build against libmm12 (closes: #155042) + * php4-curl no longer depends on libcurl2-ssl (closes: #155015) + + -- Adam Conrad Sat, 10 Aug 2002 01:12:47 -0600 + +php4 (4:4.2.2-1) unstable; urgency=medium + + * New upstream + * Fixes input validation vulnerability in rfc1867.c (closes: #153850) + * Added missing prerm/postinst for php4-xslt (oops) + + -- Adam Conrad Mon, 22 Jul 2002 11:58:53 -0600 + +php4 (4:4.2.1-3) unstable; urgency=low + + * Yet more build fixes. This time, bump the arm build-dep from gcc-3.0 to + gcc-3.1 to avoid compiler errors. I love the arm toolchain. No, really. + + -- Adam Conrad Wed, 29 May 2002 17:40:30 -0600 + +php4 (4:4.2.1-2) unstable; urgency=low + + * Applied small patch to fix building on non-32-bit architectures + (closes: #148231) + * Added still /more/ documentation about the unserializer, sessions, + and the session.save_handler php.ini option. + + -- Adam Conrad Sun, 26 May 2002 14:43:55 -0600 + +php4 (4:4.2.1-1) unstable; urgency=low + + * The "When is Debian going to have new software like XF^H^HPHP 4.2?" release. + * Probably the last update (barring huge packaging bugs or plain broken + binaries) before starting on a complete reorg of the PHP packages. + * Deserializer now works on big-endian architectures (addresses bug #121391 + and probably others) + * This release probably fixes a whole bunch of bugs. Will be going through + the bug list and playing the reproducibility game after the upload. + * Default include_path in php.ini now set to include pear. + * Upstream default for register_globals HAS CHANGED. In the Debian php.ini + we are still using "register_globals = On" for compatibility reasons, + however our packages will change too. This is a warning for anyone + packaging PHP scripts and applications to make sure you'll be compatible + with the new default once it's set. + + -- Adam Conrad Sun, 26 May 2002 06:24:21 -0600 + +php4 (4:4.1.2-4) unstable; urgency=high + + * No binaries were harmed in the making up this upload. + * Updated README.Debian and changelog. All other files untouched, + as the binaries were merely unpacked and repacked. + - Added a note to README.Debian about how to properly set up + Apache for use with php4, if the installation didn't (and it usually + doesn't ) get it right. + - Added a note to README.Debian about the unserializer (and sessions) + being messed up on big endian architectures. It's too late to try + to get a proper fix in for this, so we're just going to have to cope. + + -- Adam Conrad Fri, 26 Apr 2002 12:27:40 -0600 + +php4 (4:4.1.2-3.1) unstable; urgency=low + + * The 'I broke it, I have to take credit for it' release. + * Rebuild the package to get proper binary dependencies on alpha. + + -- Steve Langasek Sun, 31 Mar 2002 17:13:09 -0600 + +php4 (4:4.1.2-3) unstable; urgency=low + + * Switched to --with-regex=php (from =system). This fixes all the + problems with eregi/parse_url/fopen/etc on Alpha. + * Cleaned up long descriptions (closes: #130977, #130954) + + -- Adam Conrad Wed, 27 Mar 2002 15:11:43 -0700 + +php4 (4:4.1.2-2) unstable; urgency=low + + * New maintainer (closes: #132980) + * Enabling unixodbc support (closes: #107201) + * Changed the install-modules target in build/rules_pear.mk so that + it will error out in the case of an empty modules directory or + failure to install modules (closes: #135304) + + -- Adam Conrad Tue, 12 Mar 2002 00:25:41 -0700 + +php4 (4:4.1.2-1) unstable; urgency=high + + * New upstream version with a security fix. This + supercedes 4.1.1-2.2 from Steve Langasek: + * Fix an error in the handling of MIME file upload headers, which left + open a potential security hole. (Closes: #136063) + * Fixed gcc-3.0 fix :-) + * Thanks for fixing apache-common fix + * This version should fix session bugs with upstream fix (closes: #133877) + * With a brutal change to main/SAPI.c try to fix(?) authorize bugs + + -- Petr Cech Thu, 28 Feb 2002 11:14:26 +0100 + +php4 (4:4.1.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * loosen apache-common dependency to make us forwards-compatible, as + recommended by the apache maintainer. + * use gcc-3.0 when building on arm, because the default toolchain on + that arch has Issues (closes: #135906, #135913). + + -- Steve Langasek Tue, 26 Feb 2002 09:59:49 -0600 + +php4 (4:4.1.1-2) unstable; urgency=medium + + * Rebuild with apache 1.3.23. + * This package is in maintainer change mode. Though I orphaned it I'm not + going to change maintainer to QA, because we already have fresh blood. + * ext/gd/gd.c: s/HAVE_GD_GIF/HAVE_GD_GIF_CREATE/ to build correctly with + libgd which has GIF support (fixed included upstream) + * debian/control: + - Build-Depends: s/libgd1g-dev/libgd-dev/ + also libc-client at least version 4:2001adebian-6 to fix some segfaults + * ext/standard/head.c: make the setcookie() thingie test more simple + + -- Petr Cech Mon, 11 Feb 2002 20:07:22 +0100 + +php4 (4:4.1.1-1) unstable; urgency=high + + * New upstream bugfix release. + * debian/control: php4-gd - Conflicts/Replaces: php4-gd2 if I ever get + to upload it + * debian/rules: Correctly supply modified CFLAGS to build process + + -- Petr Cech Fri, 28 Dec 2001 23:23:47 +0100 + +php4 (4:4.1.0-2) unstable; urgency=low + + * debian/php4-cgi.README.Debian: fix typo (closes: #123866) + * debian/rules: remove --enable-mbstr-enc-trans as it breaks parametr + parsing (closes: #121403) + * debian/README.Debian: document shmmax increase (closes: #119688) + + -- Petr Cech Fri, 14 Dec 2001 09:59:59 +0100 + +php4 (4:4.1.0-1) unstable; urgency=high + + * Finally final 4.1.0 + * Urgency to reflect previous version + * debian/control: php4-pear depends on php4-cgi + + -- Petr Cech Thu, 13 Dec 2001 23:09:54 +0100 + +php4 (3:4.1-2) unstable; urgency=high + + * FIxes from CSV 4.1.0RC5. Looks like it was not the release after all. + * ext/exif/exif.c: MFH + * ext/ldap/ldap.c: small crash fix from HEAD + * and misc tiny changes. Really :-) + * ext/imap/php_imap.c: HIGH. fix from CVS (imap_rfc822_parse_adrlist) changing + the argument + + -- Petr Cech Sun, 9 Dec 2001 00:01:37 +0100 + +php4 (3:4.1-1) unstable; urgency=medium + + * Final 4.1.0 (not released) + * NEWS: s/4.0/4.1/ + * Build with GD1. It should fix some GD bugs, as gd 2.0.1 is supposed to be + a beta version with known bugs. How should I know. + * sablot extension removed upstream. So use XSLT (C/R in place) + * Apply fix for file_exists() from tilo (closes: #114409) + * "Cannot redeclare" were fixed in previous RCs (closes: #112341) + * previous version is build in hppa and ia64, so I assume it + (closes: #115391) + * Add note to sybase_ct, that it conflicts with mod_gzip folowing a user + report. + * This should fix the "final HTML> stripped" bug that was introduced + in 4.0.6-3. (closes: #110415). + * add --enable-ucd-snmp-hack to try to fix segfaults with ucd-snmp + + -- Petr Cech Mon, 26 Nov 2001 14:56:50 +0100 + +php4 (3:4.0.100-1) unstable; urgency=low + + * Really a 4.1.0RC2 + * Remove hack for apache 1.3.14, as we build-depends on 1.3.22 anyway + * Build-depends: libexpat1 (>= 1.95.2-2.1) for the .1 + * Added Provides: zendapi-$version to php4 and php4-cgi + * Made modules depend on zendapi-$version instead of php4|php4-cgi. + Please use this in your php4-$module packages + * Apply c-client hack only to i386 most architectures don't support linking + both PIC and non-PIC code. I'm still affrai to do this on i386, as it + crashes a lot more :( + * Apply some CVS patches + + -- Petr Cech Wed, 14 Nov 2001 20:50:19 +0100 + +php4 (3:4.0.99-4) unstable; urgency=medium + + * Recompile because of new version of caudium. + (I really hope this gets into testing soon as php in testing + now doesn't do apache 1.3.22) + + -- Petr Cech Fri, 9 Nov 2001 11:11:46 +0100 + +php4 (3:4.0.99-3) unstable; urgency=medium + + * Recompile for new libexpat1 (closes: #116623 and others) + * upstream: ext/gd/gd.c, ext/iconv/iconv.c + * crypt(): defalt to using DES crypt() (closes: #117092) + * debian/rules: disable libmm in -cgi build. Will lesser the impact + of the infamous /tmp/session_mm.reg + * apply patch to Zend, which should fix the "cannot redeclare" error. + It's still a bug in your code though (use include_once). More changes + to this are comming (upstream). + * Add some documentation to sybase + + -- Petr Cech Mon, 22 Oct 2001 11:20:46 +0200 + +php4 (3:4.0.99-2) unstable; urgency=low + + * "Some days are just no good" release. + * Recompile with apache 1.3.22 from Incoming + * Deal with automake going to 1:1.4 and automake1.5 + + -- Petr Cech Fri, 19 Oct 2001 15:02:00 +0200 + +php4 (3:4.0.99-1) unstable; urgency=low + + * This is really 4.1.0RC1, but ... + * Applied setcookie(), which is not in upstream yet + + -- Petr Cech Fri, 19 Oct 2001 12:05:20 +0200 + +php4 (3:4.0.6.7rc3-3) unstable; urgency=medium + + * Fix dependency in caudium-php4. Sorry for this + + -- Petr Cech Fri, 19 Oct 2001 11:28:07 +0200 + +php4 (3:4.0.6.7rc3-2) unstable; urgency=medium + + * Recompile with recent caudium/pike. Please, no new version so it can get + into testing :) + * debian/control: move php4-pear to suggests + * Fix setcookie() again. I really hate this bug + * Build-Depends: re2c - it's usually not needed, but if you make some + strange changes to the parser ... + * FIx automake 1.5 build problems (I hope) + + -- Petr Cech Thu, 18 Oct 2001 12:03:39 +0200 + +php4 (3:4.0.6.7rc3-1) unstable; urgency=low + + * New upstream test release. + + -- Petr Cech Fri, 5 Oct 2001 09:23:35 +0000 + +php4 (3:4.0.6.7rc2-3) unstable; urgency=low + + * "Let's try to fix some bugs" release. + * Add some patches: ldap (does this fix things?), pgsql, + domxml + * Build-Conflicts: automake (>= 1.5) for now + + -- Petr Cech Tue, 2 Oct 2001 10:55:23 +0200 + +php4 (3:4.0.6.7rc2-2) unstable; urgency=low + + * Enable recode extension (the library is LGPL) - shared + * Enable iconv extension - in main php4. Experimental + * Build-Depends: s/libgd-dev/libgd2-dev/ + * Build-Depends: libxml2-dev (>= 2.4.2) (Closes: #112304) + and fix autoconf macros (Closes: #113980) + * Improve?? description of PEAR (Closes: #112432) + + -- Petr Cech Sat, 22 Sep 2001 10:37:42 +0200 + +php4 (3:4.0.6.7rc2-1) unstable; urgency=medium + + * 2nd release candidate + * ext/mbstring: fix compile (cp1252) + * ext/standard/url_scanner_ex: off by one + * WARNING: caudium builds with Zend Threading enabled, but other + modules don't. So you cannot safely use DSO with caudium + * Added some Build-Conflicts - with broken libmysqlclient + - with libtool 1.4b + + -- Petr Cech Mon, 10 Sep 2001 18:04:27 +0200 + +php4 (3:4.0.6-6) unstable; urgency=medium + + * The "Paul Hampson fixes release". + * Closed those atexit() bugs. Now to find out, how to make libtool link with + gcc instead of ld :(( + * ext/standard/head.c: Fix setcookie("bla) (closes: #109524, #109697) + Thanks to Paul Hampson for finding the cause, though I've used another + fix - fixed changes in CVS made in -3 I think. Silly me to think, that + all "small" changes are fixes. + * libc-client2001 was fixed in -5, so add a (closes: #109202) here + * Conflicts: only with libtool 1.4b-{1,2,3}. libtool 1.4.1 is OK + + -- Petr Cech Sat, 1 Sep 2001 20:59:40 +0200 + +php4 (3:4.0.6-5) unstable; urgency=low + + * Recompile for libc-client2001 (I hope it doesn't break anything else) + And many other libraries. + * ATTENTION. php4 still doesn't work with autoconf 2.52 and thus libtool 1.4b!! + You have to get libtool 1.4 to be able to use phpize. + + -- Petr Cech Wed, 22 Aug 2001 23:26:08 +0200 + +php4 (3:4.0.6-4) unstable; urgency=high + + * Add pear/CODING_STANDARDS into php4-pear (fixes 105574. closed too early. sorry) + * Fix the nasty segfaults with mail(). That'll teach me taking upstream + changes without looking. Thanks Cvetan Ivanov for the correct fix (also upstream now) + (closes: #105686, #105878). + + -- Petr Cech Fri, 20 Jul 2001 23:07:30 +0200 + +php4 (3:4.0.6-3) unstable; urgency=high + + * ext/standard/mail.c: security fix + * debian/control: Build-Depends: libtool (>= 1.4) + * ext/curl/curl.c: fix typo + * ext/gd/config.m4: fix typo + * ext/mcrypt/mcrypt.c: upstream buffer overflow fix + * ext/mhash/mhash.c: upstream buffer overflow fix + * ext/pgsql/pgsql.c: fix + * ext/posix/config.m4: check for getpgid + * ext/sablot/sablot.c: fix leaks + * ext/standard/url* : fixes + * ext/sysvshm/sysvshm.c: fixes + * Zend/*: small fixes + + -- Petr Cech Fri, 13 Jul 2001 16:21:04 +0200 + +php4 (3:4.0.6-2) unstable; urgency=low + + * pear/Makefile.in: add IT_Error.php to installed files (closes: #103087) + * debian/control: - allow also libcurl-ssl-dev as Build-Depends (closes: #103618) + - libfreetype6-dev to Build-Depends + - add auto* suite to php4-dev depends (closes: #104199) + * debian/rules: - build gd module with freetype2 support + - move common ./configure flags to COMMON_CONFIG + - build with mbstring support + + -- Petr Cech Fri, 13 Jul 2001 08:22:02 +0200 + +php4 (3:4.0.6-1) unstable; urgency=medium + + * New upstream release. + * NOTE: new extension will probably be in another upload, to get this + into testing ... + + -- Petr Cech Mon, 25 Jun 2001 20:43:24 +0200 + +php4 (3:4.0.5.6rc3-3) unstable; urgency=low + + * The "I hate sablot release". Recompile with 0.60 + * debian/php4-domxml.postrm: also fix the :: (closes: #101306) + * debian/rules: --enable-ctype - still EXPERIMENTAL!!! Bug upstream + + -- Petr Cech Mon, 18 Jun 2001 09:46:17 +0200 + +php4 (3:4.0.5.6rc3-2) unstable; urgency=low + + * ext/sablot/config.m4: link sablot.so with -lsablot, not main php4 + * build/ ... : upstream fix for building with automake 1.4-pX + * don't fail, when libssl-dev is not installed. sigh + + -- Petr Cech Thu, 14 Jun 2001 23:36:34 +0200 + +php4 (3:4.0.5.6rc3-1) unstable; urgency=low + + * New upstream test release. + * Recompile with apache 1.3.20 + * debian/control: + - php4-dev: Depends: bison, flex (closes: #100634) + - Build-Depends: libcurl-dev (>=7.8) + * debian/rules: + - add --enable-bcmath to all rules (closes: #100491) + * Zend/zend.c: apply upstream fix to allow building of caudium + + -- Petr Cech Tue, 12 Jun 2001 22:27:26 +0200 + +php4 (3:4.0.5.6rc2-1) unstable; urgency=low + + * New upstream test release. + * FIx regex/regex.h (int regoff_t) + * fix php4-cgi build with pcre - don't use supplied pcre + * Fix wddx support (closes: #99468) + * Add missing $(INSTALL_ROOT) to sapi/caudium/config.m4 + + -- Petr Cech Fri, 8 Jun 2001 11:37:07 +0200 + +php4 (3:4.0.5.6rc1-1) unstable; urgency=low + + * New upstream test release with new bugs :)) + * moved pear from /usr/lib/php4 to /usr/share/php4 + * Whups. Sorry about the epoch 3: . It somehow slipped in, so I'll + have to live with it + + -- Petr Cech Wed, 16 May 2001 14:14:04 +0200 + +php4 (3:4.0.5-2) unstable; urgency=low + + * Build-Depend on newer libmhash-dev, as it supposedly doesn't + compile on current woody (closes: #96555) + * Build-Depends: s/freetype2/libttf-dev/ + * Stop building php4-pgsql - move to non-US + * Build-Deps on new libsablot0 + + -- Petr Cech Thu, 10 May 2001 10:43:02 +0200 + +php4 (3:4.0.5-1) unstable; urgency=medium + + * New upstream release. + * recompile with new sablot - how I hate this (closes: #95401) + * Merge XML into main php4 + * Reword README.Debian (closes: #89667) + * Enable wddx + * debian/*.postinst: * only ask upon first install, not upgrade (closes: #93452) + * fix typos (closes: #94118) + * Added support for Sybase/MS SQL Server (using FreeTDS) + using patch from: + http://rpms.arvin.dk/php/source/patches/php-sybase_ct.patch + thanks to Bradley Bell for the patch + * ext/pcre : two upstream fixes + * ext/sablot/sablot.c: small upstream fix + * build/buildcheck.sh : fixes to allow compile with libtool 1.4 + * ext/standard/exec.c: upstream fixes + * sapi/apache/mod_php4.c: off by one fix + * sapi/cgi/cgi_main.c: fix POST bug + * main/snprintf.c: upstream fix + + -- Petr Cech Wed, 3 May 2001 22:17:10 +0200 + +php4 (4.0.4.5rc6-2) unstable; urgency=low + + * Build-depends: libcurl-dev will pull libcurl2 (closes: #92994) + * TSRM/TSRM.c: upstream fix + * ext/pgsql: upstream fix + + -- Petr Cech Thu, 5 Apr 2001 17:51:09 +0200 + +php4 (4.0.4.5rc6-1) unstable; urgency=low + + * New upstream test release. + * Don't mention CGI support, as it's not so for a long time. + + -- Petr Cech Wed, 4 Apr 2001 13:47:45 +0200 + +php4 (4.0.4.5rc5-1) unstable; urgency=low + + * New upstream test release. + * ask about /etc/php4/cgi/php.ini also + * It's really recompiled for 1.3.19 (closes: #91901, #91822) + * problems with modules documented (closes: #81141, #82611) + + -- Petr Cech Mon, 2 Apr 2001 09:38:16 +0200 + +php4 (4.0.4.5rc3-1) unstable; urgency=low + + * New upstream RC release + * debian/rules: s/with-yp/enable-yp/ to really enable YP support. Discovered + on broken potato upload. -0potato2 is fixed + * Looks like there was a bug in latest build, this should fix it (closes: #92018) + * remove libmcal0 workaround + + -- Petr Cech Wed, 28 Mar 2001 21:15:36 +0200 + +php4 (4.0.4.5rc2-1) unstable; urgency=low + + * New upstream release test release 4.0.5RC2. + * debian/rules: Add lintian overrides + * debian/control: * add libexpat1-dev to Build-Depends + * add libmcal0 to Build-Depends since libmcal0-dev is + missing this dependancy :(( Bug filled + * ext/socket/socket.c: minor upstream patch + + -- Petr Cech Mon, 26 Mar 2001 20:43:49 +0200 + +php4 (4.0.4pl1-6) unstable; urgency=low + + * NEVER RELEASED + * Build-depends on libcurl1-dev (>= 7.6.1-5), which fixes the libcurl1 or + libcurl1-ssl problem. + * remove dh_testversion and use versioned Build-depends instead + + -- Petr Cech Tue, 13 Mar 2001 23:20:58 +0100 + +php4 (4.0.4pl1-5) unstable; urgency=low + + * Add lintian overrides + * Rebuild with correct libgd-dev installed. Sorry + (closes: #88490, #88255, #88371, #88619, #88635) + * Closed by fixed libjpeg (closes: #85865, #88141) + + -- Petr Cech Tue, 6 Mar 2001 17:26:41 +0100 + +php4 (4.0.4pl1-4) unstable; urgency=low + + * The "Enable what you can" release. + * Enable sablot extension (many files) (closes: #84073) + * Enable mcal extension (finaly closes: #65688, #85925) + * Build-Conflicts: bind-dev - this supposedly causes unresolved symbols. + Why? + * ext/pgsql/pgsql.c: apply tiny patch, which should fix postgres + problems. There is a better patch in CVS, but it needs changes to Zend + * pear/pear.in: binary is php4 no php (closes: #87848) + * ext/domxml/config.m4: link with -lxml2 (closes: #87457) + * debian/README.Debian: add notes about ldap, imap and mhash extensions + * debian/{control,rules}: activate bz2 extension + * php4.ini-dist: comment out include_path so php will use compiled in + path (closes 2nd part of 87848) + + -- Petr Cech Wed, 28 Feb 2001 10:18:11 +0100 + +php4 (4.0.4pl1-3) unstable; urgency=medium + + * Fixed postrm issues. Sorry + + -- Petr Cech Sun, 4 Feb 2001 06:13:00 +0100 + +php4 (4.0.4pl1-2) unstable; urgency=medium + + * debian/control: Build-depends: xlibs-dev (seems it's missing and causes + failed builds for arm, m68k and powerpc) + s/libsnmp4.1/libsnmp4.2/ (closes: #84139) + * debian/php4.*: make LoadModule matching case insensitive (fixes 83641 + for unstable) + + -- Petr Cech Wed, 31 Jan 2001 10:14:29 +0100 + +php4 (4.0.4pl1-1) unstable; urgency=high + + * New upstream version. + * This release fixes some security problems. + * Some patches from previous versions are not here. + * debian/control: Build-depends on newer libcurl1-dev, remove librecode-dev + * debian/control: add libjpeg62-dev to build-depends from powerpc buildlog + (hmm. Where ir Roman?) + * debian/php4{,-cgi}.postinst: don't mark php.ini as conffile and install it + when it doesn't already exist. I should find a way to check, that the default + php.ini changed and user should update it. + * debian/php4{,-cgi}.postrm: cleanup the /etc/php4 dir after purge + * fix xml.so not working with php4-cgi + + -- Petr Cech Thu, 23 Jan 2001 11:12:59 +0100 + +php4 (4.0.4final-6) unstable; urgency=medium + + * OK. Now also fix the prerm issues (closes: #81418) and to ease + that thanks for submiting bugs (closes: #81818, #81819) + * some upstream updates: browsercap, php-config + + -- Petr Cech Wed, 10 Jan 2001 14:04:19 +0100 + +php4 (4.0.4final-5) unstable; urgency=medium + + * OK. Take a deep breath and fix those bloody postinst + bugs - fix it and rewrite from ed -> sed, because ed is not essential :( + closes: #80801. + * apply some upstream fixes. + * disable ctype extension - not yet ready + + -- Petr Cech Tue, 2 Jan 2001 13:40:35 +0100 + +php4 (4.0.4final-4) unstable; urgency=low + + * debian/libc-client.la: add -lpam -ldl -lcrypt + * fix php4-cgi.postinst bugs (closes: #80817, #80805, #80801) + + -- Petr Cech Fri, 29 Dec 2000 11:40:43 +0100 + +php4 (4.0.4final-3) unstable; urgency=low + + * Brown Xmas Sock Release + * Grr. correctly fix the php4 postinst error + (closes: #80303, #80324, #80326, #80359) + NMU by Wichert Akkerman (closes: #80381) + * also fix php4-cgi. NMU by Marcelo E. Magallon + (closes: #80406). + * fix fix for php4-cgi postinst s/apache/cgi/ + * apply some upstream fixes to ext/session/ + * domxml/config.m4: fix my -Lshared,/usr/lib error + * debian/rules: + * add --enable-ctype to both targets + * --diable-pear to CGI target + * generate Depends: php4 (=ver) | php4-cgi (=ver) + + -- Petr Cech Wed, 27 Dec 2000 15:29:56 +0100 + +php4 (4.0.4final-2) unstable; urgency=low + + * Run apacheconfig with --force-modules. + * Fix stupid bug in php4 and php4-cgi postinst. + * ext/sysvshm/sysvshm.c : upstream fix + + -- Petr Cech Thu, 21 Dec 2000 22:58:27 +0100 + +php4 (4.0.4final-1) unstable; urgency=low + + * New upstream version. + * Sorry for the version, but da-katie doesn't allow overwriting of files, notably + .orig.tar.gz. It's my fault I know, but it worked till now. + + -- Petr Cech Wed, 20 Dec 2000 01:32:34 +0100 + +php4 (4.0.4-0RC6.1) unstable; urgency=low + + * OK. Final final RC for 4.0.4. + * Build-depends on libxml2-dev (>= 2.2.7) because php needs this. + * Activate ndbm dba driver. + + -- Petr Cech Sun, 17 Dec 2000 19:43:51 +0100 + +php4 (4.0.4-0RC5.1) unstable; urgency=low + + * UNRELEASED. + * Final RC for 4.0.4. + * Some mods to README.Debian and TODO + + -- Petr Cech Wed, 13 Dec 2000 00:01:08 +0100 + +php4 (4.0.4-0RC4.1) unstable; urgency=low + + * New upstream beta release. Let's stabilize things now and add new + modules after final release of 4.0.4. + + -- Petr Cech Thu, 7 Dec 2000 10:12:11 +0100 + +php4 (4.0.4-0RC3.2) unstable; urgency=low + + * recompile with new libc-client200-dev. + * fix source recompile + * depend on fixed apache 1.3.14-2 + + -- Petr Cech Thu, 7 Dec 2000 00:49:14 +0100 + +php4 (4.0.4-0RC3.1) unstable; urgency=low + + * New upstream beta release. + * Add libxml2-dev to build-depends (closes: #78479). + * implement DEB_BUILD_OPTIONS + * fix apache build wrt. apxs + * fix typo in description of curl modules (closes: #78828) + + -- Petr Cech Tue, 5 Dec 2000 14:22:30 +0100 + +php4 (4.0.3pl1-7) unstable; urgency=low + + * Rebuild with apache 1.3.14-1 + + -- Petr Cech Fri, 1 Dec 2000 01:41:41 +0100 + +php4 (4.0.3pl1-6) unstable; urgency=low + + * add --enable-memory-limit + * add --enable-exif per request from William Ono. + * Add Suggests: phpdoc (yes. it's here). + * ext/standard/crypt.c - fix from CVS. + * ext/ftp/ftp.{c,h} - fix mkdir() and RETR, STOR + * ext/gd/gd.c - add format string + - add XBM to phpinfo() + * ext/imap/php_imap.{c,h} - CVS fixes + * main/main.c - fix CGI crash + - add HTTP_SERVER_VARS in CGI mode + * and many more. Taken from php4.srpm (thanks :)) + * recompile with apache 1.3.12-2.2 + * and hack large files support into DSO module. php4 doesn't use it now :(( + + -- Petr Cech Thu, 30 Nov 2000 00:01:39 +0100 + +php4 (4.0.3pl1-5) unstable; urgency=low + + * Back out changes about --enable-versioning + * ext/domxml/php_domxml.c : fix compilation with recent libxml2 (>=2.2.7) + + -- Petr Cech Tue, 21 Nov 2000 18:03:56 +0100 + +php4 (4.0.3pl1-4) unstable; urgency=low + + * Clarify README.Debian about the DB change a bit (dbm_ -> dba_*) + * Remove aliasing hack - deprecated upstream. (closes: #76558) + * Compile with libgd-dev again (Write 100x always reinstall libgd-dev). + * --enable-versioning and tweak debian/control a bit, let's see, what breaks + + -- Petr Cech Tue, 14 Nov 2000 10:00:54 +0100 + +php4 (4.0.3pl1-3) unstable; urgency=low + + * Activate curl module. + * Really enable shmop module. + * Fix include paths in phpize. Now everyone should be able to easilly build + php4 extension modules (php4-dbase anyone?). + + -- Petr Cech Mon, 6 Nov 2000 23:17:41 +0100 + +php4 (4.0.3pl1-2) unstable; urgency=low + + * Build with libgd-dev installed (NOT libgd-gif). + + -- Petr Cech Tue, 17 Oct 2000 02:08:36 +0200 + +php4 (4.0.3pl1-1) unstable; urgency=medium + + * New upstream bugfix release. + * Depend on libopenldap1 as with the newer ldap module crashes php&apache. + + -- Petr Cech Mon, 16 Oct 2000 15:30:55 +0200 + +php4 (4.0.3-2) unstable; urgency=high + + * Urgency=high because last upload didn't have it ad it fixes some + security holes. + * ext/domxml/config.m4: don't try to build then --without-domxml + + -- Petr Cech Thu, 12 Oct 2000 12:50:17 +0200 + +php4 (4.0.3-1) unstable; urgency=low + + * New upstream release. + - fixes also some string format bugs + * Build with fixed libmysqlclient10-dev. + + -- Petr Cech Thu, 12 Oct 2000 00:00:07 +0200 + +php4 (4.0.2-7) unstable; urgency=low + + * Really, really install libldap2-dev. + * Workaround broken libmysqlclient9-dev. It has broken (again) .so symlink. + + -- Petr Cech Tue, 10 Oct 2000 22:28:48 +0200 + +php4 (4.0.2-6) unstable; urgency=low + + * Again fix description a little bit. + * Correct build-depends. + * Sic. Recompile, because I've busted (libopenldap-dev instead of + libldap2-dev was installed). + * While at it install also new apache glibc NMU and recompile with it. + * Move PEAR from php4-dev to php4 and install ALL of PEAR. + * add --prefix=/usr + * debhelper v2 + * prepare for CURL module + * Updated README.Debian + * updated XML module from php4 CVS to close: #72360 + + -- Petr Cech Mon, 2 Oct 2000 14:36:35 +0200 + +php4 (4.0.2-5) unstable; urgency=low + + * Correct build-depends (libgd1-dev -> libgd-dev). Where is Roman? :) + * Add libdb2-dev (>= 2:2.7.7-2.1) to build-depends for glibc 2.1.94. + * and recompile with glibc 2.1.94 to fix it. + + -- Petr Cech Wed, 27 Sep 2000 09:00:27 +0200 + +php4 (4.0.2-4) unstable; urgency=low + + * Tweak description a little bit more. + + -- Petr Cech Sun, 24 Sep 2000 23:58:15 +0200 + +php4 (4.0.2-3) unstable; urgency=low + + * Add info about what modules and why are enabled/disabled + into README.Debian. + * Install not so many docs (only in -dev now). + * Enable calendar and sockets modules. + * Rearange package descriptions so module-specific comments + go first. + * Create domxml module aka xmlv2. + * Fix spelling wan't -> want (closes: #70544). + * Add libraries for gd module only when linking this one + and not globaly (closes: #71623). + * Say that we wait for ENTER (closes: #71769). + * Fix logic in prerm script (closes: #71770). + + -- Petr Cech Sun, 24 Sep 2000 17:54:52 +0000 + +php4 (4.0.2-2) unstable; urgency=low + + * Add info about what modules and why are enabled/disabled + into README.Debian. + * Install not so many docs (only in -dev now). + * Enable calendar and sockets modules. + * Rearange package descriptions so module-specific comments + go first. + * Create domxml module aka xmlv2. + * Fix building (small typo). + * Compile with libmysqlclient9-dev installed. + + -- Petr Cech Mon, 18 Sep 2000 23:46:40 +0200 + +php4 (4.0.2-1) unstable; urgency=low + + * The "Back from vacation" release. + * New upstream fixed (and bugs). + * Correct postm script (only cosmetic) closes: #67350, #68541 + * build with libpcre3, libldap2 + * Use modified patch from -3 (remove #define XML_... php_XML_...) + + -- Petr Cech Thu, 7 Sep 2000 23:17:59 +0200 + +php4 (4.0.1pl2-3) unstable; urgency=low + + * UNRELEASED + * Fixed the XML packages. + + -- Norman Jordan Thu, 10 Aug 2000 21:45:15 +0000 + +php4 (4.0.1pl2-2) unstable; urgency=low + + * Fix source archive. + + -- Petr Cech Tue, 11 Jul 2000 11:04:48 +0000 + +php4 (4.0.1pl2-1) unstable; urgency=low + + * New upstream bug fix release (variation of the patches in -2) + * Build with new libgd1 library (maybe still in Incoming) + * Move PEAR stuff to php4 package (closes: #66897). + + -- Petr Cech Sun, 9 Jul 2000 09:01:06 +0000 + +php4 (4.0.1-2) unstable; urgency=low + + * Apply some CVS diffs in an attempt to fix opendir() problems. + + -- Petr Cech Fri, 30 Jun 2000 09:04:24 +0000 + +php4 (4.0.1-1) unstable; urgency=low + + * New upstream release (taken from CVS tag php_4_0_1). + * --with-regex=system else it plays havoc. Dunno why ... + * remove autoconf,automake,aclocal from configure rules. + * Fix description of XML --help message (no, it's not MySQL). + + -- Petr Cech Wed, 28 Jun 2000 22:55:16 +0200 + +php4 (4.0.0-4) unstable; urgency=low + + * Add -dev package (closes: #65907). + * Add -cgi and -cgi-* packages (closes: #51097, #52855). + * --enable-filepro + * Tweak copyright file a bit. + * Generate mhash module (closes part of 63186). + * Ask to remove libphp4 from httpd.conf upon remove/purge. + * Fixed build-depends, thanks to Roman Hodek (closes: #65938). + (I told you the first time it won't work :)) + * Mark /etc/php4/cgi/php.ini as conffile. + * Every module now ask if it should be enabled on install + (if it's not already) and disabled on remove/purge. + + -- Petr Cech Tue, 20 Jun 2000 14:29:01 +0200 + +php4 (4.0.0-3) unstable; urgency=low + + * Ship correct php.ini (extension_dir=/usr/lib/php4/apache). + * Don't use included libmysqlclient and use system one (fixes + wrong location of mysqld.sock) + * link XML module dynamicly with system xmlparse and xmltok. + + -- Petr Cech Wed, 14 Jun 2000 22:30:07 +0000 + +php4 (4.0.0-2) unstable; urgency=low + + * fix the IS_SLASH bug (closes: #65625 and probably others as well). + * Really change the maintainer field. + + -- Petr Cech Wed, 14 Jun 2000 07:44:05 +0000 + +php4 (4.0.0-1) unstable; urgency=low + + * New maintainer. + * New upstream release. + * Fix dynamic module loading. + * Added Build-Depends (I wonder, if I got them right) + * Standards-Version: 3.1.1 + + -- Petr Cech Tue, 13 Jun 2000 13:40:56 +0000 + +php4 (4.0rc1-2) unstable; urgency=low + + * Compile with latest apache and libraries from woody + (Closes: #62631, #62640) + + -- Gergely Madarasz Wed, 19 Apr 2000 14:39:25 +0200 + +php4 (4.0rc1-1) unstable; urgency=low + + * New upstream version + * Fix db2 support (Closes: #61709) + * Fix gd support (Closes: #61708) + * Remove ucd-snmp-hack from config options + + -- Gergely Madarasz Sun, 16 Apr 2000 17:04:05 +0200 + +php4 (4.0b4pl1-2) unstable; urgency=low + + * Build with --disable-debug so it should work with the zend + optimizer (Closes: #60265) + * Build with --enable-trans-sid (Closes: #60430) + * Write some more about php4/php3 differences in the description + (Closes: #60155) + + -- Gergely Madarasz Fri, 17 Mar 2000 17:35:29 +0100 + +php4 (4.0b4pl1-1) unstable; urgency=low + + * New upstream version + * Upstream reorganized the build system quite a bit, lots of patches + removed + + -- Gergely Madarasz Wed, 23 Feb 2000 17:16:00 +0100 + +php4 (4.0b3-4) unstable; urgency=low + + * Add /etc/php4/apache/php.ini to conffiles (Closes: #54194) + * Add info file for apacheconfig + * Offer to run apacheconfig and/or apache-sslconfig in postinst + * Comment out sendmail_path from php.ini so the default sendmail path + should work (Closes: #51355) + + -- Gergely Madarasz Thu, 6 Jan 2000 14:38:20 +0100 + +php4 (4.0b3-3) unstable; urgency=low + + * Compile with libgd instead of libgd-gif + + -- Gergely Madarasz Tue, 4 Jan 2000 18:07:56 +0100 + +php4 (4.0b3-2) unstable; urgency=low + + * Build imap and ldap modules + * Fix rm -f in rules file (Closes: #51623) + + -- Gergely Madarasz Mon, 3 Jan 2000 16:54:19 +0100 + +php4 (4.0b3-1) unstable; urgency=low + + * Initial Release. + + -- Gergely Madarasz Tue, 16 Nov 1999 19:33:42 +0100 + --- php5-5.3.6.orig/debian/NEWS +++ php5-5.3.6/debian/NEWS @@ -0,0 +1,92 @@ +php5 (5.3.6-13) unstable; urgency=low + + * Updated blowfish crypt() algorithm fixes the 8-bit character handling + vulnerability (CVE-2011-2483) and adds more self-tests. Unfortunately + this change is incompatible with some old (wrong) generated hashes for + passwords containing 8-bit characters. Therefore the new salt prefix + '$2x$' was introduced which can be used as a replacement for '$2a$' + salt prefix in the password database in case the incompatibility is + found. + + -- Ondřej Surý Mon, 04 Jul 2011 10:31:16 +0200 + +php5 (5.3.1-3) unstable; urgency=low + + * mod_php disabled in userdirs. + + The default Debian libapache2-mod-php5 package now disables the PHP + engine on ~/public_html directories when mod_userdir is enabled, for + security reasons. Although discouraged, it can be re-enabled by + commenting the block in + /etc/apache2/mods-available/php5.conf + + * PHP 5.2 compatibility settings + + Given the short time to the Squeeze release freeze, the + short_open_tag setting has been turned On again (upstream now + defaults to Off on the php.ini files.) However, the request_order and + auto_globals_jit settings continue to be the default from upstream + ("GP" and On, respectively.) + + -- Raphael Geissert Mon, 11 Jan 2010 16:49:28 -0600 + +php5 (5.2.11.dfsg.1-2) unstable; urgency=high + + * Maximum number of file uploads per request limited + + To prevent Denial of Service attacks by exhausting the number of + available temporary file names, upstream introduced the max_file_uploads + option in 5.3.1 and 5.2.12. + + Due to the nature of this new option a default limit has been set + to 50, hoping it is sensible enough to not to cause disruptions on + existing services. + The value of this new limit can be changed in the php.ini file. + + If you installed the php5-suhosin extension there was a limiting + mechanism in place already. In this case you may want to make sure + the new limit imposed by PHP itself is not smaller than suhosin's. + + -- Raphael Geissert Sat, 21 Nov 2009 13:37:51 -0600 + +php5 (5.2.6-1) unstable; urgency=medium + + * Now uses system timezone database. + + Debian PHP now makes use of the system wide timezone database from the + tzdata package, making sure any updates there are automatically used + by PHP aswell. Note that this requires that the PHP process has access + to /etc/localtime and /usr/share/zoneinfo (this is usually the case). + + * New php5-dbg package. + + We are now shipping a php5-dgb package which will greatly aid in finding + the cause of many crashes that you may experience. So if you are going to + report a bug for a reproducible crash, please install this package before + sending a backtrace. + + * New libapache2-mod-php5filter package. + + We are now also shipping a new libapache2-mod-php5filter package which + uses the "Apache 2.0 filter-module support via DSO through APXS". + + -- Thijs Kinkhorst Wed, 23 Jul 2008 17:42:06 +0200 + +php5 (5.2.3-2) unstable; urgency=low + + The Suhosin patch is now enabled by default! + + For more information, see + . + + Special thanks to Blars Blarson for providing a sparc machine for testing + that the patch seems to work okay on that architecture. If you experience + otherwise let us know! + + Suggestions are welcome for default configuration options, examples, + documentation, etc. + + In any event please report successes and/or failures to us at + pkg-php-maint@lists.alioth.debian.org. + + -- sean finney Thu, 12 Jul 2007 23:38:43 +0200 --- php5-5.3.6.orig/debian/php5-cgi.postinst +++ php5-5.3.6/debian/php5-cgi.postinst @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +phpini="/etc/php5/cgi/php.ini" + +ucf /usr/share/php5/php.ini-production $phpini +ucfr php5-cgi $phpini + +update-alternatives \ + --install /usr/bin/php-cgi php-cgi /usr/bin/php5-cgi 50 \ + --slave /usr/share/man/man1/php-cgi.1.gz php-cgi.1.gz /usr/share/man/man1/php5-cgi.1.gz + +update-alternatives \ + --install /usr/lib/cgi-bin/php php-cgi-bin /usr/lib/cgi-bin/php5 50 + +exit 0 --- php5-5.3.6.orig/debian/control +++ php5-5.3.6/debian/control @@ -0,0 +1,482 @@ +Source: php5 +Section: php +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers +Uploaders: Ondřej Surý , + Sean Finney , + Thijs Kinkhorst , + Raphael Geissert +Build-Depends: apache2-prefork-dev, + autoconf (>= 2.63), + automake (>= 1.11) | automake1.11, + bison, + chrpath, + debhelper (>= 5), + flex, + freetds-dev, + hardening-wrapper, + libapr1-dev (>= 1.2.7-8), + libbz2-dev, + libcurl4-openssl-dev, + libdb-dev, + libenchant-dev, + libevent-dev (>= 1.4.11), + libexpat1-dev (>= 1.95.2-2.1), + libfreetype6-dev, + libgcrypt11-dev, + libgd2-xpm-dev, + libglib2.0-dev, + libgmp3-dev, + libicu-dev, + libjpeg-dev | libjpeg62-dev, + libkrb5-dev, + libldap2-dev, + libmagic-dev, + libmhash-dev (>= 0.8.8), + libmysqlclient-dev, + libpam0g-dev, + libpcre3-dev (>= 6.6), + libpng12-dev, + libpq-dev, + libpspell-dev, + librecode-dev, + libsasl2-dev, + libsnmp-dev, + libsqlite3-dev, + libssl-dev, + libt1-dev, + libtidy-dev, + libtool (>= 2.2), + libwrap0-dev, + libxmltok1-dev, + libxml2-dev, + libxslt1-dev (>= 1.0.18), + lemon, + mysql-server-core-5.1, + mysql-client-5.1, + locales-all | language-pack-de, + netbase, + netcat-openbsd | netcat, + quilt, + re2c, + unixodbc-dev, + zlib1g-dev, + libedit-dev, + tzdata +Build-Conflicts: bind-dev +Standards-Version: 3.9.2 +Vcs-Git: git://git.debian.org/pkg-php/php.git +Vcs-Browser: http://git.debian.org/?p=pkg-php/php.git +Homepage: http://www.php.net/ + +Package: php5 +Architecture: all +Depends: ${misc:Depends}, libapache2-mod-php5 (>= ${source:Version}) | libapache2-mod-php5filter (>= ${source:Version}) | php5-cgi (>= ${source:Version}) | php5-fpm (>= ${source:Version}), php5-common (>= ${source:Version}) +Description: server-side, HTML-embedded scripting language (metapackage) + This package is a metapackage that, when installed, guarantees that you + have at least one of the four server-side versions of the PHP5 interpreter + installed. Removing this package won't remove PHP5 from your system, however + it may remove other packages that depend on this one. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-common +Architecture: any +Depends: ${misc:Depends}, sed (>= 4.1.1-1), ${shlibs:Depends} +Suggests: php5-suhosin +Provides: php5-json, php5-mhash +Conflicts: php5-json, php5-mhash +Description: Common files for packages built from the php5 source + This package contains the documentation and example files relevant to all + the other packages built from the php5 source. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: libapache2-mod-php5 +Section: httpd +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata +Conflicts: libapache2-mod-php4, libapache2-mod-php5filter +Provides: ${php:Provides} +Recommends: php5-cli +Suggests: php-pear +Description: server-side, HTML-embedded scripting language (Apache 2 module) + This package provides the PHP5 module for the Apache 2 webserver (as + found in the apache2-mpm-prefork package). Please note that this package + ONLY works with Apache's prefork MPM, as it is not compiled thread-safe. + . + ${php:Extensions} + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: libapache2-mod-php5filter +Section: httpd +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata +Conflicts: libapache2-mod-php4, libapache2-mod-php5 +Provides: ${php:Provides} +Suggests: php-pear +Description: server-side, HTML-embedded scripting language (apache 2 filter module) + This package provides the PHP5 Filter module for the Apache 2 webserver (as + found in the apache2-mpm-prefork package). Please note that this package + ONLY works with Apache's prefork MPM, as it is not compiled thread-safe. + . + Unless you specifically need filter-module support, you most likely + should instead install libapache2-mod-php5. + . + ${php:Extensions} + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-cgi +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata +Provides: ${php:Provides} +Suggests: php-pear +Description: server-side, HTML-embedded scripting language (CGI binary) + This package provides the /usr/lib/cgi-bin/php5 CGI interpreter built + for use in Apache 2 with mod_actions, or any other CGI httpd that + supports a similar mechanism. Note that MOST Apache users probably + want the libapache2-mod-php5 package. + . + ${php:Extensions} + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-cli +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata +Provides: ${php:Provides} +Suggests: php-pear +Description: command-line interpreter for the php5 scripting language + This package provides the /usr/bin/php5 command interpreter, useful for + testing PHP scripts from a shell or performing general shell scripting tasks. + . + ${php:Extensions} + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-fpm +Architecture: any +Pre-Depends: dpkg (>= 1.15.7.2) +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata +Provides: ${php:Provides} +Suggests: php-pear +Description: server-side, HTML-embedded scripting language (FPM-CGI binary) + This package provides the Fast Process Manager interpreter that runs + as a daemon and receives Fast/CGI requests. Note that MOST Apache users + probably want the libapache2-mod-php5 package. + . + ${php:Extensions} + . + PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write dynamically + generated pages quickly. This version of PHP5 was built with the Suhosin patch. + +Package: php5-dev +Depends: ${misc:Depends}, autoconf (>= 2.63), automake (>= 1.11), libssl-dev, libtool (>= 2.2), shtool, php5-common (>= ${binary:Version}) +Conflicts: ${libtool:Conflicts} +Architecture: any +Description: Files for PHP5 module development + This package provides the files from the PHP5 source needed for compiling + additional modules. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-dbg +Depends: ${misc:Depends}, php5-common (= ${binary:Version}), libapache2-mod-php5 (= ${binary:Version}) | libapache2-mod-php5filter (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | php5-cli (= ${binary:Version}) | php5-fpm (= ${binary:Version}) | php5-curl (= ${binary:Version}) | php5-enchant (= ${binary:Version}) | php5-gd (= ${binary:Version}) | php5-gmp (= ${binary:Version}) | php5-intl (= ${binary:Version}) | php5-ldap (= ${binary:Version}) | php5-mysql (= ${binary:Version}) | php5-odbc (= ${binary:Version}) | php5-pgsql (= ${binary:Version}) | php5-pspell (= ${binary:Version}) | php5-recode (= ${binary:Version}) | php5-snmp (= ${binary:Version}) | php5-sqlite (= ${binary:Version}) | php5-sybase (= ${binary:Version}) | php5-tidy (= ${binary:Version}) | php5-xmlrpc (= ${binary:Version}) | php5-xsl (= ${binary:Version}) +Recommends: gdb +Section: debug +Priority: extra +Architecture: any +Description: Debug symbols for PHP5 + This package provides the debug symbols for PHP5 needed for properly + debugging errors in PHP5 with gdb. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php-pear +Architecture: all +Depends: ${misc:Depends}, php5-common (>= ${source:Version}), php5-cli +Recommends: gnupg, php5-dev +Conflicts: php-xml-util +Replaces: php4-pear (<< 4:4.4.0-0), php-xml-util +Provides: php-xml-util +Description: PEAR - PHP Extension and Application Repository + This package contains the base PEAR classes for PHP, as well as the PEAR + installer. Many PEAR classes are already packaged for Debian, and can be + easily identified by names beginning with "php-", such as php-db and + php-auth. Note: to build and install precompiled PECL extensions, you + will need one of the php development packages installed. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-curl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: CURL module for php5 + CURL is a library for getting files from FTP, GOPHER, HTTP server. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-enchant +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: Enchant module for php5 + This package provides a module for the generic spell checking library + Enchant, which can use engines such as ispell, aspell and myspells. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-gd +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: GD module for php5 + This package provides a module for handling graphics directly from PHP + scripts. It supports the PNG, JPEG, XPM formats as well as Freetype/ttf fonts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-gmp +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: GMP module for php5 + This package provides a module for arbitrary precision arithmetic via the + GNU Multiple Precision (GMP) Arithmetic Library. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-intl +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) +Conflicts: php5-idn +Replaces: php5-idn +Provides: php5-idn +Description: internationalisation module for php5 + This package provides a module to ease internationalisation of PHP scripts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-ldap +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: LDAP module for php5 + This package provides a module for LDAP functions in PHP scripts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-mysql +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Conflicts: php5-mysqli +Replaces: php5-mysqli +Description: MySQL module for php5 + This package provides modules for MySQL database connections directly from + PHP scripts. It includes the generic "mysql" module which can be used + to connect to all versions of MySQL, an improved "mysqli" module for + MySQL version 4.1 or later, and the pdo_mysql module for use with + the PHP Data Object extension. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-odbc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: ODBC module for php5 + This package provides a module for database access through ODBC drivers. + It uses the unixODBC library as an ODBC provider. It also contains the + pdo_odbc module, for use with the PHP Data Object extension. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-pgsql +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: PostgreSQL module for php5 + This package provides a module for PostgreSQL database connections + directly from PHP scripts. It also includes the pdo_pgsql module for + use with the PHP Data Object extension. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-pspell +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) +Description: pspell module for php5 + This package provides a module for pspell functions in PHP scripts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-recode +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: recode module for php5 + This package provides a module for recode - character set recoding. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-snmp +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: SNMP module for php5 + This package provides a module for SNMP functions in PHP scripts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-sqlite +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: SQLite module for php5 + This package provides a module allowing you to use the SQLite self-contained + database engine from within your PHP scripts, eliminating the need for a full + SQL server installation like MySQL or PostgreSQL. It also includes the + pdo_sqlite module, for use with the PHP Data Object extension. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-sybase +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Provides: php5-mssql +Description: Sybase / MS SQL Server module for php5 + This package provides a module for Sybase and Microsoft SQL Server + database connections directly from PHP scripts. It also includes the + pdo_dblib module for use with the PHP Data Object extension. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-tidy +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) +Description: tidy module for php5 + This package provides a module for tidy functions in PHP scripts. + . + Tidy is an extension based on Libtidy (http://tidy.sf.net/) and allows + a PHP developer to clean, repair, and traverse HTML, XHTML, and XML + documents -- including ones with embedded scripting languages such as PHP + or ASP within them using OO constructs. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-xmlrpc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: XML-RPC module for php5 + This package provides a module for XML-RPC functions in PHP scripts. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. + +Package: php5-xsl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) +Description: XSL module for php5 + This package provides a module for XSL using the libxslt XSL parser. + . + PHP5 is a widely-used general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. + The goal of the language is to allow web developers to write + dynamically generated pages quickly. This version of PHP5 was built + with the Suhosin patch. --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.conf +++ php5-5.3.6/debian/libapache2-mod-php5filter.conf @@ -0,0 +1,6 @@ + + + SetInputFilter PHP + SetOutputFilter PHP + + --- php5-5.3.6.orig/debian/php5-module.postinst +++ php5-5.3.6/debian/php5-module.postinst @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +#EXTRA# +#DEBHELPER# --- php5-5.3.6.orig/debian/libapache2-mod-php5.prerm +++ php5-5.3.6/debian/libapache2-mod-php5.prerm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + remove) + if [ -e /etc/apache2/apache2.conf -a -e /etc/apache2/mods-enabled/php5.load ]; then + # set a flag to remember the original state + # useful when reinstalling the same version. + touch /etc/php5/apache2/.start + fi + a2dismod php5 || true + ;; +esac + +exit 0 --- php5-5.3.6.orig/debian/php5-common.php5.cron.d +++ php5-5.3.6/debian/php5-common.php5.cron.d @@ -0,0 +1,7 @@ +# /etc/cron.d/php5: crontab fragment for php5 +# This purges session files older than X, where X is defined in seconds +# as the largest value of session.gc_maxlifetime from all your php.ini +# files, or 24 minutes if not defined. See /usr/lib/php5/maxlifetime + +# Look for and purge old sessions every 30 minutes +09,39 * * * * root [ -x /usr/lib/php5/maxlifetime ] && [ -d /var/lib/php5 ] && find /var/lib/php5/ -depth -mindepth 1 -maxdepth 1 -type f -cmin +$(/usr/lib/php5/maxlifetime) ! -execdir fuser -s {} 2>/dev/null \; -delete --- php5-5.3.6.orig/debian/php5-dev.lintian-overrides +++ php5-5.3.6/debian/php5-dev.lintian-overrides @@ -0,0 +1,2 @@ +php5-dev: script-not-executable ./usr/lib/php5/build/run-tests.php +php5-dev: script-not-executable usr/lib/php5/build/run-tests.php --- php5-5.3.6.orig/debian/setup-mysql.sh +++ php5-5.3.6/debian/setup-mysql.sh @@ -0,0 +1,78 @@ +#!/bin/sh + +set -eu + +[ $# -ge 2 ] || { + echo "Usage: debian/setup-mysql.sh port data-dir" >&2 + exit 1 +} + +# CLI arguments # +port=$1 +datadir=$2 +action=${3:-start} + +localbase=`dirname $datadir`/mysql_base + +# Some vars # + +socket=$datadir/mysql.sock +# Commands: +mysqladmin="mysqladmin -u root -P $port -h localhost --socket=$socket" +mysqld="$localbase/bin/mysqld --no-defaults --bind-address=localhost --port=$port --socket=$socket --datadir=$datadir" + +# Main code # + +if [ "$action" = "stop" ]; then + $mysqladmin shutdown + rm -rf $localbase + exit +fi + +# Copy the necessary pieces of mysql to a local dir to avoid apparmor restrictions +rm -rf $localbase +mkdir -p $localbase/bin +mkdir -p $localbase/share +cp /usr/sbin/mysqld $localbase/bin +cp /usr/bin/my_print_defaults $localbase/bin +cp -r /usr/share/mysql $localbase/share + +rm -rf $datadir +mkdir -p $datadir +chmod go-rx $datadir + +mysql_install_db --basedir=$localbase --datadir=$datadir --rpm --force --tmpdir=/tmp >> $datadir/bootstrap.log 2>&1 + +tmpf=$(mktemp) +cat > "$tmpf" <> $datadir/bootstrap.log 2>&1 + +unlink "$tmpf" + +# Start the daemon +$mysqld > $datadir/run.log 2>&1 & + +pid=$! + +# wait for the server to be actually available +c=0; +while ! nc -z localhost $port; do + c=$(($c+1)); + sleep 3; + if [ $c -gt 20 ]; then + echo "Timed out waiting for mysql server to be available" >&2 + if [ "$pid" ]; then + kill $pid || : + sleep 2 + kill -s KILL $pid || : + fi + exit 1 + fi +done + +$mysqladmin create test --- php5-5.3.6.orig/debian/modulelist +++ php5-5.3.6/debian/modulelist @@ -0,0 +1,17 @@ +curl CURL +enchant Enchant +gd GD +gmp GMP +intl Internationalisation +ldap LDAP +mysql MySQL +odbc ODBC +pgsql PostgreSQL +pspell pspell +recode recode +snmp SNMP +sqlite SQLite +sybase Sybase mssql +tidy tidy +xmlrpc XML-RPC +xsl XSL --- php5-5.3.6.orig/debian/php5-dev.postinst +++ php5-5.3.6/debian/php5-dev.postinst @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +for i in php-config phpize; do + update-alternatives \ + --install /usr/bin/"$i" $i /usr/bin/"$i"5 50 \ + --slave /usr/share/man/man1/"$i".1.gz "$i".1.gz /usr/share/man/man1/"$i"5.1.gz +done + +exit 0 --- php5-5.3.6.orig/debian/libapache2-mod-php5filter.dirs +++ php5-5.3.6/debian/libapache2-mod-php5filter.dirs @@ -0,0 +1,3 @@ +/etc/apache2/mods-available +/etc/php5/apache2filter +/usr/lib/apache2/modules --- php5-5.3.6.orig/debian/libapache2-mod-php5.conf +++ php5-5.3.6/debian/libapache2-mod-php5.conf @@ -0,0 +1,16 @@ + + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + + # To re-enable php in user directories comment the following lines + # (from to .) Do NOT set it to On as it + # prevents .htaccess files from disabling it. + + + php_admin_value engine Off + + + --- php5-5.3.6.orig/debian/php5-cgi.prerm +++ php5-5.3.6/debian/php5-cgi.prerm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +update-alternatives --remove php-cgi /usr/bin/php5-cgi +update-alternatives --remove php-cgi-bin /usr/lib/cgi-bin/php5 + +exit 0 --- php5-5.3.6.orig/debian/php5-common.README.Debian +++ php5-5.3.6/debian/php5-common.README.Debian @@ -0,0 +1,148 @@ +Table of Contents: +--------------------------------------------------------------------- +* Using php5 with threaded webservers (eg. apache2-mpm-worker, caudium) +* Problems starting apache2 with php5 +* Session storage +* Other caveats +* php5-cgi and apache2 +* Restarting your web server after installing modules +* Configuration layout +* Timezone data from system timezone database +* Further documentation, errata, etc + + +Using php5 with threaded webservers (eg. apache2-mpm-worker, caudium) +--------------------------------------------------------------------- + + After much back-and-forth with upstream (and even building our + packages thread-safe for a while), we're currently admitting defeat + on that front, and are NOT building any thread-safe versions of + PHP for any webservers. Our recommendation is that, if you need + to use a threaded webserver, you should use php5-cgi in either + 'normal' CGI mode, or in FastCGI mode. + +Adam Conrad Sun, 06 Feb 2005 08:24:56 -0700 + + +Problems starting apache2 with php5 +---------------------------------- + + At the time of writing, there are no *known* incompatibilities + between any of the php5 modules we ship. However, there have been + many bug reports in the past due to dynamically-loaded extensions, + and it's possible there are still bugs in the released packages. If + Apache fails to start after you install php5, check your list of + enabled extensions at the bottom of /etc/php5/apache2/php.ini (and in + the per-sapi configuration directory), and try commenting out or + reordering the extensions until you find a combination that works. + + For example, in the past the mhash extension was incompatible with + some other common extensions. To work around this, you could list + the mhash extension first in php.ini. + + If you find an extension-related bug in the Debian packages, and you + are willing to help debug the problem, please send us a bug report + that lists all enabled PHP5 extensions (extension=), in the order + in which they appear in php.ini, as well as all enabled Apache modules + (LoadModule), with version numbers where possible. + +Steve Langasek Fri, 26 Apr 2002 13:39:00 -0500 + + +Session storage +--------------- + + Session files are stored in /var/lib/php5. For security purposes, this + directory is unreadable by non-root users. This means that php5 running + from apache2, for example, will not be able to clean up stale session + files. Instead, we have a cron job run every 30 mins that cleans up + stale session files; /etc/cron.d/php5. You may need to modify how + often this runs, if you've modified session.gc_maxlifetime in your + php.ini; otherwise, it may be too lax or overly aggressive in cleaning + out stale session files. + +Andres Salomon Fri, 03 Sep 2004 03:12:54 -0400 + + +Other caveats +------------- + + * extension_dir and include_path should be commented out, if you don't need + special settings for them so php will look in compiled-in paths. If you set + them, you should also add appropriate php install directories there. + +php5-cgi and apache2 +--------------------------- + +In 99% of cases, what you probably want isn't php5-cgi at all, but rather +the libapache2-mod-php5 package, which will configure itself on +installation and Just Work(tm). If, however, you have a need to use +the CGI version of php5 with apache2, the following should help +get you going, though there are dozens of different ways to do this. + +Please note that this process will never be made automatic, as php5-cgi +is meant to be a webserver-agnostic package that can be used with any +httpd, and we don't want it to conflict with the httpd-specific packages +such as libapache2-mod-php5. If both were installed side-by-side and both +were automatically enabled, the results would be a bit confusing, obviously. + +To use php5-cgi with apache2 + 1) activate CGI (it's on by default in default debian setups) + a) If using the prefork MPM, use 'a2enmod cgi' + b) If using a threaded MPM, use 'a2enmod cgid' + 2) activate mod_actions (a2enmod actions) + 3) Add the following to a config snippet in /etc/apache2/conf.d + + Action application/x-httpd-php /cgi-bin/php5 + + +Adam Conrad Sat, 04 Sep 2004 23:04:26 -0600 + +Configuration Layout +--------------------------------------------------------------------- + +Each of the 3 SAPI's (apache2/cgi/cli) have a different +central configuration file /etc/php5/$SAPI/php.ini. + +Additionally, each SAPI is configured with the compile-time option + + --with-config-file-scan-dir=/etc/php5/$SAPI/conf.d + +which for all SAPI's is actually a symlink pointing to a central +directory /etc/php5/conf.d. Any file found in this directory ending +in .ini will be treated as a configuration file by the php SAPI. + +The rationale with this method is that each SAPI can thus be +identically configured with a minimal amount of conffile handling, +but at the same time if you want to have SAPI-specific configuration, +you can just remove the symlink. + +sean finney Thu, 19 Oct 2006 23:33:05 +0200 + +Timezone data from system timezone database +--------------------------------------------------------------------- + +Debian PHP has been patched to use of the system wide timezone database +from the tzdata package, making sure any updates there are automatically +used by PHP aswell. + +Note that this requires that the PHP process has access to /etc/localtime +and /usr/share/zoneinfo. For any regular installation this should be the +case, but in specific secured environments when reading the timezone +database is impossible PHP will give a "Timezone database is corrupt - +this should *never* happen!" error. + +Thijs Kinkhorst Wed, 23 Jul 2008 17:42:06 +0200 + +Further documentation, errata, etc +--------------------------------------------------------------------- + +Errata and other general information about PHP in Debian can be found +in the debian wiki at: + + http://wiki.debian.org/PHP + +If after reading the documentation in this file you still have unanswered +questions, that's a good next place to go. + +sean finney Thu, 19 Oct 2006 22:57:52 +0200 --- php5-5.3.6.orig/debian/watch +++ php5-5.3.6/debian/watch @@ -0,0 +1,5 @@ +version=3 +opts=downloadurlmangle=s#/a/#/this/#,\ +filenamemangle=s#/get/(php-(5\.[0-9\.]*)\.tar\.gz)/.*#$1#,\ +dversionmangle=s/\.dfsg\.\d+// \ +http://www.php.net/downloads.php /get/php-(5\.[0-9\.]*)\.tar\.gz/from/a/mirror debian --- php5-5.3.6.orig/debian/compat +++ php5-5.3.6/debian/compat @@ -0,0 +1 @@ +5 --- php5-5.3.6.orig/debian/suhosin_patch.watch +++ php5-5.3.6/debian/suhosin_patch.watch @@ -0,0 +1,8 @@ +# Check for new versions with: +# uscan --watchfile debian/suhosin_patch.watch --package suhosin-patch +# don't forget to update the version in this file when updating the patch! +version=3 + +opts=uversionmangle=s/RC/~RC/ \ +http://www.hardened-php.net/suhosin/download.html \ + http://download.suhosin.org/suhosin-patch-(.*)\.patch\.gz 5.3.1-0.9.8 --- php5-5.3.6.orig/debian/php5-fpm.preinst +++ php5-5.3.6/debian/php5-fpm.preinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +dpkg-maintscript-helper mv_conffile /etc/php5/fpm/main.conf /etc/php5/fpm/php-fpm.conf 5.3.5-1 -- "$@" + +exit 0 --- php5-5.3.6.orig/debian/php5-sapi.postrm +++ php5-5.3.6/debian/php5-sapi.postrm @@ -0,0 +1,28 @@ +#! /bin/sh + +set -e + +phpini=/etc/php5/@sapi@/php.ini + +case "$1" in +purge) + # remove the flag to remember the original state + if [ -e /etc/php5/@sapi@/.start ]; then + rm -f /etc/php5/apache2/.start + fi + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f $phpini$ext + done + rm -f $phpini + if which ucf >/dev/null; then + ucf --purge $phpini + fi + if which ucfr >/dev/null; then + ucfr --purge @package@ $phpini + fi + ;; +esac + +#DEBHELPER# + +exit 0 --- php5-5.3.6.orig/debian/php-pear.doc-base.php-structures-graph +++ php5-5.3.6/debian/php-pear.doc-base.php-structures-graph @@ -0,0 +1,8 @@ +Document: php-structures-graph +Title: PEAR Structures_Graph +Abstract: API documentation of the Structures_Graph module. +Section: Programming + +Format: HTML +Index: /usr/share/doc/php-pear/PEAR/Structures_Graph/docs/html/index.html +Files: /usr/share/doc/php-pear/PEAR/Structures_Graph/docs/html/Structures_Graph/*.html --- php5-5.3.6.orig/debian/copyright.header +++ php5-5.3.6/debian/copyright.header @@ -0,0 +1,42 @@ +This package was debianized by Gergely Madarasz on +Tue, 16 Nov 1999 19:33:42 +0100. + +Previous maintainers of the package also include: + Petr Cech , who did a LOT of work on these packages. + Adam Conrad , who got a significant chunk of input and + help from Steve Langasek and + Andres Salomon . + +The current maintainers can be contacted via the debian php packaging list: + pkg-php-maint@lists.alioth.debian.org + +It was downloaded from www.php.net/version5/downloads +Changes: removed ext/dbase dir (non-free) + +Noteworthy/non-trivial patches: + patch: suhosin.patch + contributor: http://www.hardened-php.net/ + copyright © 2006-2007 Stefan Esser + may be used/modified/redistributed under the terms of PHP itself + + patch: use_embedded_timezonedb.patch + contributor: Joe Orton + copyright © 2008 Red Hat, Inc. + may be used/modified/redistributed under the terms of PHP itself + +Upstream Authors: The PHP group for PHP5, Andi Gutmans and Zeev Suraski +for libzend + +The file ext/standard/rand.c contains the following clause with a statement +that isn't compatible with the DFSG: + "The code as Shawn received it included the following notice: + + Copyright (C) 1997 Makoto Matsumoto and Takuji Nishimura. When + you use this, send an e-mail to with + an appropriate reference to your work." +However, this requirement has been rescinded by the copyright holder in +message <48E334A2.6050301@math.sci.hiroshima-u.ac.jp> to bug #498621. + +Two different licences apply to this package, one for PHP5, the other for +libzend. Both licences are shown here below. + --- php5-5.3.6.orig/debian/php5-common.postrm +++ php5-5.3.6/debian/php5-common.postrm @@ -0,0 +1,12 @@ +#! /bin/bash + +set -e + +if [ "$1" = "purge" ] +then + rm -rf /var/lib/php5 +fi + +#DEBHELPER# + +exit 0 --- php5-5.3.6.orig/debian/patches/033-we_WANT_libtool.patch +++ php5-5.3.6/debian/patches/033-we_WANT_libtool.patch @@ -0,0 +1,25 @@ +Description: + upstream ships an out of date version of libtool. this ensures that + we build against an up-to-date version of libtool by running libtoolize + as part of our build process (this is called indirectly via ./buildconf.sh + from debian/rules) + . + note that we don't touch the libtool.m4 that they ship here, and this file + gets included in the build process as part of the phpize stuff. however, + this is solved in ./debian/rules where it's overwritten with a symlink. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/build/build2.mk ++++ b/build/build2.mk +@@ -52,7 +52,8 @@ $(TOUCH_FILES): + + aclocal.m4: configure.in acinclude.m4 + @echo rebuilding $@ +- cat acinclude.m4 ./build/libtool.m4 > $@ ++ libtoolize --copy --install --automake --force ++ aclocal + + configure: aclocal.m4 configure.in $(config_m4_files) + @echo rebuilding $@ --- php5-5.3.6.orig/debian/patches/force_libmysqlclient_r.patch +++ php5-5.3.6/debian/patches/force_libmysqlclient_r.patch @@ -0,0 +1,41 @@ +Description: Force linking to mysqlclient_r to avoid symbol conflicts. + apr-util's mysql driver is linked against that version of the library + but due to missing proper symbols versioning we are forced to link to + the re-entrant library too. +Origin: other, http://bugs.debian.org/469081 +Forwarded: not-needed +Last-Update: 2010-01-18 + +--- a/ext/mysql/config.m4 ++++ b/ext/mysql/config.m4 +@@ -78,7 +78,7 @@ elif test "$PHP_MYSQL" != "no"; then + Note that the MySQL client library is not bundled anymore!]) + fi + +- if test "$enable_maintainer_zts" = "yes"; then ++ if true || test "$enable_maintainer_zts" = "yes"; then + MYSQL_LIBNAME=mysqlclient_r + else + MYSQL_LIBNAME=mysqlclient +--- a/ext/mysqli/config.m4 ++++ b/ext/mysqli/config.m4 +@@ -29,7 +29,7 @@ elif test "$PHP_MYSQLI" != "no"; then + MYSQL_LIB_CFG='--libmysqld-libs' + dnl mysqlnd doesn't support embedded, so we have to add some extra stuff + mysqli_extra_sources="mysqli_embedded.c" +- elif test "$enable_maintainer_zts" = "yes"; then ++ elif true || test "$enable_maintainer_zts" = "yes"; then + MYSQL_LIB_CFG='--libs_r' + MYSQL_LIB_NAME='mysqlclient_r' + else +--- a/ext/pdo_mysql/config.m4 ++++ b/ext/pdo_mysql/config.m4 +@@ -64,7 +64,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then + if test "x$SED" = "x"; then + AC_PATH_PROG(SED, sed) + fi +- if test "$enable_maintainer_zts" = "yes"; then ++ if true || test "$enable_maintainer_zts" = "yes"; then + PDO_MYSQL_LIBNAME=mysqlclient_r + PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` + else --- php5-5.3.6.orig/debian/patches/libdb_is_-ldb +++ php5-5.3.6/debian/patches/libdb_is_-ldb @@ -0,0 +1,17 @@ +Description: Let configure check detect version-less libdbs to support + newer versions without patching the configure code. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/dba/config.m4 ++++ b/ext/dba/config.m4 +@@ -323,7 +323,7 @@ if test "$PHP_DB4" != "no"; then + break + fi + done +- PHP_DBA_DB_CHECK(4, 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, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) ++ PHP_DBA_DB_CHECK(4, db 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, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + fi + PHP_DBA_STD_RESULT(db4,Berkeley DB4) + --- php5-5.3.6.orig/debian/patches/113-php.ini_securitynotes.patch +++ php5-5.3.6/debian/patches/113-php.ini_securitynotes.patch @@ -0,0 +1,44 @@ +Description: Adds security notices to php.ini settings +Origin: vendor +Forwarded: not-needed +Last-Update: 2010-01-18 + +--- a/php.ini-development ++++ b/php.ini-development +@@ -335,6 +335,11 @@ allow_call_time_pass_reference = Off + + ; Safe Mode + ; http://php.net/safe-mode ++; NOTE: this is considered a "broken" security measure. ++; Applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++; + safe_mode = Off + + ; By default, Safe Mode does a UID compare check when +@@ -376,6 +381,12 @@ safe_mode_protected_env_vars = LD_LIBRAR + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir ++ ++; NOTE: this is considered a "broken" security measure. ++; Applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++; + ;open_basedir = + + ; This directive allows you to disable certain functions for security reasons. +@@ -688,6 +699,11 @@ request_order = "GP" + ; register_globals to be on; Using form variables as globals can easily lead + ; to possible security problems, if the code is not very well thought of. + ; http://php.net/register-globals ++ ++; NOTE: applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++; + register_globals = Off + + ; Determines whether the deprecated long $HTTP_*_VARS type predefined variables --- php5-5.3.6.orig/debian/patches/strcmp_null-OnUpdateErrorLog.patch +++ php5-5.3.6/debian/patches/strcmp_null-OnUpdateErrorLog.patch @@ -0,0 +1,13 @@ +--- /dev/null ++++ b/tests/func/null-new_val.phpt +@@ -0,0 +1,10 @@ ++--TEST-- ++ini_restore strcmp NULL new_val ++--FILE-- ++ ++--EXPECT-- --- php5-5.3.6.orig/debian/patches/017-pread_pwrite_disable.patch +++ php5-5.3.6/debian/patches/017-pread_pwrite_disable.patch @@ -0,0 +1,28 @@ +Description: Completely disable the usage of pread/pwrite + . + This is an old patch and should be re-checked. +Origin: vendor +Bug-Debian: http://bugs.debian.org/261311 +Forwarded: no +Last-Update: 2010-01-18 + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1224,7 +1224,7 @@ $1 + } + + ],[ +- ac_cv_pwrite=yes ++ ac_cv_pwrite=no + ],[ + ac_cv_pwrite=no + ],[ +@@ -1253,7 +1253,7 @@ $1 + exit(0); + } + ],[ +- ac_cv_pread=yes ++ ac_cv_pread=no + ],[ + ac_cv_pread=no + ],[ --- php5-5.3.6.orig/debian/patches/shtool_mkdir_-p_-race-condition.patch +++ php5-5.3.6/debian/patches/shtool_mkdir_-p_-race-condition.patch @@ -0,0 +1,25 @@ +Description: Workaround a race condition in shtool's mkdir -p + This workaround can be affected by another race condition where a + different process running under a different user creates the directory, + which would make the chown/chmod calls fail. + . + This is the version of the patch sent to shtool upstream. +Origin: vendor +Forwarded: yes +Last-Update: 2010-02-18 + +--- a/build/shtool ++++ b/build/shtool +@@ -1003,7 +1003,11 @@ mkdir ) + if [ ".$opt_t" = .yes ]; then + echo "mkdir $pathcomp" 1>&2 + fi +- mkdir $pathcomp || errstatus=$? ++ mkdir $pathcomp || { ++ _errstatus=$? ++ [ -d "$pathcomp" ] || errstatus=${_errstatus} ++ unset _errstatus ++ } + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chown $opt_o $pathcomp" 1>&2 --- php5-5.3.6.orig/debian/patches/qdbm-is-usr_include_qdbm.patch +++ php5-5.3.6/debian/patches/qdbm-is-usr_include_qdbm.patch @@ -0,0 +1,20 @@ +Description: Look for qdbm under $prefix/include/qdbm too. + The Debian package ships the header files under that directory, for + unknown reasons. +Origin: vendor +Forwarded: not-needed +Last-Update: 2010-02-21 + +--- a/ext/dba/config.m4 ++++ b/ext/dba/config.m4 +@@ -109,6 +109,10 @@ if test "$PHP_QDBM" != "no"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/depot.h + break ++ elif test -f "$i/include/qdbm/depot.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/qdbm/depot.h ++ break + fi + done + --- php5-5.3.6.orig/debian/patches/043-recode_size_t.patch +++ php5-5.3.6/debian/patches/043-recode_size_t.patch @@ -0,0 +1,17 @@ +Description: Check for possible overflows in recode_string() +Origin: vendor +Bug-Debian: http://bugs.debian.org/294986, http://bugs.debian.org/459020 +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/recode/recode.c ++++ b/ext/recode/recode.c +@@ -149,7 +149,7 @@ PHP_FUNCTION(recode_string) + int req_len, str_len; + char *req, *str; + +- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE || str_len < 0) { + return; + } + --- php5-5.3.6.orig/debian/patches/php5-CVE-2012-0831.patch +++ php5-5.3.6/debian/patches/php5-CVE-2012-0831.patch @@ -0,0 +1,68 @@ +Origin: http://svn.php.net/viewvc?view=revision&revision=323016 +Subject: Always restore PG(magic_quote_gpc) on request shutdown + +CVE-2012-0831 + +--- + main/php_variables.c | 9 +++++++-- + sapi/cgi/cgi_main.c | 4 +++- + sapi/fpm/fpm/fpm_main.c | 4 +++- + 3 files changed, 13 insertions(+), 4 deletions(-) + +Index: b/sapi/fpm/fpm/fpm_main.c +=================================================================== +--- a/sapi/fpm/fpm/fpm_main.c ++++ b/sapi/fpm/fpm/fpm_main.c +@@ -643,7 +643,9 @@ void cgi_php_import_environment_variable + int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER; + + /* turn off magic_quotes while importing environment variables */ +- PG(magic_quotes_gpc) = 0; ++ if (PG(magic_quotes_gpc)) { ++ zend_alter_ini_entry_ex("magic_quotes_gpc", sizeof("magic_quotes_gpc"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE, 1 TSRMLS_CC); ++ } + for (zend_hash_internal_pointer_reset_ex(request->env, &pos); + zend_hash_get_current_key_ex(request->env, &var, &var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING && + zend_hash_get_current_data_ex(request->env, (void **) &val, &pos) == SUCCESS; +Index: b/sapi/cgi/cgi_main.c +=================================================================== +--- a/sapi/cgi/cgi_main.c ++++ b/sapi/cgi/cgi_main.c +@@ -624,7 +624,9 @@ void cgi_php_import_environment_variable + int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER; + + /* turn off magic_quotes while importing environment variables */ +- PG(magic_quotes_gpc) = 0; ++ if (PG(magic_quotes_gpc)) { ++ zend_alter_ini_entry_ex("magic_quotes_gpc", sizeof("magic_quotes_gpc"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE, 1 TSRMLS_CC); ++ } + for (zend_hash_internal_pointer_reset_ex(request->env, &pos); + zend_hash_get_current_key_ex(request->env, &var, &var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING && + zend_hash_get_current_data_ex(request->env, (void **) &val, &pos) == SUCCESS; +Index: b/main/php_variables.c +=================================================================== +--- a/main/php_variables.c ++++ b/main/php_variables.c +@@ -457,7 +457,10 @@ void _php_import_environment_variables(z + + /* turn off magic_quotes while importing environment variables */ + int magic_quotes_gpc = PG(magic_quotes_gpc); +- PG(magic_quotes_gpc) = 0; ++ ++ if (PG(magic_quotes_gpc)) { ++ zend_alter_ini_entry_ex("magic_quotes_gpc", sizeof("magic_quotes_gpc"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE, 1 TSRMLS_CC); ++ } + + for (env = environ; env != NULL && *env != NULL; env++) { + p = strchr(*env, '='); +@@ -600,7 +603,9 @@ static inline void php_register_server_v + zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_SERVER]); + } + PG(http_globals)[TRACK_VARS_SERVER] = array_ptr; +- PG(magic_quotes_gpc) = 0; ++ if (PG(magic_quotes_gpc)) { ++ zend_alter_ini_entry_ex("magic_quotes_gpc", sizeof("magic_quotes_gpc"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE, 1 TSRMLS_CC); ++ } + + /* Server variables */ + if (sapi_module.register_server_variables) { --- php5-5.3.6.orig/debian/patches/115-autoconf_ftbfs.patch +++ php5-5.3.6/debian/patches/115-autoconf_ftbfs.patch @@ -0,0 +1,76 @@ +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + ## $Id: configure.in 309329 2011-03-17 07:48:29Z johannes $ -*- autoconf -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++dnl divert(1) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4) + sinclude(TSRM/tsrm.m4) + + +-divert(2) ++dnl divert(2) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -329,7 +329,7 @@ if test "$enable_maintainer_zts" = "yes" + PTHREADS_FLAGS + fi + +-divert(3) ++dnl divert(3) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. +@@ -675,7 +675,7 @@ if test "x$php_crypt_r" = "x1"; then + PHP_CRYPT_R_STYLE + fi + +-divert(4) ++dnl divert(4) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -916,7 +916,7 @@ else + AC_MSG_RESULT([using system default]) + fi + +-divert(5) ++dnl divert(5) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +--- a/ext/standard/config.m4 ++++ b/ext/standard/config.m4 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- + +-divert(3)dnl ++dnl divert(3)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -342,7 +342,7 @@ dnl + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) + AC_FUNC_FNMATCH + +-divert(5)dnl ++dnl divert(5)dnl + + dnl + dnl Check if there is a support means of creating a new process +--- a/scripts/phpize.m4 ++++ b/scripts/phpize.m4 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++dnl divert(1) + + AC_PREREQ(2.13) + AC_INIT(config.m4) --- php5-5.3.6.orig/debian/patches/052-phpinfo_no_configure.patch +++ php5-5.3.6/debian/patches/052-phpinfo_no_configure.patch @@ -0,0 +1,33 @@ +Description: Disable configure parameters on phpinfo() output + . + Patch needs to be discussed with upstream and the issues that lead to + its addition re-checked. Quoting changelog entry: + . + Add [...], which disables the display of our "Configure Command" in + phpinfo(), which was the source of many bogus bug reports over the + years, due to people misinterpreting its meaning. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/standard/info.c ++++ b/ext/standard/info.c +@@ -704,7 +704,7 @@ PHPAPI void php_print_info(int flag TSRM + #ifdef ARCHITECTURE + php_info_print_table_row(2, "Architecture", ARCHITECTURE); + #endif +-#ifdef CONFIGURE_COMMAND ++#if 0 + php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); + #endif + +--- a/ext/standard/tests/general_functions/phpinfo.phpt ++++ b/ext/standard/tests/general_functions/phpinfo.phpt +@@ -20,7 +20,6 @@ PHP Version => %s + + System => %s + Build Date => %s%a +-Configure Command => %s + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s --- php5-5.3.6.orig/debian/patches/100-recode_is_shared.patch +++ php5-5.3.6/debian/patches/100-recode_is_shared.patch @@ -0,0 +1,16 @@ +Description: Turn recode conflicts error message into a warning. The + recode extension is packaged as a shared library in Debian. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/recode/config9.m4 ++++ b/ext/recode/config9.m4 +@@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then + fi + + if test -n "$recode_conflict"; then +- AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) ++ AC_MSG_WARN([recode extension can not be used together with:$recode_conflict]) + fi + fi --- php5-5.3.6.orig/debian/patches/CVE-2011-2483.patch +++ php5-5.3.6/debian/patches/CVE-2011-2483.patch @@ -0,0 +1,164 @@ +--- a/ext/standard/crypt_blowfish.c ++++ b/ext/standard/crypt_blowfish.c +@@ -7,6 +7,7 @@ + * cracking removed. + * + * Written by Solar Designer in 1998-2002 and ++ * placed in the public domain. Quick self-test added in 2011 and also + * placed in the public domain. + * + * There's absolutely no warranty. +@@ -51,6 +52,13 @@ + #define __CONST __const + #endif + ++/* ++ * Please keep this enabled. We really don't want incompatible hashes to be ++ * produced. The performance cost of this quick self-test is around 0.6% at ++ * the "$2a$08" setting. ++ */ ++#define BF_SELF_TEST ++ + #ifdef __i386__ + #define BF_ASM 0 + #define BF_SCALE 1 +@@ -63,6 +71,7 @@ + #endif + + typedef unsigned int BF_word; ++typedef signed int BF_word_signed; + + /* Number of Blowfish rounds, this is also hardcoded into a few places */ + #define BF_N 16 +@@ -555,7 +564,8 @@ static void BF_swap(BF_word *x, int coun + } while (ptr < &data.ctx.S[3][0xFF]); + #endif + +-static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial) ++static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial, ++ int sign_extension_bug) + { + __CONST char *ptr = key; + int i, j; +@@ -565,7 +575,10 @@ static void BF_set_key(__CONST char *key + tmp = 0; + for (j = 0; j < 4; j++) { + tmp <<= 8; +- tmp |= *ptr; ++ if (sign_extension_bug) ++ tmp |= (BF_word_signed)(signed char)*ptr; ++ else ++ tmp |= (unsigned char)*ptr; + + if (!*ptr) ptr = key; else ptr++; + } +@@ -575,8 +588,9 @@ static void BF_set_key(__CONST char *key + } + } + +-char *php_crypt_blowfish_rn(__CONST char *key, __CONST char *setting, +- char *output, int size) ++static char *BF_crypt(__CONST char *key, __CONST char *setting, ++ char *output, int size, ++ BF_word min) + { + #if BF_ASM + extern void _BF_body_r(BF_ctx *ctx); +@@ -602,7 +616,7 @@ char *php_crypt_blowfish_rn(__CONST char + + if (setting[0] != '$' || + setting[1] != '2' || +- setting[2] != 'a' || ++ (setting[2] != 'a' && setting[2] != 'x') || + setting[3] != '$' || + setting[4] < '0' || setting[4] > '3' || + setting[5] < '0' || setting[5] > '9' || +@@ -613,7 +627,7 @@ char *php_crypt_blowfish_rn(__CONST char + } + + count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0')); +- if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16)) { ++ if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) { + clean(data.binary.salt, sizeof(data.binary.salt)); + __set_errno(EINVAL); + return NULL; +@@ -621,7 +635,7 @@ char *php_crypt_blowfish_rn(__CONST char + + BF_swap(data.binary.salt, 4); + +- BF_set_key(key, data.expanded_key, data.ctx.P); ++ BF_set_key(key, data.expanded_key, data.ctx.P, setting[2] == 'x'); + + memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S)); + +@@ -721,14 +735,59 @@ char *php_crypt_blowfish_rn(__CONST char + BF_encode(&output[7 + 22], data.binary.output, 23); + output[7 + 22 + 31] = '\0'; + ++#ifndef BF_SELF_TEST + /* Overwrite the most obvious sensitive data we have on the stack. Note + * that this does not guarantee there's no sensitive data left on the + * stack and/or in registers; I'm not aware of portable code that does. */ + clean(&data, sizeof(data)); ++#endif + + return output; + } + ++char *php_crypt_blowfish_rn(__CONST char *key, __CONST char *setting, ++ char *output, int size) ++{ ++#ifdef BF_SELF_TEST ++ __CONST char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8"; ++ __CONST char *test_2a = ++ "$2a$00$abcdefghijklmnopqrstuui1D709vfamulimlGcq0qq3UvuUasvEa" ++ "\0" ++ "canary"; ++ __CONST char *test_2x = ++ "$2x$00$abcdefghijklmnopqrstuuVUrPmXD6q/nVSSp7pNDhCR9071IfIRe" ++ "\0" ++ "canary"; ++ __CONST char *test_hash, *p; ++ int ok; ++ char buf[7 + 22 + 31 + 1 + 6 + 1]; ++ ++ output = BF_crypt(key, setting, output, size, 16); ++ ++/* Do a quick self-test. This also happens to overwrite BF_crypt()'s data. */ ++ test_hash = (setting[2] == 'x') ? test_2x : test_2a; ++ memcpy(buf, test_hash, sizeof(buf)); ++ memset(buf, -1, sizeof(buf) - (6 + 1)); /* keep "canary" only */ ++ p = BF_crypt(test_key, test_hash, buf, sizeof(buf) - 6, 1); ++ ++ ok = (p == buf && !memcmp(p, test_hash, sizeof(buf))); ++ ++/* This could reveal what hash type we were using last. Unfortunately, we ++ * can't reliably clean the test_hash pointer. */ ++ clean(&buf, sizeof(buf)); ++ ++ if (ok) ++ return output; ++ ++/* Should not happen */ ++ __set_errno(EINVAL); /* pretend we don't support this hash type */ ++ return NULL; ++#else ++#warning Self-test is disabled, please enable ++ return BF_crypt(key, setting, output, size, 16); ++#endif ++} ++ + char *php_crypt_gensalt_blowfish_rn(unsigned long count, + __CONST char *input, int size, char *output, int output_size) + { +--- a/ext/standard/crypt.c ++++ b/ext/standard/crypt.c +@@ -236,7 +236,7 @@ PHP_FUNCTION(crypt) + } else if ( + salt[0] == '$' && + salt[1] == '2' && +- salt[2] == 'a' && ++ (salt[2] == 'a' || salt[2] == 'x') && + salt[3] == '$' && + salt[6] == '$') { + /* CRYPT_BLOWFISH */ --- php5-5.3.6.orig/debian/patches/057-no_apache_installed.patch +++ php5-5.3.6/debian/patches/057-no_apache_installed.patch @@ -0,0 +1,89 @@ +Description: Disable installed-apache configure check +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then + + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" + +- # Test that we're trying to configure with apache 2.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -le 2000000; then +- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) +- elif test "$APACHE_VERSION" -lt 2000044; then +- AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) +- fi ++dnl # Test that we're trying to configure with apache 2.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -le 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) ++dnl elif test "$APACHE_VERSION" -lt 2000044; then ++dnl AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) ++dnl fi + + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then +--- a/sapi/apache/config.m4 ++++ b/sapi/apache/config.m4 +@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then + APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + APACHE_INCLUDE=-I$APXS_INCLUDEDIR + +- # Test that we're trying to configure with apache 1.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -ge 2000000; then +- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) +- fi ++dnl # Test that we're trying to configure with apache 1.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -ge 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) ++dnl fi + + for flag in $APXS_CFLAGS; do + case $flag in +--- a/sapi/apache2filter/config.m4 ++++ b/sapi/apache2filter/config.m4 +@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then + + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" + +- # Test that we're trying to configure with apache 2.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -le 2000000; then +- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) +- elif test "$APACHE_VERSION" -lt 2000040; then +- AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required]) +- fi ++dnl # Test that we're trying to configure with apache 2.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -le 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) ++dnl elif test "$APACHE_VERSION" -lt 2000040; then ++dnl AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required]) ++dnl fi + + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then +--- a/sapi/apache_hooks/config.m4 ++++ b/sapi/apache_hooks/config.m4 +@@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the + APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + APACHE_INCLUDE=-I$APXS_INCLUDEDIR + +- # Test that we're trying to configure with apache 1.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -ge 2000000; then +- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) +- fi ++dnl # Test that we're trying to configure with apache 1.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -ge 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) ++dnl fi + + for flag in $APXS_CFLAGS; do + case $flag in --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-1938_fix.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-1938_fix.patch @@ -0,0 +1,26 @@ +Subject: Fix the CVE-2011-1938 fix +Origin: http://svn.php.net/viewvc?view=revision&revision=311370 + +------------------------------------------------------------------------ +r311370 | felipe | 2011-05-23 17:10:00 -0700 (Mon, 23 May 2011) | 3 lines + +- Fix the fix +# Arghh, copy and paste error :( + +--- + ext/sockets/sockets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/ext/sockets/sockets.c +=================================================================== +--- a/ext/sockets/sockets.c ++++ b/ext/sockets/sockets.c +@@ -1335,7 +1335,7 @@ PHP_FUNCTION(socket_connect) + + case AF_UNIX: + if (addr_len >= sizeof(s_un.sun_path)) { +- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long", php_sock->type); ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long"); + RETURN_FALSE; + } + --- php5-5.3.6.orig/debian/patches/php-fpm-sysconfdir.patch +++ php5-5.3.6/debian/patches/php-fpm-sysconfdir.patch @@ -0,0 +1,11 @@ +--- a/sapi/fpm/fpm/fpm_conf.c ++++ b/sapi/fpm/fpm/fpm_conf.c +@@ -1182,7 +1182,7 @@ int fpm_conf_init_main(int test_conf) /* + char *tmp; + + if (fpm_globals.prefix == NULL) { +- spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); ++ spprintf(&tmp, 0, "%s/php5/fpm/php-fpm.conf", PHP_SYSCONFDIR); + } else { + spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix); + } --- php5-5.3.6.orig/debian/patches/002-static_openssl.patch +++ php5-5.3.6/debian/patches/002-static_openssl.patch @@ -0,0 +1,13 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2379,9 +2379,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ + + PHP_ADD_INCLUDE($OPENSSL_INCDIR) + +- PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ +- PHP_ADD_LIBRARY(crypto,,$1) +- ],[ ++ PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [:],[ + AC_MSG_ERROR([libcrypto not found!]) + ],[ + -L$OPENSSL_LIBDIR --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-1657.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-1657.patch @@ -0,0 +1,61 @@ +Subject: Fixed bug #54681 (addGlob() crashes on invalid flags) +Origin: http://svn.php.net/viewvc/?view=revision&revision=310814 + +Fixed bug #54681 (addGlob() crashes on invalid flags) + +CVE-2011-1657 + +--- + ext/zip/php_zip.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +Index: b/ext/zip/php_zip.c +=================================================================== +--- a/ext/zip/php_zip.c ++++ b/ext/zip/php_zip.c +@@ -494,6 +494,28 @@ static char * php_zipobj_get_zip_comment + #else + #define GLOB_FLAGMASK (~0) + #endif ++#ifndef GLOB_BRACE ++# define GLOB_BRACE 0 ++#endif ++#ifndef GLOB_MARK ++# define GLOB_MARK 0 ++#endif ++#ifndef GLOB_NOSORT ++# define GLOB_NOSORT 0 ++#endif ++#ifndef GLOB_NOCHECK ++# define GLOB_NOCHECK 0 ++#endif ++#ifndef GLOB_NOESCAPE ++# define GLOB_NOESCAPE 0 ++#endif ++#ifndef GLOB_ERR ++# define GLOB_ERR 0 ++#endif ++ ++/* This is used for checking validity of passed flags (passing invalid flags causes segfault in glob()!! */ ++#define GLOB_AVAILABLE_FLAGS (0 | GLOB_BRACE | GLOB_MARK | GLOB_NOSORT | GLOB_NOCHECK | GLOB_NOESCAPE | GLOB_ERR | GLOB_ONLYDIR) ++ + #endif /* }}} */ + + int php_zip_glob(char *pattern, int pattern_len, long flags, zval *return_value TSRMLS_DC) /* {{{ */ +@@ -508,6 +530,16 @@ int php_zip_glob(char *pattern, int patt + glob_t globbuf; + int n; + int ret; ++ ++ if (pattern_len >= MAXPATHLEN) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pattern exceeds the maximum allowed length of %d characters", MAXPATHLEN); ++ return -1; ++ } ++ ++ if ((GLOB_AVAILABLE_FLAGS & flags) != flags) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "At least one of the passed flags is invalid or not supported on this platform"); ++ return -1; ++ } + + #ifdef ZTS + if (!IS_ABSOLUTE_PATH(pattern, pattern_len)) { --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-4566.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-4566.patch @@ -0,0 +1,23 @@ +Description: fix denial of service and possible information disclosure + via exif integer overflow +Origin: upstream, http://svn.php.net/viewvc?view=revision&revision=319535 +Bug: https://bugs.php.net/bug.php?id=60150 + +Index: php5-5.3.8.0/ext/exif/exif.c +=================================================================== +--- php5-5.3.8.0.orig/ext/exif/exif.c 2011-12-12 15:13:43.006064337 -0500 ++++ php5-5.3.8.0/ext/exif/exif.c 2011-12-12 15:13:58.910064186 -0500 +@@ -2874,11 +2874,11 @@ + offset_val = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel); + /* If its bigger than 4 bytes, the dir entry contains an offset. */ + value_ptr = offset_base+offset_val; +- if (offset_val+byte_count > IFDlength || value_ptr < dir_entry) { ++ if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry) { + /* It is important to check for IMAGE_FILETYPE_TIFF + * JPEG does not use absolute pointers instead its pointers are + * relative to the start of the TIFF header in APP1 section. */ +- if (offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM && ImageInfo->FileType!=IMAGE_FILETYPE_JPEG)) { ++ if (byte_count > ImageInfo->FileSize || offset_val>ImageInfo->FileSize-byte_count || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM && ImageInfo->FileType!=IMAGE_FILETYPE_JPEG)) { + if (value_ptr < dir_entry) { + /* we can read this if offset_val > 0 */ + /* some files have their values in other parts of the file */ --- php5-5.3.6.orig/debian/patches/fix_broken_5.3_tests.patch +++ php5-5.3.6/debian/patches/fix_broken_5.3_tests.patch @@ -0,0 +1,45 @@ +Author: Sean Finney +Description: Fix another small batch of broken test cases + * ext/standard/tests/php_ini_loaded_file.phpt: this test only works if + you call run-tests directly, but the included Makefile invokes the + test in such a way that it fails (it explicitly loads an ini file, + and the test assumes that none are loaded). since it therefore seems + like a somewhat useless test it has been removed. + * cli/tests/006.phpt: $subject is according to the docs for + the two pcre functions that report it as such, so the expected string has + been updated to match the output. + * php.orig/ext/posix/tests/posix_errno_variation2.phpt: SIGKILL is not + a defined constant unless the pcntl extension is loaded. As was + done elsewhere (posix_kill_basic.phpt, which oddly seems to do the + same *incredibly sketchy* test that's done here), it's passed as a + variable hardcoded to 9 instead. Did i mention that this test is + sketchy? +Origin: vendor +--- a/ext/posix/tests/posix_errno_variation2.phpt ++++ b/ext/posix/tests/posix_errno_variation2.phpt +@@ -21,7 +21,9 @@ do { + $result = shell_exec("ps -p " . $pid); + } while (strstr($pid, $result)); + +-posix_kill($pid, SIGKILL); ++/* don't depend on SIGKILL being defined (pcntl might not not be loaded) */ ++$SIGKILL = 9; ++posix_kill($pid, $SIGKILL); + var_dump(posix_errno()); + + ?> +--- a/ext/standard/tests/php_ini_loaded_file.phpt ++++ /dev/null +@@ -1,12 +0,0 @@ +---TEST-- +-Check the php_ini_loaded_file() function. No file is loaded in test, so false ins returned +---CREDITS-- +-Sebastian Schürmann +-sschuermann@chip.de +-Testfest 2009 Munich +---FILE-- +- +---EXPECTF-- +-string(%d) "%s/tmp-php.ini" --- php5-5.3.6.orig/debian/patches/series +++ php5-5.3.6/debian/patches/series @@ -0,0 +1,75 @@ +001-libtool_fixes.patch +002-static_openssl.patch +004-ldap_fix.patch +006-debian_quirks.patch +libtool2.2.patch +013-force_getaddrinfo.patch +017-pread_pwrite_disable.patch +019-z_off_t_as_long.patch +029-php.ini_paranoid.patch +033-we_WANT_libtool.patch +034-apache2_umask_fix.patch +036-fd_setsize_fix.patch +043-recode_size_t.patch +044-strtod_arm_fix.patch +045-exif_nesting_level.patch +047-zts_with_dl.patch +052-phpinfo_no_configure.patch +053-extension_api.patch +057-no_apache_installed.patch +100-recode_is_shared.patch +101-sqlite_is_shared.patch +108-64_bit_datetime.patch +112-proc_open.patch +113-php.ini_securitynotes.patch +115-autoconf_ftbfs.patch +116-posixness_fix.patch +libdb_is_-ldb +page_size_fixes.patch +suhosin.patch +fix_broken_upstream_tests.patch +use_embedded_timezonedb.patch +force_libmysqlclient_r.patch +gentoo/009_ob-memory-leaks.patch +mssql-null-exception.patch +sybase-alias.patch +strcmp_null-OnUpdateErrorLog.patch +#deprecate_short_open_tag +fix_broken_5.3_tests.patch +dont-gitclean-in-build.patch +#broken_5.3_test-posix_uname.patch +shtool_mkdir_-p_-race-condition.patch +qdbm-is-usr_include_qdbm.patch +zend_int_overflow.patch +use_embedded_timezonedb_fixes.patch +fix_broken_sha2_test.patch +php_crypt_revamped.patch +use_system_crypt_fixes.patch +session_save_path.patch +#install-programs_parallel_FTBFS.patch +php-fpm-man-section-and-cleanup.patch +fpm-config.patch +fix_crash_in__php_mssql_get_column_content_without_type.patch +bug53070.patch +php5-CVE-2011-1148.patch -p0 +php-fpm-sysconfdir.patch +configure-as-needed.patch +lp564920-fix-big-files.patch +lang-test-use-utf8.patch +disable_SSLv2_for_openssl_1_0_0.patch +backport-upstream-lp592442.patch +temporary-path-fixes-for-multiarch.patch +CVE-2011-2202.patch +CVE-2011-2483.patch +CVE-2011-1938.patch +php5-CVE-2011-1657.patch +php5-CVE-2011-1938_fix.patch +php5-CVE-2011-3182.patch +php5-CVE-2011-3267.patch +php5-CVE-2011-4566.patch +php5-CVE-2011-4885.patch +php5-CVE-2012-0057.patch +php5-CVE-2012-0788.patch +php5-CVE-2012-0830.patch +php5-CVE-2012-0831.patch +php5-CVE-2011-4153.patch --- php5-5.3.6.orig/debian/patches/dont-gitclean-in-build.patch +++ php5-5.3.6/debian/patches/dont-gitclean-in-build.patch @@ -0,0 +1,18 @@ +Author: Sean Finney +Description: Don't run git-clean via buildconf + Calling buildconf indirectly invokes vcsclean, which calls the gitclean-work + target of build/build.mk, which calls among other things git clean -X -f -d, + which in turn nukes the quilt .pc directory making life quite difficult for + us. + . + This patch doesn't need to go upstream, as they likely don't want to support + having a patch system on top of their source. +--- a/build/build.mk ++++ b/build/build.mk +@@ -76,6 +76,5 @@ gitclean-work: + @if (test ! -f '.git/info/exclude' || grep -s "git-ls-files" .git/info/exclude); then \ + (echo "Rebuild .git/info/exclude" && echo '*.o' > .git/info/exclude && git svn propget svn:ignore | grep -v config.nice >> .git/info/exclude); \ + fi; \ +- git clean -X -f -d; + + .PHONY: $(ALWAYS) snapshot --- php5-5.3.6.orig/debian/patches/029-php.ini_paranoid.patch +++ php5-5.3.6/debian/patches/029-php.ini_paranoid.patch @@ -0,0 +1,1512 @@ +Description: php.ini with paranoid settings +Origin: other +Forwarded: no +Last-Update: 2010-01-18 + +--- /dev/null ++++ b/php.ini-paranoid +@@ -0,0 +1,1504 @@ ++[PHP] ++ ++;;;;;;;;;;; ++; WARNING ; ++;;;;;;;;;;; ++; This file enables many features in the PHP configuration that will ++; break applications that rely on this. Make sure you test applications ++; with this configuration file before enabling it on production. ++ ++;;;;;;;;;;;;;;;;;;; ++; About php.ini ; ++;;;;;;;;;;;;;;;;;;; ++; This file controls many aspects of PHP's behavior. In order for PHP to ++; read it, it must be named 'php.ini'. PHP looks for it in the current ++; working directory, in the path designated by the environment variable ++; PHPRC, and in the path that was defined in compile time (in that order). ++; Under Windows, the compile-time path is the Windows directory. The ++; path in which the php.ini file is looked for can be overridden using ++; the -c argument in command line mode. ++; ++; The syntax of the file is extremely simple. Whitespace and Lines ++; beginning with a semicolon are silently ignored (as you probably guessed). ++; Section headers (e.g. [Foo]) are also silently ignored, even though ++; they might mean something in the future. ++; ++; Directives are specified using the following syntax: ++; directive = value ++; Directive names are *case sensitive* - foo=bar is different from FOO=bar. ++; ++; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one ++; of the INI constants (On, Off, True, False, Yes, No and None) or an expression ++; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). ++; ++; Expressions in the INI file are limited to bitwise operators and parentheses: ++; | bitwise OR ++; & bitwise AND ++; ~ bitwise NOT ++; ! boolean NOT ++; ++; Boolean flags can be turned on using the values 1, On, True or Yes. ++; They can be turned off using the values 0, Off, False or No. ++; ++; An empty string can be denoted by simply not writing anything after the equal ++; sign, or by using the None keyword: ++; ++; foo = ; sets foo to an empty string ++; foo = none ; sets foo to an empty string ++; foo = "none" ; sets foo to the string 'none' ++; ++; If you use constants in your value, and these constants belong to a ++; dynamically loaded extension (either a PHP extension or a Zend extension), ++; you may only use these constants *after* the line that loads the extension. ++; ++; ++;;;;;;;;;;;;;;;;;;; ++; About this file ; ++;;;;;;;;;;;;;;;;;;; ++; ++; This is the paranoid, PHP version of the php.ini-dist file. It ++; sets some non standard settings, that make PHP more efficient, more secure ++; in a very paranoid way. Note that these security settings will make some ++; applications not work properly. ++; ++; The price is that with these settings, PHP may be incompatible with some ++; applications, and sometimes, more difficult to develop with. Using this ++; file is recommended for production sites which want a high degree of ++; security. As all of the changes from the standard settings are thoroughly ++; documented, you can go over each one, ++; and decide whether you want to use it or not. ++; ++; For general information about the php.ini file, please consult the ++; php.ini-dist file, included in your PHP distribution. ++; ++; For further information see ++; http://www.php.net/features.safe-mode ++; http://www.phpsecure.info/ ++; ++; This file is different from the php.ini-dist file in the fact that it features ++; different values for several directives, in order to improve performance, while ++; possibly breaking compatibility with the standard out-of-the-box behavior of ++; PHP 3. Please make sure you read what's different, and modify your scripts ++; accordingly, if you decide to use this file instead. ++; ++; Notice that the paranoid configuration file might not be fully up-to-date ++; with the latest variables available so the diff will catch both the changes ++; to the default variable values as well as the variables that are missing in ++; the paranoid configuration file) ++; ++; This version was generated using the version 5.2.4-2 as a basis. ++; ++; Debian users can find the differences between both configurations might ++; be found by running: ++; ++; $ diff -u /usr/share/doc/php5-common/examples/php.ini-dist \ ++; /usr/share/doc/php5-common/examples/php.ini-paranoid |less ++; ++; ++; This is a (not complete) list of some of the changes introduced in this file: ++; ++; - safe_mode = On [Security, Performance loss] ++; Do UID checks when opening files. Enabling safe_mode also enables ++; other functions related to this mode. For more information read: ++; http://www.php.net/features.safe-mode ++; ++; However, this feature by itself cannot be relied on to protect all applications. ++; It is worthwhile reading also: ++; http://ilia.ws/archives/18_PHPs_safe_mode_or_how_not_to_implement_security.html ++; Bottomline: Do not trust that safe_mode will drive all your security vulnerabilities ++; away. ++; ++; - safe_mode_protected_env_vars = LD_LIBRARY_PATH, PATH [Security] ++; Environment variables that users will not be able to modify through ++; putenv(). PATH is added so that scripts cannot overwrite it ++; ++; - open_basedir = /var/www/:/usr/lib/php4/ [Security, Performance loss] ++; Limits the files that PHP can access to the directories specified. ++; This includes the webroot and the usual location of PHP libraries ++; (e.g. PEAR). Since all file locations are checked against this list ++; before any access is allowed, this impacts in the performance of all ++; file operations. ++; ++; - disable_functions = dl, phpinfo, system, .... [Security] ++; Some functions can be used by attackers and can be malversed by ++; applications, the list (not complete) of functions disabled includes ++; functions which might have a severe impact to the system if wrongly used ++; in scripts or subverted remotely by attackers. ++; ++; - expose_php = Off [?Security?] ++; Not exposing that PHP is used in the site (nor its version) can affect ++; how some dumb worms attempt to attack the site. Many might ++; not check this and attempt to compromise the server nevertheless, ++; however. This setting is just 'security by obscurity' so no real ++; security at all (save vs. the dumbest attackers) ++; ++; - error_log = syslog [Security, Performance log] ++; All errors are reported to syslog so that the errors can be easily ++; sent outsite the site to a syslog server. This prevents an intruder ++; from tampering with them in an attempt to hide his tracks since the ++; logs are stored in a different location. It also helps in forensic ++; investigation or when using automatic tools to produce reports or ++; generate alarms based on the syslog information. ++; ++; - error_reporting = E_ALL [Code Cleanliness, Security(?)] ++; By default, PHP surpresses errors of type E_NOTICE. These error messages ++; are emitted for non-critical errors, but that could be a symptom of a bigger ++; problem. Most notably, this will cause error messages about the use ++; of uninitialized variables to be displayed. ++; ++; - display_errors = Off [Security] ++; With this directive set to off, errors that occur during the execution of ++; scripts will no longer be displayed as a part of the script output, and thus, ++; will no longer be exposed to remote users. With some errors, the error message ++; content may expose information about your script, web server, or database ++; server that may be exploitable for hacking. Production sites should have this ++; directive set to off. ++; - log_errors = On [Security] ++; This directive complements the above one. Any errors that occur during the ++; execution of your script will be logged (typically, to your server's error log, ++; but can be configured in several ways). Along with setting display_errors to off, ++; this setup gives you the ability to fully understand what may have gone wrong, ++; without exposing any sensitive information to remote users. ++; - output_buffering = 4096 [Performance] ++; Set a 4KB output buffer. Enabling output buffering typically results in less ++; writes, and sometimes less packets sent on the wire, which can often lead to ++; better performance. The gain this directive actually yields greatly depends ++; on which Web server you're working with, and what kind of scripts you're using. ++; - register_globals = Off [Security, Performance] ++; Global variables are no longer registered for input data (POST, GET, cookies, ++; environment and other server variables). Instead of using $foo, you must use ++; you can use $_REQUEST["foo"] (includes any variable that arrives through the ++; request, namely, POST, GET and cookie variables), or use one of the specific ++; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending ++; on where the input originates. Also, you can look at the ++; import_request_variables() function. ++; Note that register_globals is deprecated in PHP 6.0, because it often ++; leads to security bugs. ++; Read http://php.net/manual/en/security.registerglobals.php for further ++; information. ++; Also notice that applications should not rely on this feature being turned Off ++; to remain secure. ++; - register_long_arrays = Off [Performance] ++; Disables registration of HTTP_GET_VARS ++; - register_argc_argv = Off [Performance] ++; Disables registration of the somewhat redundant $argv and $argc global ++; variables. ++; - include_path = "/usr/share/php" [Security] ++; Only files under /usr can be included, this prevents applications from ++; including files from the same directory they are running in. ++; - magic_quotes_gpc = On [Security] ++; Input data is escaped with slashes so that applications that do ++; not use addslashes() are not so easily subjected to SQL injection ++; when talking to SQL databases. ++; This features is deprecated in PHP 6.0, applications should be fixed to ++; prevent SQL injection attacks through input data and not rely on this feature. ++; - magic_quotes_runtime = On [Security] ++; Quotes in data returned from functions that access external data sources (such as ++; databases) are escapted with a backslash. ++; This features is deprecated in PHP 6.0, applications should be fixed to ++; prevent SQL injection attacks through input data and not rely on this feature. ++; ++; - variables_order = "GPCS" [Performance] ++; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access ++; environment variables, you can use getenv() instead. ++; - allow_call_time_pass_reference = Off [Code cleanliness] ++; It's not possible to decide to force a variable to be passed by reference ++; when calling a function. The PHP 4 style to do this is by making the ++; function require the relevant argument by reference. ++; ++; - enable_dl = Off [Security] ++; The dl() function is not needed in most environments and does introduce ++; a number of security issues. ++; - file_uploads = Off [Security] ++; File uploads should not be allowed to the server. ++; - allow_url_fopen = Off [Security] ++; File calls should not transparently retrieve files from the network ++; since this could be subverted by attackers in poorly coded scripts ++; by forcing them to download (and execute) malicious remote content ++; from compromised hosts. This behaviour has been observed in automatic ++; worms/tools that use it to scan and propagate through badly written ++; applications (in conjuntion with other unsafe features) ++; http://myhost/myapplication.php?include=http://roguesever/rogueapp.php ++; ++; - session.save_path = /var/lib/php5 [Security] ++; This is defined to a non-world readable directory so users cannot ++; hihack sessions of other users by getting a list of the files. ++; ++; Notice that on on shared servers on a per application basis, otherwise ++; other users would be able to get access to other applications' data by ++; setting a proper session id in a different application. If session paths ++; are not shared sessions of one application will be invalid on another. ++; For more information see: ++; http://php.net/manual/en/ref.session.php#ini.session.save-path ++; and ++; http://php.net/manual/en/function.session-save-path.php ++; - session.cookie_secure = 1 [Security] ++; Cookies will only be sent through secure (SSL) connections. ++; - session.use_only_cookies = 1 [Security] ++; Session ids are not allowed in URLs which make it more difficult for ++; cross site scripting (XSS) attacks to be succesfull and also has the ++; advantaged that session ids will not be stored in the server's logs making ++; them vulnerable to reuse by people with access to the server logs. ++; - session.cookie_httponly = 1 [Security] ++; Cookies can only be set through the HTTP protocol, JavaScript can not ++; modify them, making applications less vulnerable to XSS attacks. This is ++; not supported, however, by all browsers. ++; - session.hash_function = 1 [Security, Performance loss] ++; Use SHA-1 instead of MD5 which is not (yet) broken but there are some known ++; attacks. Slight performance loss as it takes more time to compute. ++; ++; ++; This file is maintained by Javier Fernandez-Sanguino ++; please forward him any suggestions or changes you believe might be appropiate ++ ++ ++;;;;;;;;;;;;;;;;;;;; ++; Language Options ; ++;;;;;;;;;;;;;;;;;;;; ++ ++; Enable the PHP scripting language engine under Apache. ++engine = On ++ ++; Enable compatibility mode with Zend Engine 1 (PHP 4.x) ++zend.ze1_compatibility_mode = Off ++ ++; Allow the tags are recognized. ++; NOTE: Using short tags should be avoided when developing applications or ++; libraries that are meant for redistribution, or deployment on PHP ++; servers which are not under your control, because short tags may not ++; be supported on the target server. For portable, redistributable code, ++; be sure not to use short tags. ++short_open_tag = On ++ ++; Allow ASP-style <% %> tags. ++asp_tags = Off ++ ++; The number of significant digits displayed in floating point numbers. ++precision = 12 ++ ++; Enforce year 2000 compliance (will cause problems with non-compliant browsers) ++y2k_compliance = On ++ ++; Output buffering allows you to send header lines (including cookies) even ++; after you send body content, at the price of slowing PHP's output layer a ++; bit. You can enable output buffering during runtime by calling the output ++; buffering functions. You can also enable output buffering for all files by ++; setting this directive to On. If you wish to limit the size of the buffer ++; to a certain size - you can use a maximum number of bytes instead of 'On', as ++; a value for this directive (e.g., output_buffering=4096). ++output_buffering = 4096 ++ ++; You can redirect all of the output of your scripts to a function. For ++; example, if you set output_handler to "mb_output_handler", character ++; encoding will be transparently converted to the specified encoding. ++; Setting any output handler automatically turns on output buffering. ++; Note: People who wrote portable scripts should not depend on this ini ++; directive. Instead, explicitly set the output handler using ob_start(). ++; Using this ini directive may cause problems unless you know what script ++; is doing. ++; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" ++; and you cannot use both "ob_gzhandler" and "zlib.output_compression". ++; Note: output_handler must be empty if this is set 'On' !!!! ++; Instead you must use zlib.output_handler. ++;output_handler = ++ ++; Transparent output compression using the zlib library ++; Valid values for this option are 'off', 'on', or a specific buffer size ++; to be used for compression (default is 4KB) ++; Note: Resulting chunk size may vary due to nature of compression. PHP ++; outputs chunks that are few hundreds bytes each as a result of ++; compression. If you prefer a larger chunk size for better ++; performance, enable output_buffering in addition. ++; Note: You need to use zlib.output_handler instead of the standard ++; output_handler, or otherwise the output will be corrupted. ++zlib.output_compression = Off ++ ++; You cannot specify additional output handlers if zlib.output_compression ++; is activated here. This setting does the same as output_handler but in ++; a different order. ++;zlib.output_handler = ++ ++; Implicit flush tells PHP to tell the output layer to flush itself ++; automatically after every output block. This is equivalent to calling the ++; PHP function flush() after each and every call to print() or echo() and each ++; and every HTML block. Turning this option on has serious performance ++; implications and is generally recommended for debugging purposes only. ++implicit_flush = Off ++ ++; The unserialize callback function will be called (with the undefined class' ++; name as parameter), if the unserializer finds an undefined class ++; which should be instantiated. ++; A warning appears if the specified function is not defined, or if the ++; function doesn't include/implement the missing class. ++; So only set this entry, if you really want to implement such a ++; callback-function. ++unserialize_callback_func= ++ ++; When floats & doubles are serialized store serialize_precision significant ++; digits after the floating point. The default value ensures that when floats ++; are decoded with unserialize, the data will remain the same. ++serialize_precision = 100 ++ ++; Whether to enable the ability to force arguments to be passed by reference ++; at function call time. This method is deprecated and is likely to be ++; unsupported in future versions of PHP/Zend. The encouraged method of ++; specifying which arguments should be passed by reference is in the function ++; declaration. You're encouraged to try and turn this option Off and make ++; sure your scripts work properly with it in order to ensure they will work ++; with future versions of the language (you will receive a warning each time ++; you use this feature, and the argument will be passed by value instead of by ++; reference). ++allow_call_time_pass_reference = Off ++ ++; ++; Safe Mode ++; ++; Notice that with this mode on PHP will not create new files in ++; directories which have different owner than the owner of the script. This ++; typically applies to /tmp, so contrary to Unix intuition, you will not be able ++; to create new files there (even if the /tmp rights are set correctly). ++; ++; NOTE: this is considered a "broken" security measure. ++; Applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++; ++safe_mode = On ++ ++; By default, Safe Mode does a UID compare check when ++; opening files. If you want to relax this to a GID compare, ++; then turn on safe_mode_gid. ++safe_mode_gid = Off ++ ++; When safe_mode is on, UID/GID checks are bypassed when ++; including files from this directory and its subdirectories. ++; (directory must also be in include_path or full path must ++; be used when including) ++safe_mode_include_dir = ++ ++; When safe_mode is on, only executables located in the safe_mode_exec_dir ++; will be allowed to be executed via the exec family of functions. ++; ++; Note: This should be customised per site (if exec is permitted) ++safe_mode_exec_dir = ++ ++; Setting certain environment variables may be a potential security breach. ++; This directive contains a comma-delimited list of prefixes. In Safe Mode, ++; the user may only alter environment variables whose names begin with the ++; prefixes supplied here. By default, users will only be able to set ++; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). ++; ++; Note: If this directive is empty, PHP will let the user modify ANY ++; environment variable! ++safe_mode_allowed_env_vars = PHP_ ++ ++; This directive contains a comma-delimited list of environment variables that ++; the end user won't be able to change using putenv(). These variables will be ++; protected even if safe_mode_allowed_env_vars is set to allow to change them. ++safe_mode_protected_env_vars = LD_LIBRARY_PATH,PATH ++ ++; open_basedir, if set, limits all file operations to the defined directory ++; and below. This directive makes most sense if used in a per-directory ++; or per-virtualhost web server configuration file. This directive is ++; *NOT* affected by whether Safe Mode is turned On or Off. ++; ++; In Debian, the WebRoot is /var/www/ so we limit file operations to it. ++; ++; NOTE: this is considered a "broken" security measure. ++; Applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++open_basedir = /var/www/:/usr/lib/php4/ ++ ++; This directive allows you to disable certain functions for security reasons. ++; It receives a comma-delimited list of function names. This directive is ++; *NOT* affected by whether Safe Mode is turned On or Off. ++; ++; Notes: ++; - The list of functions disabled here might break some applications ++; however, they are considered dangerous and often subverted by attackers ++; remotely. ++; - 'include' is not in the list, if your applications do not depend on it ++; make sure you add it here too. ++disable_functions = dl, phpinfo, system, mail, shell_exec, exec, escapeshellarg, escapeshellcmd, passthru, proc_close, proc_open, proc_get_status, proc_nice, proc_open, proc_terminate, popen, pclose, chown, disk_free_space, disk_total_space, diskfreespace, fileinode, max_execution_time, set_time_limit, highlight_file, show_source ++ ++; This directive allows you to disable certain classes for security reasons. ++; It receives a comma-delimited list of class names. This directive is ++; *NOT* affected by whether Safe Mode is turned On or Off. ++disable_classes = ++ ++; Colors for Syntax Highlighting mode. Anything that's acceptable in ++; would work. ++;highlight.string = #DD0000 ++;highlight.comment = #FF9900 ++;highlight.keyword = #007700 ++;highlight.bg = #FFFFFF ++;highlight.default = #0000BB ++;highlight.html = #000000 ++ ++; If enabled, the request will be allowed to complete even if the user aborts ++; the request. Consider enabling it if executing long request, which may end up ++; being interrupted by the user or a browser timing out. ++; ignore_user_abort = On ++ ++; Determines the size of the realpath cache to be used by PHP. This value should ++; be increased on systems where PHP opens many files to reflect the quantity of ++; the file operations performed. ++; realpath_cache_size=16k ++ ++; Duration of time, in seconds for which to cache realpath information for a given ++; file or directory. For systems with rarely changing files, consider increasing this ++; value. ++; realpath_cache_ttl=120 ++ ++; ++; Misc ++; ++; Decides whether PHP may expose the fact that it is installed on the server ++; (e.g. by adding its signature to the Web server header). It is no security ++; threat in any way, but it makes it possible to determine whether you use PHP ++; on your server or not. ++expose_php = Off ++ ++ ++;;;;;;;;;;;;;;;;;;; ++; Resource Limits ; ++;;;;;;;;;;;;;;;;;;; ++ ++max_execution_time = 30 ; Maximum execution time of each script, in seconds ++max_input_time = 60 ; Maximum amount of time each script may spend parsing request data ++max_input_nesting_level = 64 ; Maximum input variable nesting level ++memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++; Error handling and logging ; ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; error_reporting is a bit-field. Or each number up to get desired error ++; reporting level ++; E_ALL - All errors and warnings (doesn't include E_STRICT) ++; E_ERROR - fatal run-time errors ++; E_RECOVERABLE_ERROR - almost fatal run-time errors ++; E_WARNING - run-time warnings (non-fatal errors) ++; E_PARSE - compile-time parse errors ++; E_NOTICE - run-time notices (these are warnings which often result ++; from a bug in your code, but it's possible that it was ++; intentional (e.g., using an uninitialized variable and ++; relying on the fact it's automatically initialized to an ++; empty string) ++; E_STRICT - run-time notices, enable to have PHP suggest changes ++; to your code which will ensure the best interoperability ++; and forward compatibility of your code ++; E_CORE_ERROR - fatal errors that occur during PHP's initial startup ++; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's ++; initial startup ++; E_COMPILE_ERROR - fatal compile-time errors ++; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) ++; E_USER_ERROR - user-generated error message ++; E_USER_WARNING - user-generated warning message ++; E_USER_NOTICE - user-generated notice message ++; ++; Examples: ++; ++; - Show all errors, except for notices and coding standards warnings ++; ++;error_reporting = E_ALL & ~E_NOTICE ++; ++; - Show all errors, except for notices ++; ++;error_reporting = E_ALL & ~E_NOTICE | E_STRICT ++; ++; - Show only errors ++; ++;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR ++; ++; - Show all errors ++; ++error_reporting = E_ALL ++ ++; Print out errors (as a part of the output). For production web sites, ++; you're strongly encouraged to turn this feature off, and use error logging ++; instead (see below). Keeping display_errors enabled on a production web site ++; may reveal security information to end users, such as file paths on your Web ++; server, your database schema or other information. ++; ++; possible values for display_errors: ++; ++; Off - Do not display any errors ++; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) ++; stdout (On) - Display errors to STDOUT ++; ++display_errors = Off ++ ++; Even when display_errors is on, errors that occur during PHP's startup ++; sequence are not displayed. It's strongly recommended to keep ++; display_startup_errors off, except for when debugging. ++display_startup_errors = Off ++ ++; Log errors into a log file (server-specific log, stderr, or error_log (below)) ++; As stated above, you're strongly advised to use error logging in place of ++; error displaying on production web sites. ++log_errors = On ++ ++; Set maximum length of log_errors. In error_log information about the source is ++; added. The default is 1024 and 0 allows to not apply any maximum length at all. ++log_errors_max_len = 1024 ++ ++; Do not log repeated messages. Repeated errors must occur in same file on same ++; line until ignore_repeated_source is set true. ++ignore_repeated_errors = Off ++ ++; Ignore source of message when ignoring repeated messages. When this setting ++; is On you will not log errors with repeated messages from different files or ++; source lines. ++ignore_repeated_source = Off ++ ++; If this parameter is set to Off, then memory leaks will not be shown (on ++; stdout or in the log). This has only effect in a debug compile, and if ++; error reporting includes E_WARNING in the allowed list ++report_memleaks = On ++ ++;report_zend_debug = 0 ++ ++; Store the last error/warning message in $php_errormsg (boolean). ++track_errors = Off ++ ++; Disable the inclusion of HTML tags in error messages. ++; Note: Never use this feature for production boxes. ++html_errors = Off ++ ++; If html_errors is set On PHP produces clickable error messages that direct ++; to a page describing the error or function causing the error in detail. ++; You can download a copy of the PHP manual from http://www.php.net/docs.php ++; and change docref_root to the base URL of your local copy including the ++; leading '/'. You must also specify the file extension being used including ++; the dot. ++; Note: Never use this feature for production boxes. ++;docref_root = "/phpmanual/" ++;docref_ext = .html ++ ++; String to output before an error message. ++;error_prepend_string = "" ++ ++; String to output after an error message. ++;error_append_string = "" ++ ++; Log errors to specified file. ++;error_log = filename ++ ++; Log errors to syslog (Event Log on NT, not valid in Windows 95). ++error_log = syslog ++ ++ ++;;;;;;;;;;;;;;;;; ++; Data Handling ; ++;;;;;;;;;;;;;;;;; ++; ++; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 ++ ++; The separator used in PHP generated URLs to separate arguments. ++; Default is "&". ++;arg_separator.output = "&" ++ ++; List of separator(s) used by PHP to parse input URLs into variables. ++; Default is "&". ++; NOTE: Every character in this directive is considered as separator! ++;arg_separator.input = ";&" ++ ++; This directive describes the order in which PHP registers GET, POST, Cookie, ++; Environment and Built-in variables (G, P, C, E & S respectively, often ++; referred to as EGPCS or GPC). Registration is done from left to right, newer ++; values override older values. ++variables_order = "GPCS" ++ ++; Whether or not to register the EGPCS variables as global variables. You may ++; want to turn this off if you don't want to clutter your scripts' global scope ++; with user data. This makes most sense when coupled with track_vars - in which ++; case you can access all of the GPC variables through the $HTTP_*_VARS[], ++; variables. ++; ++; You should do your best to write your scripts so that they do not require ++; register_globals to be on; Using form variables as globals can easily lead ++; to possible security problems, if the code is not very well thought of. ++ ++; NOTE: applications relying on this feature will not recieve full ++; support by the security team. For more information please ++; see /usr/share/doc/php5-common/README.Debian.security ++; ++register_globals = Off ++ ++; Whether or not to register the old-style input arrays, HTTP_GET_VARS ++; and friends. If you're not using them, it's recommended to turn them off, ++; for performance reasons. ++register_long_arrays = Off ++ ++; This directive tells PHP whether to declare the argv&argc variables (that ++; would contain the GET information). If you don't use these variables, you ++; should turn it off for increased performance. ++register_argc_argv = Off ++ ++; When enabled, the SERVER and ENV variables are created when they're first ++; used (Just In Time) instead of when the script starts. If these variables ++; are not used within a script, having this directive on will result in a ++; performance gain. The PHP directives register_globals, register_long_arrays, ++; and register_argc_argv must be disabled for this directive to have any affect. ++auto_globals_jit = On ++ ++; Maximum size of POST data that PHP will accept. ++post_max_size = 8M ++ ++; Magic quotes ++; ++ ++; Magic quotes for incoming GET/POST/Cookie data. ++; Note: This feature is deprecated in PHP 6.0. Applications should not rely ++; on this feature to prevent security attacks. ++magic_quotes_gpc = On ++ ++; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. ++; Note: This feature is deprecated in PHP 6.0. Applications should not rely ++; on this feature to prevent security attacks. ++magic_quotes_runtime = On ++ ++; Use Sybase-style magic quotes (escape ' with '' instead of \'). ++magic_quotes_sybase = Off ++ ++; Automatically add files before or after any PHP document. ++auto_prepend_file = ++auto_append_file = ++ ++; As of 4.0b4, PHP always outputs a character encoding by default in ++; the Content-type: header. To disable sending of the charset, simply ++; set it to be empty. ++; ++; PHP's built-in default is text/html ++default_mimetype = "text/html" ++;default_charset = "iso-8859-1" ++ ++; Always populate the $HTTP_RAW_POST_DATA variable. ++;always_populate_raw_post_data = On ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;; ++; Paths and Directories ; ++;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; UNIX: "/path1:/path2" ++; Note (paranoid): ++; - '.' (the default) is not allowed here, applications that rely on it ++; need to be modified ++; - /usr is allowed, but files there should be protected against being ++; overwritten by mounting the filesystem read-only and should be ++; monitored with a system integrity check tool. ++include_path = "/usr/share/php" ++ ++; Windows: "\path1;\path2" ++;include_path = ".;c:\php\includes" ++ ++; The root of the PHP pages, used only if nonempty. ++; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root ++; if you are running php as a CGI under any web server (other than IIS) ++; see documentation for security issues. The alternate is to use the ++; cgi.force_redirect configuration below ++doc_root = ++ ++; The directory under which PHP opens the script using /~username used only ++; if nonempty. ++user_dir = ++ ++; Directory in which the loadable extensions (modules) reside. ++; extension_dir = "./" ++ ++; Whether or not to enable the dl() function. The dl() function does NOT work ++; properly in multithreaded servers, such as IIS or Zeus, and is automatically ++; disabled on them. ++; ++; NOTE: this is a potential security hole and is disabled by default in debian ++enable_dl = Off ++ ++; cgi.force_redirect is necessary to provide security running PHP as a CGI under ++; most web servers. Left undefined, PHP turns this on by default. You can ++; turn it off here AT YOUR OWN RISK ++; **You CAN safely turn this off for IIS, in fact, you MUST.** ++; cgi.force_redirect = 1 ++ ++; if cgi.nph is enabled it will force cgi to always sent Status: 200 with ++; every request. ++; cgi.nph = 1 ++ ++; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ++; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ++; will look for to know it is OK to continue execution. Setting this variable MAY ++; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ++; cgi.redirect_status_env = ; ++ ++; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ++; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok ++; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting ++; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting ++; of zero causes PHP to behave as before. Default is 1. You should fix your scripts ++; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. ++cgi.fix_pathinfo=1 ++ ++; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ++; security tokens of the calling client. This allows IIS to define the ++; security context that the request runs under. mod_fastcgi under Apache ++; does not currently support this feature (03/17/2002) ++; Set to 1 if running under IIS. Default is zero. ++; fastcgi.impersonate = 1; ++ ++; Disable logging through FastCGI connection ++; fastcgi.logging = 0 ++ ++; cgi.rfc2616_headers configuration option tells PHP what type of headers to ++; use when sending HTTP response code. If it's set 0 PHP sends Status: header that ++; is supported by Apache. When this option is set to 1 PHP will send ++; RFC2616 compliant header. ++; Default is zero. ++;cgi.rfc2616_headers = 0 ++ ++ ++;;;;;;;;;;;;;;;; ++; File Uploads ; ++;;;;;;;;;;;;;;;; ++ ++; Whether to allow HTTP file uploads. ++file_uploads = Off ++ ++; Temporary directory for HTTP uploaded files (will use system default if not ++; specified). ++; ++; Note: If enabled above you have to create this directory and set appropiate ++; permissions. The default (/tmp) is insecure since other users might be able ++; to access upload files or make symlink tricks. ++upload_tmp_dir = /var/lib/php5/uploads ++ ++; Maximum allowed size for uploaded files. ++upload_max_filesize = 2M ++ ++ ++;;;;;;;;;;;;;;;;;; ++; Fopen wrappers ; ++;;;;;;;;;;;;;;;;;; ++ ++; Whether to allow the treatment of URLs (like http:// or ftp://) as files. ++; ++; This is turned off to avoid variable redefinition by remote attacker ++; that attempts to have the server download (and execute) a remote file ++; from a compromised host. This behaviour has been observed in automatic ++; scanning against badly written applications: ++; http://myhost/myapplication.php?include=http://roguesever/rogueapp.php ++allow_url_fopen = Off ++ ++; Whether to allow include/require to open URLs (like http:// or ftp://) as files. ++allow_url_include = Off ++ ++; Define the anonymous ftp password (your email address) ++;from="john@doe.com" ++ ++; Define the User-Agent string ++; user_agent="PHP" ++ ++; Default timeout for socket based streams (seconds) ++default_socket_timeout = 60 ++ ++; If your scripts have to deal with files from Macintosh systems, ++; or you are running on a Mac and need to deal with files from ++; unix or win32 systems, setting this flag will cause PHP to ++; automatically detect the EOL character in those files so that ++; fgets() and file() will work regardless of the source of the file. ++; auto_detect_line_endings = Off ++ ++ ++;;;;;;;;;;;;;;;;;;;;;; ++; Dynamic Extensions ; ++;;;;;;;;;;;;;;;;;;;;;; ++; ++; If you wish to have an extension loaded automatically, use the following ++; syntax: ++; ++; extension=modulename.extension ++; ++; For example, on Windows: ++; ++; extension=msql.dll ++; ++; ... or under UNIX: ++; ++; extension=msql.so ++; ++; Note that it should be the name of the module only; no directory information ++; needs to go here. Specify the location of the extension with the ++; extension_dir directive above. ++ ++ ++;;;;;;;;;;;;;;;;;;; ++; Module Settings ; ++;;;;;;;;;;;;;;;;;;; ++ ++[Date] ++; Defines the default timezone used by the date functions ++;date.timezone = ++ ++;date.default_latitude = 31.7667 ++;date.default_longitude = 35.2333 ++ ++;date.sunrise_zenith = 90.583333 ++;date.sunset_zenith = 90.583333 ++ ++[filter] ++;filter.default = unsafe_raw ++;filter.default_flags = ++ ++[iconv] ++;iconv.input_encoding = ISO-8859-1 ++;iconv.internal_encoding = ISO-8859-1 ++;iconv.output_encoding = ISO-8859-1 ++ ++[sqlite] ++;sqlite.assoc_case = 0 ++ ++[xmlrpc] ++;xmlrpc_error_number = 0 ++;xmlrpc_errors = 0 ++ ++[Pcre] ++;PCRE library backtracking limit. ++;pcre.backtrack_limit=100000 ++ ++;PCRE library recursion limit. ++;Please note that if you set this value to a high number you may consume all ++;the available process stack and eventually crash PHP (due to reaching the ++;stack size limit imposed by the Operating System). ++;pcre.recursion_limit=100000 ++ ++[Syslog] ++; Whether or not to define the various syslog variables (e.g. $LOG_PID, ++; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In ++; runtime, you can define these variables by calling define_syslog_variables(). ++define_syslog_variables = Off ++ ++[mail function] ++; For Win32 only. ++SMTP = localhost ++smtp_port = 25 ++ ++; For Win32 only. ++;sendmail_from = me@example.com ++ ++; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ++;sendmail_path = ++ ++; Force the addition of the specified parameters to be passed as extra parameters ++; to the sendmail binary. These parameters will always replace the value of ++; the 5th parameter to mail(), even in safe mode. ++;mail.force_extra_parameters = ++ ++[SQL] ++; This configuration directive is unrelated to safe_mode. ++; If enabled, connections to databases (like mysql_connect() or mysql_pconnect()) ++; will ignore the arguments provided (which include username and password) and ++; will attempt to connect always using default values. These default values ++; are typically host=localhost, user=the script owner,password=empty password. ++; ++; Note (paranoid): This is disabled as it is not actually a security measure, unless ++; you want script to not have users and passwords hardcoded in them. ++sql.safe_mode = Off ++ ++[ODBC] ++;odbc.default_db = Not yet implemented ++;odbc.default_user = Not yet implemented ++;odbc.default_pw = Not yet implemented ++ ++; Allow or prevent persistent links. ++odbc.allow_persistent = On ++ ++; Check that a connection is still valid before reuse. ++odbc.check_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++odbc.max_persistent = -1 ++ ++; Maximum number of links (persistent + non-persistent). -1 means no limit. ++odbc.max_links = -1 ++ ++; Handling of LONG fields. Returns number of bytes to variables. 0 means ++; passthru. ++odbc.defaultlrl = 4096 ++ ++; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. ++; See the documentation on odbc_binmode and odbc_longreadlen for an explanation ++; of uodbc.defaultlrl and uodbc.defaultbinmode ++odbc.defaultbinmode = 1 ++ ++[MySQL] ++; Allow or prevent persistent links. ++mysql.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++mysql.max_persistent = -1 ++ ++; Maximum number of links (persistent + non-persistent). -1 means no limit. ++mysql.max_links = -1 ++ ++; Default port number for mysql_connect(). If unset, mysql_connect() will use ++; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ++; compile-time value defined MYSQL_PORT (in that order). Win32 will only look ++; at MYSQL_PORT. ++mysql.default_port = ++ ++; Default socket name for local MySQL connects. If empty, uses the built-in ++; MySQL defaults. ++mysql.default_socket = ++ ++; Default host for mysql_connect() (doesn't apply in safe mode). ++mysql.default_host = ++ ++; Default user for mysql_connect() (doesn't apply in safe mode). ++mysql.default_user = ++ ++; Default password for mysql_connect() (doesn't apply in safe mode). ++; Note that this is generally a *bad* idea to store passwords in this file. ++; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") ++; and reveal this password! And of course, any users with read access to this ++; file will be able to reveal the password as well. ++mysql.default_password = ++ ++; Maximum time (in seconds) for connect timeout. -1 means no limit ++mysql.connect_timeout = 60 ++ ++; Trace mode. When trace_mode is active (=On), warnings for table/index scans and ++; SQL-Errors will be displayed. ++mysql.trace_mode = Off ++ ++[MySQLi] ++ ++; Maximum number of links. -1 means no limit. ++mysqli.max_links = -1 ++ ++; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ++; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ++; compile-time value defined MYSQL_PORT (in that order). Win32 will only look ++; at MYSQL_PORT. ++mysqli.default_port = 3306 ++ ++; Default socket name for local MySQL connects. If empty, uses the built-in ++; MySQL defaults. ++mysqli.default_socket = ++ ++; Default host for mysql_connect() (doesn't apply in safe mode). ++mysqli.default_host = ++ ++; Default user for mysql_connect() (doesn't apply in safe mode). ++mysqli.default_user = ++ ++; Default password for mysqli_connect() (doesn't apply in safe mode). ++; Note that this is generally a *bad* idea to store passwords in this file. ++; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") ++; and reveal this password! And of course, any users with read access to this ++; file will be able to reveal the password as well. ++mysqli.default_pw = ++ ++; Allow or prevent reconnect ++mysqli.reconnect = Off ++ ++[mSQL] ++; Allow or prevent persistent links. ++msql.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++msql.max_persistent = -1 ++ ++; Maximum number of links (persistent+non persistent). -1 means no limit. ++msql.max_links = -1 ++ ++[OCI8] ++; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) ++;oci8.privileged_connect = Off ++ ++; Connection: The maximum number of persistent OCI8 connections per ++; process. Using -1 means no limit. ++;oci8.max_persistent = -1 ++ ++; Connection: The maximum number of seconds a process is allowed to ++; maintain an idle persistent connection. Using -1 means idle ++; persistent connections will be maintained forever. ++;oci8.persistent_timeout = -1 ++ ++; Connection: The number of seconds that must pass before issuing a ++; ping during oci_pconnect() to check the connection validity. When ++; set to 0, each oci_pconnect() will cause a ping. Using -1 disables ++; pings completely. ++;oci8.ping_interval = 60 ++ ++; Tuning: This option enables statement caching, and specifies how ++; many statements to cache. Using 0 disables statement caching. ++;oci8.statement_cache_size = 20 ++ ++; Tuning: Enables statement prefetching and sets the default number of ++; rows that will be fetched automatically after statement execution. ++;oci8.default_prefetch = 10 ++ ++; Compatibility. Using On means oci_close() will not close ++; oci_connect() and oci_new_connect() connections. ++;oci8.old_oci_close_semantics = Off ++ ++[PostgresSQL] ++; Allow or prevent persistent links. ++pgsql.allow_persistent = On ++ ++; Detect broken persistent links always with pg_pconnect(). ++; Auto reset feature requires a little overheads. ++pgsql.auto_reset_persistent = Off ++ ++; Maximum number of persistent links. -1 means no limit. ++pgsql.max_persistent = -1 ++ ++; Maximum number of links (persistent+non persistent). -1 means no limit. ++pgsql.max_links = -1 ++ ++; Ignore PostgreSQL backends Notice message or not. ++; Notice message logging require a little overheads. ++pgsql.ignore_notice = 0 ++ ++; Log PostgreSQL backends Noitce message or not. ++; Unless pgsql.ignore_notice=0, module cannot log notice message. ++pgsql.log_notice = 0 ++ ++[Sybase] ++; Allow or prevent persistent links. ++sybase.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++sybase.max_persistent = -1 ++ ++; Maximum number of links (persistent + non-persistent). -1 means no limit. ++sybase.max_links = -1 ++ ++;sybase.interface_file = "/usr/sybase/interfaces" ++ ++; Minimum error severity to display. ++sybase.min_error_severity = 10 ++ ++; Minimum message severity to display. ++sybase.min_message_severity = 10 ++ ++; Compatibility mode with old versions of PHP 3.0. ++; If on, this will cause PHP to automatically assign types to results according ++; to their Sybase type, instead of treating them all as strings. This ++; compatibility mode will probably not stay around forever, so try applying ++; whatever necessary changes to your code, and turn it off. ++sybase.compatability_mode = Off ++ ++[Sybase-CT] ++; Allow or prevent persistent links. ++sybct.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++sybct.max_persistent = -1 ++ ++; Maximum number of links (persistent + non-persistent). -1 means no limit. ++sybct.max_links = -1 ++ ++; Minimum server message severity to display. ++sybct.min_server_severity = 10 ++ ++; Minimum client message severity to display. ++sybct.min_client_severity = 10 ++ ++[bcmath] ++; Number of decimal digits for all bcmath functions. ++bcmath.scale = 0 ++ ++[browscap] ++;browscap = extra/browscap.ini ++ ++[Informix] ++; Default host for ifx_connect() (doesn't apply in safe mode). ++ifx.default_host = ++ ++; Default user for ifx_connect() (doesn't apply in safe mode). ++ifx.default_user = ++ ++; Default password for ifx_connect() (doesn't apply in safe mode). ++ifx.default_password = ++ ++; Allow or prevent persistent links. ++ifx.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++ifx.max_persistent = -1 ++ ++; Maximum number of links (persistent + non-persistent). -1 means no limit. ++ifx.max_links = -1 ++ ++; If on, select statements return the contents of a text blob instead of its id. ++ifx.textasvarchar = 0 ++ ++; If on, select statements return the contents of a byte blob instead of its id. ++ifx.byteasvarchar = 0 ++ ++; Trailing blanks are stripped from fixed-length char columns. May help the ++; life of Informix SE users. ++ifx.charasvarchar = 0 ++ ++; If on, the contents of text and byte blobs are dumped to a file instead of ++; keeping them in memory. ++ifx.blobinfile = 0 ++ ++; NULL's are returned as empty strings, unless this is set to 1. In that case, ++; NULL's are returned as string 'NULL'. ++ifx.nullformat = 0 ++ ++[Session] ++; Handler used to store/retrieve data. ++session.save_handler = files ++ ++; Argument passed to save_handler. In the case of files, this is the path ++; where data files are stored. Note: Windows users have to change this ++; variable in order to use PHP's session functions. ++; ++; As of PHP 4.0.1, you can define the path as: ++; ++; session.save_path = "N;/path" ++; ++; where N is an integer. Instead of storing all the session files in ++; /path, what this will do is use subdirectories N-levels deep, and ++; store the session data in those directories. This is useful if you ++; or your OS have problems with lots of files in one directory, and is ++; a more efficient layout for servers that handle lots of sessions. ++; ++; NOTE 1: PHP will not create this directory structure automatically. ++; You can use the script in the ext/session dir for that purpose. ++; NOTE 2: See the section on garbage collection below if you choose to ++; use subdirectories for session storage ++; ++; The file storage module creates files using mode 600 by default. ++; You can change that by using ++; ++; session.save_path = "N;MODE;/path" ++; ++; where MODE is the octal representation of the mode. Note that this ++; does not overwrite the process's umask. ++session.save_path = /var/lib/php5 ++ ++; Substring to check each HTTP Referer for. If the Referer was sent by the ++; client and the substring was not found, the embedded session id will be marked ++; as invalid. Defaults to the empty string. ++; Note (paranoid): to prevent some XSS attacks should be defined to the server's URI ++; session.referer_check = ++ ++ ++; Path to an external resource (file) which will be used as an additional ++; entropy source in the session id creation process. ++; Note (paranoid): /dev/urandom is not fully random but if /dev/random is used ++; the entropy pool could be exhaused by constantly asking for session ids and ++; would compromise other applications relying on randomness ++session.entropy_file = "/dev/urandom" ++ ++; Number of bytes which will be read from the file specified above. ++; Defaults to 0 (disabled). ++session.entropy_length = 6 ++ ++; Whether to use cookies. ++session.use_cookies = 1 ++ ++; If this option is enabled cookies are only sent through secure (SSL) ++; connections and, consequently, are more difficult to intercept. ++; (disabled by default) ++session.cookie_secure = 1 ++ ++; This option enables administrators to make their users invulnerable to ++; attacks which involve passing session ids in URLs; defaults to 1 (since PHP 6.0). ++session.use_only_cookies = 1 ++ ++; Name of the session (used as cookie name). ++session.name = PHPSESSID ++ ++; Initialize session on request startup. ++session.auto_start = 0 ++ ++; Lifetime in seconds of cookie or, if 0, until browser is restarted. ++session.cookie_lifetime = 0 ++ ++; The path for which the cookie is valid. ++; Note (paranoid): Applications should restrict the path where the cookie ++; is valid through use of session_set_cookie_params(). ++session.cookie_path = / ++ ++; The domain for which the cookie is valid. ++; Note (paranoid): Make sure you configure this for your site ++session.cookie_domain = ++ ++; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. ++session.cookie_httponly = 1 ++ ++; Handler used to serialize data. php is the standard serializer of PHP. ++session.serialize_handler = php ++ ++; Define the probability that the 'garbage collection' process is started ++; on every session initialization. ++; The probability is calculated by using gc_probability/gc_divisor, ++; e.g. 1/100 means there is a 1% chance that the GC process starts ++; on each request. ++ ++; This is disabled in the Debian packages, due to the strict permissions ++; on /var/lib/php5. Instead of setting this here, see the cronjob at ++; /etc/cron.d/php5, which uses the session.gc_maxlifetime setting below ++;session.gc_probability = 0 ++session.gc_divisor = 100 ++ ++; After this number of seconds, stored data will be seen as 'garbage' and ++; cleaned up by the garbage collection process. ++session.gc_maxlifetime = 1440 ++ ++; NOTE: If you are using the subdirectory option for storing session files ++; (see session.save_path above), then garbage collection does *not* ++; happen automatically. You will need to do your own garbage ++; collection through a shell script, cron entry, or some other method. ++; For example, the following script would is the equivalent of ++; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ++; cd /path/to/sessions; find -cmin +24 | xargs rm ++ ++; PHP 4.2 and less have an undocumented feature/bug that allows you to ++; to initialize a session variable in the global scope, albeit register_globals ++; is disabled. PHP 4.3 and later will warn you, if this feature is used. ++; You can disable the feature and the warning separately. At this time, ++; the warning is only displayed, if bug_compat_42 is enabled. ++ ++session.bug_compat_42 = 0 ++session.bug_compat_warn = 1 ++ ++; Check HTTP Referer to invalidate externally stored URLs containing ids. ++; HTTP_REFERER has to contain this substring for the session to be ++; considered as valid. ++session.referer_check = ++ ++; How many bytes to read from the file. ++session.entropy_length = 0 ++ ++; Specified here to create the session id. ++session.entropy_file = ++ ++;session.entropy_length = 16 ++ ++;session.entropy_file = /dev/urandom ++ ++; Set to {nocache,private,public,} to determine HTTP caching aspects ++; or leave this empty to avoid sending anti-caching headers. ++session.cache_limiter = nocache ++ ++; Document expires after n minutes. ++session.cache_expire = 180 ++ ++; trans sid support is disabled by default. ++; Use of trans sid may risk your users security. ++; Use this option with caution. ++; - User may send URL contains active session ID ++; to other person via. email/irc/etc. ++; - URL that contains active session ID may be stored ++; in publically accessible computer. ++; - User may access your site with the same session ID ++; always using URL stored in browser's history or bookmarks. ++session.use_trans_sid = 0 ++ ++; Select a hash function ++; 0: MD5 (128 bits) ++; 1: SHA-1 (160 bits) ++; Note (paranoic): Set to SHA-1 since there are known attacks against MD5 ++; although the algorithm is not yet broken) ++session.hash_function = 1 ++ ++; Define how many bits are stored in each character when converting ++; the binary hash data to something readable. ++; ++; 4 bits: 0-9, a-f ++; 5 bits: 0-9, a-v ++; 6 bits: 0-9, a-z, A-Z, "-", "," ++session.hash_bits_per_character = 4 ++ ++; The URL rewriter will look for URLs in a defined set of HTML tags. ++; form/fieldset are special; if you include them here, the rewriter will ++; add a hidden field with the info which is otherwise appended ++; to URLs. If you want XHTML conformity, remove the form entry. ++; Note that all valid entries require a "=", even if no value follows. ++url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry,fieldset=" ++ ++[MSSQL] ++; Allow or prevent persistent links. ++mssql.allow_persistent = On ++ ++; Maximum number of persistent links. -1 means no limit. ++mssql.max_persistent = -1 ++ ++; Maximum number of links (persistent+non persistent). -1 means no limit. ++mssql.max_links = -1 ++ ++; Minimum error severity to display. ++mssql.min_error_severity = 10 ++ ++; Minimum message severity to display. ++mssql.min_message_severity = 10 ++ ++; Compatibility mode with old versions of PHP 3.0. ++mssql.compatability_mode = Off ++ ++; Connect timeout ++;mssql.connect_timeout = 5 ++ ++; Query timeout ++;mssql.timeout = 60 ++ ++; Valid range 0 - 2147483647. Default = 4096. ++;mssql.textlimit = 4096 ++ ++; Valid range 0 - 2147483647. Default = 4096. ++;mssql.textsize = 4096 ++ ++; Limits the number of records in each batch. 0 = all records in one batch. ++;mssql.batchsize = 0 ++ ++; Specify how datetime and datetim4 columns are returned ++; On => Returns data converted to SQL server settings ++; Off => Returns values as YYYY-MM-DD hh:mm:ss ++;mssql.datetimeconvert = On ++ ++; Use NT authentication when connecting to the server ++mssql.secure_connection = On ++ ++; Specify max number of processes. -1 = library default ++; msdlib defaults to 25 ++; FreeTDS defaults to 4096 ++;mssql.max_procs = -1 ++ ++; Specify client character set. ++; If empty or not set the client charset from freetds.comf is used ++; This is only used when compiled with FreeTDS ++;mssql.charset = "ISO-8859-1" ++ ++[Assertion] ++; Assert(expr); active by default. ++;assert.active = On ++ ++; Issue a PHP warning for each failed assertion. ++;assert.warning = On ++ ++; Don't bail out by default. ++;assert.bail = Off ++ ++; User-function to be called if an assertion fails. ++;assert.callback = 0 ++ ++; Eval the expression with current error_reporting(). Set to true if you want ++; error_reporting(0) around the eval(). ++;assert.quiet_eval = 0 ++ ++[COM] ++; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs ++;com.typelib_file = ++; allow Distributed-COM calls ++;com.allow_dcom = true ++; autoregister constants of a components typlib on com_load() ++;com.autoregister_typelib = true ++; register constants casesensitive ++;com.autoregister_casesensitive = false ++; show warnings on duplicate constant registrations ++;com.autoregister_verbose = true ++ ++[mbstring] ++; language for internal character representation. ++;mbstring.language = Japanese ++ ++; internal/script encoding. ++; Some encoding cannot work as internal encoding. ++; (e.g. SJIS, BIG5, ISO-2022-*) ++;mbstring.internal_encoding = EUC-JP ++ ++; http input encoding. ++;mbstring.http_input = auto ++ ++; http output encoding. mb_output_handler must be ++; registered as output buffer to function ++;mbstring.http_output = SJIS ++ ++; enable automatic encoding translation according to ++; mbstring.internal_encoding setting. Input chars are ++; converted to internal encoding by setting this to On. ++; Note: Do _not_ use automatic encoding translation for ++; portable libs/applications. ++;mbstring.encoding_translation = Off ++ ++; automatic encoding detection order. ++; auto means ++;mbstring.detect_order = auto ++ ++; substitute_character used when character cannot be converted ++; one from another ++;mbstring.substitute_character = none; ++ ++; overload(replace) single byte functions by mbstring functions. ++; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), ++; etc. Possible values are 0,1,2,4 or combination of them. ++; For example, 7 for overload everything. ++; 0: No overload ++; 1: Overload mail() function ++; 2: Overload str*() functions ++; 4: Overload ereg*() functions ++;mbstring.func_overload = 0 ++ ++[FrontBase] ++;fbsql.allow_persistent = On ++;fbsql.autocommit = On ++;fbsql.show_timestamp_decimals = Off ++;fbsql.default_database = ++;fbsql.default_database_password = ++;fbsql.default_host = ++;fbsql.default_password = ++;fbsql.default_user = "_SYSTEM" ++;fbsql.generate_warnings = Off ++;fbsql.max_connections = 128 ++;fbsql.max_links = 128 ++;fbsql.max_persistent = -1 ++;fbsql.max_results = 128 ++ ++[gd] ++; Tell the jpeg decode to libjpeg warnings and try to create ++; a gd image. The warning will then be displayed as notices ++; disabled by default ++;gd.jpeg_ignore_warning = 0 ++ ++[exif] ++; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. ++; With mbstring support this will automatically be converted into the encoding ++; given by corresponding encode setting. When empty mbstring.internal_encoding ++; is used. For the decode settings you can distinguish between motorola and ++; intel byte order. A decode setting cannot be empty. ++;exif.encode_unicode = ISO-8859-15 ++;exif.decode_unicode_motorola = UCS-2BE ++;exif.decode_unicode_intel = UCS-2LE ++;exif.encode_jis = ++;exif.decode_jis_motorola = JIS ++;exif.decode_jis_intel = JIS ++ ++[Tidy] ++; The path to a default tidy configuration file to use when using tidy ++;tidy.default_config = /usr/local/lib/php/default.tcfg ++ ++; Should tidy clean and repair output automatically? ++; WARNING: Do not use this option if you are generating non-html content ++; such as dynamic images ++tidy.clean_output = Off ++ ++[soap] ++; Enables or disables WSDL caching feature. ++soap.wsdl_cache_enabled=1 ++; Sets the directory name where SOAP extension will put cache files. ++soap.wsdl_cache_dir="/var/lib/php5/soap-cache" ++; (time to live) Sets the number of second while cached file will be used ++; instead of original one. ++soap.wsdl_cache_ttl=86400 ++ ++; Local Variables: ++; tab-width: 4 ++; End: --- php5-5.3.6.orig/debian/patches/PEAR-Builder-print-info-about-php5-dev.patch +++ php5-5.3.6/debian/patches/PEAR-Builder-print-info-about-php5-dev.patch @@ -0,0 +1,10 @@ +--- a/PEAR/Builder.php 2011-05-14 20:43:01.000000000 +0000 ++++ b/PEAR/Builder.php 2011-05-26 15:56:41.096485701 +0000 +@@ -309,6 +309,8 @@ class PEAR_Builder extends PEAR_Common + } + + if (!$err) { ++ print "If the command failed with 'phpize: not found' then you need to install php5-dev package"; ++ print "You can do it by running 'apt-get install php5-dev' as a root user"; + return $this->raiseError("`phpize' failed"); + } --- php5-5.3.6.orig/debian/patches/fpm-config.patch +++ php5-5.3.6/debian/patches/fpm-config.patch @@ -0,0 +1,79 @@ +Description: Add major version number to paths and allow process pools + to be configured in individual files in /etc/php5/fpm/pool.d/ +Origin: vendor +Forwarded: not-needed +Last-Update: 2010-07-30 + +--- a/sapi/fpm/php-fpm.conf.in ++++ b/sapi/fpm/php-fpm.conf.in +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=@EXPANDED_SYSCONFDIR@/php5/fpm/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,12 +22,12 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = @EXPANDED_LOCALSTATEDIR@/run/php5-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = @EXPANDED_LOCALSTATEDIR@/log/php5-fpm.log + + ; Log level + ; Possible Values: alert, error, warning, notice, debug +@@ -67,6 +67,10 @@ + ; used in logs and stats. There is no limitation on the number of pools which + ; FPM can handle. Your system will tell you anyway :) + ++; To configure the pools it is recommended to have one .conf file per ++; pool in the following directory: ++include=@EXPANDED_SYSCONFDIR@/php5/fpm/pool.d/*.conf ++ + ; Start a new pool named 'www'. + ; the variable $pool can we used in any directive and will be replaced by the + ; pool name ('www' here) +@@ -149,22 +153,22 @@ pm = dynamic + ; CGI. + ; Note: Used when pm is set to either 'static' or 'dynamic' + ; Note: This value is mandatory. +-pm.max_children = 50 ++pm.max_children = 10 + + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 4 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 2 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 6 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For +@@ -264,7 +268,7 @@ pm.max_children = 50 + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++chdir = / + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. --- php5-5.3.6.orig/debian/patches/sybase-alias.patch +++ php5-5.3.6/debian/patches/sybase-alias.patch @@ -0,0 +1,41 @@ +--- a/ext/mssql/php_mssql.c ++++ b/ext/mssql/php_mssql.c +@@ -178,6 +178,38 @@ const zend_function_entry mssql_function + PHP_FE(mssql_execute, arginfo_mssql_execute) + PHP_FE(mssql_free_statement, arginfo_mssql_free_statement) + PHP_FE(mssql_guid_string, arginfo_mssql_guid_string) ++#if !defined(PHP_WIN32) && !defined(HAVE_SYBASE_CT) ++ PHP_FALIAS(sybase_connect, mssql_connect, arginfo_mssql_connect) ++ PHP_FALIAS(sybase_pconnect, mssql_pconnect, arginfo_mssql_connect) ++ PHP_FALIAS(sybase_close, mssql_close, arginfo_mssql_close) ++ PHP_FALIAS(sybase_select_db, mssql_select_db, arginfo_mssql_select_db) ++ PHP_FALIAS(sybase_query, mssql_query, arginfo_mssql_query) ++ PHP_FALIAS(sybase_fetch_batch, mssql_fetch_batch, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_affected_rows, mssql_rows_affected, arginfo_mssql_rows_affected) ++ PHP_FALIAS(sybase_free_result, mssql_free_result, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_get_last_message, mssql_get_last_message, arginfo_mssql_get_last_message) ++ PHP_FALIAS(sybase_num_rows, mssql_num_rows, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_num_fields, mssql_num_fields, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_fetch_field, mssql_fetch_field, arginfo_mssql_fetch_field) ++ PHP_FALIAS(sybase_fetch_row, mssql_fetch_row, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_fetch_array, mssql_fetch_array, arginfo_mssql_fetch_array) ++ PHP_FALIAS(sybase_fetch_assoc, mssql_fetch_assoc, arginfo_mssql_fetch_assoc) ++ PHP_FALIAS(sybase_fetch_object, mssql_fetch_object, arginfo_mssql_fetch_batch) ++ PHP_FALIAS(sybase_field_length, mssql_field_length, arginfo_mssql_field_length) ++ PHP_FALIAS(sybase_field_name, mssql_field_name, arginfo_mssql_field_length) ++ PHP_FALIAS(sybase_field_type, mssql_field_type, arginfo_mssql_field_length) ++ PHP_FALIAS(sybase_data_seek, mssql_data_seek, arginfo_mssql_data_seek) ++ PHP_FALIAS(sybase_field_seek, mssql_field_seek, arginfo_mssql_fetch_field) ++ PHP_FALIAS(sybase_result, mssql_result, arginfo_mssql_result) ++ PHP_FALIAS(sybase_next_result, mssql_next_result, arginfo_mssql_fetch_assoc) ++ PHP_FALIAS(sybase_min_error_severity, mssql_min_error_severity, arginfo_mssql_min_error_severity) ++ PHP_FALIAS(sybase_min_message_severity, mssql_min_message_severity, arginfo_mssql_min_error_severity) ++ PHP_FALIAS(sybase_init, mssql_init, arginfo_mssql_init) ++ PHP_FALIAS(sybase_bind, mssql_bind, arginfo_mssql_bind) ++ PHP_FALIAS(sybase_execute, mssql_execute, arginfo_mssql_execute) ++ PHP_FALIAS(sybase_free_statement, mssql_free_statement, arginfo_mssql_free_statement) ++ PHP_FALIAS(sybase_guid_string, mssql_guid_string, arginfo_mssql_guid_string) ++#endif + {NULL, NULL, NULL} + }; + /* }}} */ --- php5-5.3.6.orig/debian/patches/php-fpm-man-section-and-cleanup.patch +++ php5-5.3.6/debian/patches/php-fpm-man-section-and-cleanup.patch @@ -0,0 +1,38 @@ +Description: Fix php-fpm's manpage section to match location of binary + (/usr/sbin,) additionally, remove some stuff that is useless or + doesn't apply to Debian. +Origin: vendor +Forwarded: http://bugs.php.net/52476 +Last-Update: 2010-07-29 + +--- a/sapi/fpm/php-fpm.8.in ++++ b/sapi/fpm/php-fpm.8.in +@@ -112,15 +112,8 @@ The configuration file for the php-fpm d + .TP + .B php.ini + The standard php configuration file. +-.SH EXAMPLES +-You should use the init script provided to start and stop the php-fpm daemon. This situation applies for any unix systems which use init.d for their main process manager. +-.P +-.PD 1 +-.RS +-sudo /etc/init.d/php-fpm start +-.RE +-.TP +-If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals: ++.SH SIGNAL ++Once started, php-fpm then responds to several POSIX signals: + .P + .PD 0 + .RS +@@ -134,10 +127,6 @@ If your installation has no appropriate + .RE + .PD 1 + .P +-.SH TIPS +-The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx. +-.PD 1 +-.P + .SH SEE ALSO + The PHP-FPM website: + .PD 0 --- php5-5.3.6.orig/debian/patches/019-z_off_t_as_long.patch +++ php5-5.3.6/debian/patches/019-z_off_t_as_long.patch @@ -0,0 +1,1541 @@ +Description: Include some zlib headers to make sure z_off_t is a long on + the gzip file functions. Issue caused by LFS support. + . + Needs to be re-checked. +Origin: vendor +Bug-Debian: http://bugs.debian.org/208608 +Forwarded: no +Last-Update: 2010-01-18 + +--- /dev/null ++++ b/ext/zlib/zconf.h +@@ -0,0 +1,326 @@ ++/* zconf.h -- configuration of the zlib compression library ++ * Copyright (C) 1995-2003 Jean-loup Gailly. ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++/* @(#) $Id: 019-z_off_t_as_long.patch.disabled,v 1.3 2004/08/23 07:48:56 adconrad Exp $ */ ++ ++#ifndef ZCONF_H ++#define ZCONF_H ++ ++#warning Including local zconf.h instead of system zconf.h ++ ++/* ++ * If you *really* need a unique prefix for all types and library functions, ++ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. ++ */ ++#ifdef Z_PREFIX ++# define deflateInit_ z_deflateInit_ ++# define deflate z_deflate ++# define deflateEnd z_deflateEnd ++# define inflateInit_ z_inflateInit_ ++# define inflate z_inflate ++# define inflateEnd z_inflateEnd ++# define deflateInit2_ z_deflateInit2_ ++# define deflateSetDictionary z_deflateSetDictionary ++# define deflateCopy z_deflateCopy ++# define deflateReset z_deflateReset ++# define deflatePrime z_deflatePrime ++# define deflateParams z_deflateParams ++# define deflateBound z_deflateBound ++# define inflateInit2_ z_inflateInit2_ ++# define inflateSetDictionary z_inflateSetDictionary ++# define inflateSync z_inflateSync ++# define inflateSyncPoint z_inflateSyncPoint ++# define inflateCopy z_inflateCopy ++# define inflateReset z_inflateReset ++# define compress z_compress ++# define compress2 z_compress2 ++# define compressBound z_compressBound ++# define uncompress z_uncompress ++# define adler32 z_adler32 ++# define crc32 z_crc32 ++# define get_crc_table z_get_crc_table ++ ++# define Byte z_Byte ++# define uInt z_uInt ++# define uLong z_uLong ++# define Bytef z_Bytef ++# define charf z_charf ++# define intf z_intf ++# define uIntf z_uIntf ++# define uLongf z_uLongf ++# define voidpf z_voidpf ++# define voidp z_voidp ++#endif ++ ++#if defined(__MSDOS__) && !defined(MSDOS) ++# define MSDOS ++#endif ++#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) ++# define OS2 ++#endif ++#if defined(_WINDOWS) && !defined(WINDOWS) ++# define WINDOWS ++#endif ++#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) ++# define WIN32 ++#endif ++#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) ++# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) ++# ifndef SYS16BIT ++# define SYS16BIT ++# endif ++# endif ++#endif ++ ++/* ++ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more ++ * than 64k bytes at a time (needed on systems with 16-bit int). ++ */ ++#ifdef SYS16BIT ++# define MAXSEG_64K ++#endif ++#ifdef MSDOS ++# define UNALIGNED_OK ++#endif ++ ++#ifdef __STDC_VERSION__ ++# ifndef STDC ++# define STDC ++# endif ++# if __STDC_VERSION__ >= 199901L ++# ifndef STDC99 ++# define STDC99 ++# endif ++# endif ++#endif ++#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) ++# define STDC ++#endif ++#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) ++# define STDC ++#endif ++ ++#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ ++# define STDC ++#endif ++ ++#ifndef STDC ++# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ ++# define const /* note: need a more gentle solution here */ ++# endif ++#endif ++ ++/* Some Mac compilers merge all .h files incorrectly: */ ++#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) ++# define NO_DUMMY_DECL ++#endif ++ ++/* Maximum value for memLevel in deflateInit2 */ ++#ifndef MAX_MEM_LEVEL ++# ifdef MAXSEG_64K ++# define MAX_MEM_LEVEL 8 ++# else ++# define MAX_MEM_LEVEL 9 ++# endif ++#endif ++ ++/* Maximum value for windowBits in deflateInit2 and inflateInit2. ++ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files ++ * created by gzip. (Files created by minigzip can still be extracted by ++ * gzip.) ++ */ ++#ifndef MAX_WBITS ++# define MAX_WBITS 15 /* 32K LZ77 window */ ++#endif ++ ++/* The memory requirements for deflate are (in bytes): ++ (1 << (windowBits+2)) + (1 << (memLevel+9)) ++ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) ++ plus a few kilobytes for small objects. For example, if you want to reduce ++ the default memory requirements from 256K to 128K, compile with ++ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" ++ Of course this will generally degrade compression (there's no free lunch). ++ ++ The memory requirements for inflate are (in bytes) 1 << windowBits ++ that is, 32K for windowBits=15 (default value) plus a few kilobytes ++ for small objects. ++*/ ++ ++ /* Type declarations */ ++ ++#ifndef OF /* function prototypes */ ++# ifdef STDC ++# define OF(args) args ++# else ++# define OF(args) () ++# endif ++#endif ++ ++/* The following definitions for FAR are needed only for MSDOS mixed ++ * model programming (small or medium model with some far allocations). ++ * This was tested only with MSC; for other MSDOS compilers you may have ++ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, ++ * just define FAR to be empty. ++ */ ++#ifdef SYS16BIT ++# if defined(M_I86SM) || defined(M_I86MM) ++ /* MSC small or medium model */ ++# define SMALL_MEDIUM ++# ifdef _MSC_VER ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++# if (defined(__SMALL__) || defined(__MEDIUM__)) ++ /* Turbo C small or medium model */ ++# define SMALL_MEDIUM ++# ifdef __BORLANDC__ ++# define FAR _far ++# else ++# define FAR far ++# endif ++# endif ++#endif ++ ++#if defined(WINDOWS) || defined(WIN32) ++ /* If building or using zlib as a DLL, define ZLIB_DLL. ++ * This is not mandatory, but it offers a little performance increase. ++ */ ++# ifdef ZLIB_DLL ++# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) ++# ifdef ZLIB_INTERNAL ++# define ZEXTERN extern __declspec(dllexport) ++# else ++# define ZEXTERN extern __declspec(dllimport) ++# endif ++# endif ++# endif /* ZLIB_DLL */ ++ /* If building or using zlib with the WINAPI/WINAPIV calling convention, ++ * define ZLIB_WINAPI. ++ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. ++ */ ++# ifdef ZLIB_WINAPI ++# ifdef FAR ++# undef FAR ++# endif ++# include ++ /* No need for _export, use ZLIB.DEF instead. */ ++ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ ++# define ZEXPORT WINAPI ++# ifdef WIN32 ++# define ZEXPORTVA WINAPIV ++# else ++# define ZEXPORTVA FAR CDECL ++# endif ++# endif ++#endif ++ ++#if defined (__BEOS__) ++# ifdef ZLIB_DLL ++# ifdef ZLIB_INTERNAL ++# define ZEXPORT __declspec(dllexport) ++# define ZEXPORTVA __declspec(dllexport) ++# else ++# define ZEXPORT __declspec(dllimport) ++# define ZEXPORTVA __declspec(dllimport) ++# endif ++# endif ++#endif ++ ++#ifndef ZEXTERN ++# define ZEXTERN extern ++#endif ++#ifndef ZEXPORT ++# define ZEXPORT ++#endif ++#ifndef ZEXPORTVA ++# define ZEXPORTVA ++#endif ++ ++#ifndef FAR ++# define FAR ++#endif ++ ++#if !defined(__MACTYPES__) ++typedef unsigned char Byte; /* 8 bits */ ++#endif ++typedef unsigned int uInt; /* 16 bits or more */ ++typedef unsigned long uLong; /* 32 bits or more */ ++ ++#ifdef SMALL_MEDIUM ++ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ ++# define Bytef Byte FAR ++#else ++ typedef Byte FAR Bytef; ++#endif ++typedef char FAR charf; ++typedef int FAR intf; ++typedef uInt FAR uIntf; ++typedef uLong FAR uLongf; ++ ++#ifdef STDC ++ typedef void const *voidpc; ++ typedef void FAR *voidpf; ++ typedef void *voidp; ++#else ++ typedef Byte const *voidpc; ++ typedef Byte FAR *voidpf; ++ typedef Byte *voidp; ++#endif ++ ++#if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */ ++# include /* for off_t */ ++# include /* for SEEK_* and off_t */ ++# ifdef VMS ++# include /* for off_t */ ++# endif ++/* # define z_off_t off_t */ ++#endif ++#ifndef SEEK_SET ++# define SEEK_SET 0 /* Seek from beginning of file. */ ++# define SEEK_CUR 1 /* Seek from current position. */ ++# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ ++#endif ++#ifndef z_off_t ++# warning Defining z_off_t as 'long' rather than 'off_t' ++# define z_off_t long ++#endif ++ ++#if defined(__OS400__) ++#define NO_vsnprintf ++#endif ++ ++#if defined(__MVS__) ++# define NO_vsnprintf ++# ifdef FAR ++# undef FAR ++# endif ++#endif ++ ++/* MVS linker does not support external names larger than 8 bytes */ ++#if defined(__MVS__) ++# pragma map(deflateInit_,"DEIN") ++# pragma map(deflateInit2_,"DEIN2") ++# pragma map(deflateEnd,"DEEND") ++# pragma map(deflateBound,"DEBND") ++# pragma map(inflateInit_,"ININ") ++# pragma map(inflateInit2_,"ININ2") ++# pragma map(inflateEnd,"INEND") ++# pragma map(inflateSync,"INSY") ++# pragma map(inflateSetDictionary,"INSEDI") ++# pragma map(compressBound,"CMBND") ++# pragma map(inflate_table,"INTABL") ++# pragma map(inflate_fast,"INFA") ++# pragma map(inflate_copyright,"INCOPY") ++#endif ++ ++#endif /* ZCONF_H */ +--- /dev/null ++++ b/ext/zlib/zlib.h +@@ -0,0 +1,1200 @@ ++/* zlib.h -- interface of the 'zlib' general purpose compression library ++ version 1.2.1.1, January 9th, 2004 ++ ++ Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler ++ ++ This software is provided 'as-is', without any express or implied ++ warranty. In no event will the authors be held liable for any damages ++ arising from the use of this software. ++ ++ Permission is granted to anyone to use this software for any purpose, ++ including commercial applications, and to alter it and redistribute it ++ freely, subject to the following restrictions: ++ ++ 1. The origin of this software must not be misrepresented; you must not ++ claim that you wrote the original software. If you use this software ++ in a product, an acknowledgment in the product documentation would be ++ appreciated but is not required. ++ 2. Altered source versions must be plainly marked as such, and must not be ++ misrepresented as being the original software. ++ 3. This notice may not be removed or altered from any source distribution. ++ ++ Jean-loup Gailly Mark Adler ++ jloup@gzip.org madler@alumni.caltech.edu ++ ++ ++ The data format used by the zlib library is described by RFCs (Request for ++ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt ++ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). ++*/ ++ ++#ifndef ZLIB_H ++#define ZLIB_H ++ ++#include "zconf.h" ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define ZLIB_VERSION "1.2.1.1" ++#define ZLIB_VERNUM 0x1211 ++ ++/* ++ The 'zlib' compression library provides in-memory compression and ++ decompression functions, including integrity checks of the uncompressed ++ data. This version of the library supports only one compression method ++ (deflation) but other algorithms will be added later and will have the same ++ stream interface. ++ ++ Compression can be done in a single step if the buffers are large ++ enough (for example if an input file is mmap'ed), or can be done by ++ repeated calls of the compression function. In the latter case, the ++ application must provide more input and/or consume the output ++ (providing more output space) before each call. ++ ++ The compressed data format used by the in-memory functions is the zlib ++ format, which is a zlib wrapper documented in RFC 1950, wrapped around a ++ deflate stream, which is itself documented in RFC 1951. ++ ++ The library also supports reading and writing files in gzip (.gz) format ++ with an interface similar to that of stdio using the functions that start ++ with "gz". The gzip format is different from the zlib format. gzip is a ++ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. ++ ++ The zlib format was designed to be compact and fast for use in memory ++ and on communications channels. The gzip format was designed for single- ++ file compression on file systems, has a larger header than zlib to maintain ++ directory information, and uses a different, slower check method than zlib. ++ ++ This library does not provide any functions to write gzip files in memory. ++ However such functions could be easily written using zlib's deflate function, ++ the documentation in the gzip RFC, and the examples in gzio.c. ++ ++ The library does not install any signal handler. The decoder checks ++ the consistency of the compressed data, so the library should never ++ crash even in case of corrupted input. ++*/ ++ ++typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); ++typedef void (*free_func) OF((voidpf opaque, voidpf address)); ++ ++struct internal_state; ++ ++typedef struct z_stream_s { ++ Bytef *next_in; /* next input byte */ ++ uInt avail_in; /* number of bytes available at next_in */ ++ uLong total_in; /* total nb of input bytes read so far */ ++ ++ Bytef *next_out; /* next output byte should be put there */ ++ uInt avail_out; /* remaining free space at next_out */ ++ uLong total_out; /* total nb of bytes output so far */ ++ ++ char *msg; /* last error message, NULL if no error */ ++ struct internal_state FAR *state; /* not visible by applications */ ++ ++ alloc_func zalloc; /* used to allocate the internal state */ ++ free_func zfree; /* used to free the internal state */ ++ voidpf opaque; /* private data object passed to zalloc and zfree */ ++ ++ int data_type; /* best guess about the data type: ascii or binary */ ++ uLong adler; /* adler32 value of the uncompressed data */ ++ uLong reserved; /* reserved for future use */ ++} z_stream; ++ ++typedef z_stream FAR *z_streamp; ++ ++/* ++ The application must update next_in and avail_in when avail_in has ++ dropped to zero. It must update next_out and avail_out when avail_out ++ has dropped to zero. The application must initialize zalloc, zfree and ++ opaque before calling the init function. All other fields are set by the ++ compression library and must not be updated by the application. ++ ++ The opaque value provided by the application will be passed as the first ++ parameter for calls of zalloc and zfree. This can be useful for custom ++ memory management. The compression library attaches no meaning to the ++ opaque value. ++ ++ zalloc must return Z_NULL if there is not enough memory for the object. ++ If zlib is used in a multi-threaded application, zalloc and zfree must be ++ thread safe. ++ ++ On 16-bit systems, the functions zalloc and zfree must be able to allocate ++ exactly 65536 bytes, but will not be required to allocate more than this ++ if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, ++ pointers returned by zalloc for objects of exactly 65536 bytes *must* ++ have their offset normalized to zero. The default allocation function ++ provided by this library ensures this (see zutil.c). To reduce memory ++ requirements and avoid any allocation of 64K objects, at the expense of ++ compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). ++ ++ The fields total_in and total_out can be used for statistics or ++ progress reports. After compression, total_in holds the total size of ++ the uncompressed data and may be saved for use in the decompressor ++ (particularly if the decompressor wants to decompress everything in ++ a single step). ++*/ ++ ++ /* constants */ ++ ++#define Z_NO_FLUSH 0 ++#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ ++#define Z_SYNC_FLUSH 2 ++#define Z_FULL_FLUSH 3 ++#define Z_FINISH 4 ++#define Z_BLOCK 5 ++/* Allowed flush values; see deflate() and inflate() below for details */ ++ ++#define Z_OK 0 ++#define Z_STREAM_END 1 ++#define Z_NEED_DICT 2 ++#define Z_ERRNO (-1) ++#define Z_STREAM_ERROR (-2) ++#define Z_DATA_ERROR (-3) ++#define Z_MEM_ERROR (-4) ++#define Z_BUF_ERROR (-5) ++#define Z_VERSION_ERROR (-6) ++/* Return codes for the compression/decompression functions. Negative ++ * values are errors, positive values are used for special but normal events. ++ */ ++ ++#define Z_NO_COMPRESSION 0 ++#define Z_BEST_SPEED 1 ++#define Z_BEST_COMPRESSION 9 ++#define Z_DEFAULT_COMPRESSION (-1) ++/* compression levels */ ++ ++#define Z_FILTERED 1 ++#define Z_HUFFMAN_ONLY 2 ++#define Z_RLE 3 ++#define Z_DEFAULT_STRATEGY 0 ++/* compression strategy; see deflateInit2() below for details */ ++ ++#define Z_BINARY 0 ++#define Z_ASCII 1 ++#define Z_UNKNOWN 2 ++/* Possible values of the data_type field (though see inflate()) */ ++ ++#define Z_DEFLATED 8 ++/* The deflate compression method (the only one supported in this version) */ ++ ++#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ ++ ++#define zlib_version zlibVersion() ++/* for compatibility with versions < 1.0.2 */ ++ ++ /* basic functions */ ++ ++ZEXTERN const char * ZEXPORT zlibVersion OF((void)); ++/* The application can compare zlibVersion and ZLIB_VERSION for consistency. ++ If the first character differs, the library code actually used is ++ not compatible with the zlib.h header file used by the application. ++ This check is automatically made by deflateInit and inflateInit. ++ */ ++ ++/* ++ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); ++ ++ Initializes the internal stream state for compression. The fields ++ zalloc, zfree and opaque must be initialized before by the caller. ++ If zalloc and zfree are set to Z_NULL, deflateInit updates them to ++ use default allocation functions. ++ ++ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: ++ 1 gives best speed, 9 gives best compression, 0 gives no compression at ++ all (the input data is simply copied a block at a time). ++ Z_DEFAULT_COMPRESSION requests a default compromise between speed and ++ compression (currently equivalent to level 6). ++ ++ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not ++ enough memory, Z_STREAM_ERROR if level is not a valid compression level, ++ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible ++ with the version assumed by the caller (ZLIB_VERSION). ++ msg is set to null if there is no error message. deflateInit does not ++ perform any compression: this will be done by deflate(). ++*/ ++ ++ ++ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); ++/* ++ deflate compresses as much data as possible, and stops when the input ++ buffer becomes empty or the output buffer becomes full. It may introduce some ++ output latency (reading input without producing any output) except when ++ forced to flush. ++ ++ The detailed semantics are as follows. deflate performs one or both of the ++ following actions: ++ ++ - Compress more input starting at next_in and update next_in and avail_in ++ accordingly. If not all input can be processed (because there is not ++ enough room in the output buffer), next_in and avail_in are updated and ++ processing will resume at this point for the next call of deflate(). ++ ++ - Provide more output starting at next_out and update next_out and avail_out ++ accordingly. This action is forced if the parameter flush is non zero. ++ Forcing flush frequently degrades the compression ratio, so this parameter ++ should be set only when necessary (in interactive applications). ++ Some output may be provided even if flush is not set. ++ ++ Before the call of deflate(), the application should ensure that at least ++ one of the actions is possible, by providing more input and/or consuming ++ more output, and updating avail_in or avail_out accordingly; avail_out ++ should never be zero before the call. The application can consume the ++ compressed output when it wants, for example when the output buffer is full ++ (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK ++ and with zero avail_out, it must be called again after making room in the ++ output buffer because there might be more output pending. ++ ++ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is ++ flushed to the output buffer and the output is aligned on a byte boundary, so ++ that the decompressor can get all input data available so far. (In particular ++ avail_in is zero after the call if enough output space has been provided ++ before the call.) Flushing may degrade compression for some compression ++ algorithms and so it should be used only when necessary. ++ ++ If flush is set to Z_FULL_FLUSH, all output is flushed as with ++ Z_SYNC_FLUSH, and the compression state is reset so that decompression can ++ restart from this point if previous compressed data has been damaged or if ++ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade ++ the compression. ++ ++ If deflate returns with avail_out == 0, this function must be called again ++ with the same value of the flush parameter and more output space (updated ++ avail_out), until the flush is complete (deflate returns with non-zero ++ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that ++ avail_out is greater than six to avoid repeated flush markers due to ++ avail_out == 0 on return. ++ ++ If the parameter flush is set to Z_FINISH, pending input is processed, ++ pending output is flushed and deflate returns with Z_STREAM_END if there ++ was enough output space; if deflate returns with Z_OK, this function must be ++ called again with Z_FINISH and more output space (updated avail_out) but no ++ more input data, until it returns with Z_STREAM_END or an error. After ++ deflate has returned Z_STREAM_END, the only possible operations on the ++ stream are deflateReset or deflateEnd. ++ ++ Z_FINISH can be used immediately after deflateInit if all the compression ++ is to be done in a single step. In this case, avail_out must be at least ++ the value returned by deflateBound (see below). If deflate does not return ++ Z_STREAM_END, then it must be called again as described above. ++ ++ deflate() sets strm->adler to the adler32 checksum of all input read ++ so far (that is, total_in bytes). ++ ++ deflate() may update data_type if it can make a good guess about ++ the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered ++ binary. This field is only for information purposes and does not affect ++ the compression algorithm in any manner. ++ ++ deflate() returns Z_OK if some progress has been made (more input ++ processed or more output produced), Z_STREAM_END if all input has been ++ consumed and all output has been produced (only when flush is set to ++ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example ++ if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible ++ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not ++ fatal, and deflate() can be called again with more input and more output ++ space to continue compressing. ++*/ ++ ++ ++ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); ++/* ++ All dynamically allocated data structures for this stream are freed. ++ This function discards any unprocessed input and does not flush any ++ pending output. ++ ++ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the ++ stream state was inconsistent, Z_DATA_ERROR if the stream was freed ++ prematurely (some input or output was discarded). In the error case, ++ msg may be set but then points to a static string (which must not be ++ deallocated). ++*/ ++ ++ ++/* ++ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); ++ ++ Initializes the internal stream state for decompression. The fields ++ next_in, avail_in, zalloc, zfree and opaque must be initialized before by ++ the caller. If next_in is not Z_NULL and avail_in is large enough (the exact ++ value depends on the compression method), inflateInit determines the ++ compression method from the zlib header and allocates all data structures ++ accordingly; otherwise the allocation will be deferred to the first call of ++ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to ++ use default allocation functions. ++ ++ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the ++ version assumed by the caller. msg is set to null if there is no error ++ message. inflateInit does not perform any decompression apart from reading ++ the zlib header if present: this will be done by inflate(). (So next_in and ++ avail_in may be modified, but next_out and avail_out are unchanged.) ++*/ ++ ++ ++ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); ++/* ++ inflate decompresses as much data as possible, and stops when the input ++ buffer becomes empty or the output buffer becomes full. It may introduce ++ some output latency (reading input without producing any output) except when ++ forced to flush. ++ ++ The detailed semantics are as follows. inflate performs one or both of the ++ following actions: ++ ++ - Decompress more input starting at next_in and update next_in and avail_in ++ accordingly. If not all input can be processed (because there is not ++ enough room in the output buffer), next_in is updated and processing ++ will resume at this point for the next call of inflate(). ++ ++ - Provide more output starting at next_out and update next_out and avail_out ++ accordingly. inflate() provides as much output as possible, until there ++ is no more input data or no more space in the output buffer (see below ++ about the flush parameter). ++ ++ Before the call of inflate(), the application should ensure that at least ++ one of the actions is possible, by providing more input and/or consuming ++ more output, and updating the next_* and avail_* values accordingly. ++ The application can consume the uncompressed output when it wants, for ++ example when the output buffer is full (avail_out == 0), or after each ++ call of inflate(). If inflate returns Z_OK and with zero avail_out, it ++ must be called again after making room in the output buffer because there ++ might be more output pending. ++ ++ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, ++ Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much ++ output as possible to the output buffer. Z_BLOCK requests that inflate() stop ++ if and when it get to the next deflate block boundary. When decoding the zlib ++ or gzip format, this will cause inflate() to return immediately after the ++ header and before the first block. When doing a raw inflate, inflate() will ++ go ahead and process the first block, and will return when it gets to the end ++ of that block, or when it runs out of data. ++ ++ The Z_BLOCK option assists in appending to or combining deflate streams. ++ Also to assist in this, on return inflate() will set strm->data_type to the ++ number of unused bits in the last byte taken from strm->next_in, plus 64 ++ if inflate() is currently decoding the last block in the deflate stream, ++ plus 128 if inflate() returned immediately after decoding an end-of-block ++ code or decoding the complete header up to just before the first byte of the ++ deflate stream. The end-of-block will not be indicated until all of the ++ uncompressed data from that block has been written to strm->next_out. The ++ number of unused bits may in general be greater than seven, except when ++ bit 7 of data_type is set, in which case the number of unused bits will be ++ less than eight. ++ ++ inflate() should normally be called until it returns Z_STREAM_END or an ++ error. However if all decompression is to be performed in a single step ++ (a single call of inflate), the parameter flush should be set to ++ Z_FINISH. In this case all pending input is processed and all pending ++ output is flushed; avail_out must be large enough to hold all the ++ uncompressed data. (The size of the uncompressed data may have been saved ++ by the compressor for this purpose.) The next operation on this stream must ++ be inflateEnd to deallocate the decompression state. The use of Z_FINISH ++ is never required, but can be used to inform inflate that a faster approach ++ may be used for the single inflate() call. ++ ++ In this implementation, inflate() always flushes as much output as ++ possible to the output buffer, and always uses the faster approach on the ++ first call. So the only effect of the flush parameter in this implementation ++ is on the return value of inflate(), as noted below, or when it returns early ++ because Z_BLOCK is used. ++ ++ If a preset dictionary is needed after this call (see inflateSetDictionary ++ below), inflate sets strm-adler to the adler32 checksum of the dictionary ++ chosen by the compressor and returns Z_NEED_DICT; otherwise it sets ++ strm->adler to the adler32 checksum of all output produced so far (that is, ++ total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described ++ below. At the end of the stream, inflate() checks that its computed adler32 ++ checksum is equal to that saved by the compressor and returns Z_STREAM_END ++ only if the checksum is correct. ++ ++ inflate() will decompress and check either zlib-wrapped or gzip-wrapped ++ deflate data. The header type is detected automatically. Any information ++ contained in the gzip header is not retained, so applications that need that ++ information should instead use raw inflate, see inflateInit2() below, or ++ inflateBack() and perform their own processing of the gzip header and ++ trailer. ++ ++ inflate() returns Z_OK if some progress has been made (more input processed ++ or more output produced), Z_STREAM_END if the end of the compressed data has ++ been reached and all uncompressed output has been produced, Z_NEED_DICT if a ++ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was ++ corrupted (input stream not conforming to the zlib format or incorrect check ++ value), Z_STREAM_ERROR if the stream structure was inconsistent (for example ++ if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, ++ Z_BUF_ERROR if no progress is possible or if there was not enough room in the ++ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and ++ inflate() can be called again with more input and more output space to ++ continue decompressing. If Z_DATA_ERROR is returned, the application may then ++ call inflateSync() to look for a good compression block if a partial recovery ++ of the data is desired. ++*/ ++ ++ ++ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); ++/* ++ All dynamically allocated data structures for this stream are freed. ++ This function discards any unprocessed input and does not flush any ++ pending output. ++ ++ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state ++ was inconsistent. In the error case, msg may be set but then points to a ++ static string (which must not be deallocated). ++*/ ++ ++ /* Advanced functions */ ++ ++/* ++ The following functions are needed only in some special applications. ++*/ ++ ++/* ++ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, ++ int level, ++ int method, ++ int windowBits, ++ int memLevel, ++ int strategy)); ++ ++ This is another version of deflateInit with more compression options. The ++ fields next_in, zalloc, zfree and opaque must be initialized before by ++ the caller. ++ ++ The method parameter is the compression method. It must be Z_DEFLATED in ++ this version of the library. ++ ++ The windowBits parameter is the base two logarithm of the window size ++ (the size of the history buffer). It should be in the range 8..15 for this ++ version of the library. Larger values of this parameter result in better ++ compression at the expense of memory usage. The default value is 15 if ++ deflateInit is used instead. ++ ++ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits ++ determines the window size. deflate() will then generate raw deflate data ++ with no zlib header or trailer, and will not compute an adler32 check value. ++ ++ windowBits can also be greater than 15 for optional gzip encoding. Add ++ 16 to windowBits to write a simple gzip header and trailer around the ++ compressed data instead of a zlib wrapper. The gzip header will have no ++ file name, no extra data, no comment, no modification time (set to zero), ++ no header crc, and the operating system will be set to 255 (unknown). ++ ++ The memLevel parameter specifies how much memory should be allocated ++ for the internal compression state. memLevel=1 uses minimum memory but ++ is slow and reduces compression ratio; memLevel=9 uses maximum memory ++ for optimal speed. The default value is 8. See zconf.h for total memory ++ usage as a function of windowBits and memLevel. ++ ++ The strategy parameter is used to tune the compression algorithm. Use the ++ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a ++ filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no ++ string match), or Z_RLE to limit match distances to one (run-length ++ encoding). Filtered data consists mostly of small values with a somewhat ++ random distribution. In this case, the compression algorithm is tuned to ++ compress them better. The effect of Z_FILTERED is to force more Huffman ++ coding and less string matching; it is somewhat intermediate between ++ Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as ++ Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy ++ parameter only affects the compression ratio but not the correctness of the ++ compressed output even if it is not set appropriately. ++ ++ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid ++ method). msg is set to null if there is no error message. deflateInit2 does ++ not perform any compression: this will be done by deflate(). ++*/ ++ ++ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, ++ const Bytef *dictionary, ++ uInt dictLength)); ++/* ++ Initializes the compression dictionary from the given byte sequence ++ without producing any compressed output. This function must be called ++ immediately after deflateInit, deflateInit2 or deflateReset, before any ++ call of deflate. The compressor and decompressor must use exactly the same ++ dictionary (see inflateSetDictionary). ++ ++ The dictionary should consist of strings (byte sequences) that are likely ++ to be encountered later in the data to be compressed, with the most commonly ++ used strings preferably put towards the end of the dictionary. Using a ++ dictionary is most useful when the data to be compressed is short and can be ++ predicted with good accuracy; the data can then be compressed better than ++ with the default empty dictionary. ++ ++ Depending on the size of the compression data structures selected by ++ deflateInit or deflateInit2, a part of the dictionary may in effect be ++ discarded, for example if the dictionary is larger than the window size in ++ deflate or deflate2. Thus the strings most likely to be useful should be ++ put at the end of the dictionary, not at the front. ++ ++ Upon return of this function, strm->adler is set to the adler32 value ++ of the dictionary; the decompressor may later use this value to determine ++ which dictionary has been used by the compressor. (The adler32 value ++ applies to the whole dictionary even if only a subset of the dictionary is ++ actually used by the compressor.) If a raw deflate was requested, then the ++ adler32 value is not computed and strm->adler is not set. ++ ++ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a ++ parameter is invalid (such as NULL dictionary) or the stream state is ++ inconsistent (for example if deflate has already been called for this stream ++ or if the compression method is bsort). deflateSetDictionary does not ++ perform any compression: this will be done by deflate(). ++*/ ++ ++ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, ++ z_streamp source)); ++/* ++ Sets the destination stream as a complete copy of the source stream. ++ ++ This function can be useful when several compression strategies will be ++ tried, for example when there are several ways of pre-processing the input ++ data with a filter. The streams that will be discarded should then be freed ++ by calling deflateEnd. Note that deflateCopy duplicates the internal ++ compression state which can be quite large, so this strategy is slow and ++ can consume lots of memory. ++ ++ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not ++ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent ++ (such as zalloc being NULL). msg is left unchanged in both source and ++ destination. ++*/ ++ ++ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); ++/* ++ This function is equivalent to deflateEnd followed by deflateInit, ++ but does not free and reallocate all the internal compression state. ++ The stream will keep the same compression level and any other attributes ++ that may have been set by deflateInit2. ++ ++ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent (such as zalloc or state being NULL). ++*/ ++ ++ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, ++ int level, ++ int strategy)); ++/* ++ Dynamically update the compression level and compression strategy. The ++ interpretation of level and strategy is as in deflateInit2. This can be ++ used to switch between compression and straight copy of the input data, or ++ to switch to a different kind of input data requiring a different ++ strategy. If the compression level is changed, the input available so far ++ is compressed with the old level (and may be flushed); the new level will ++ take effect only at the next call of deflate(). ++ ++ Before the call of deflateParams, the stream state must be set as for ++ a call of deflate(), since the currently available input may have to ++ be compressed and flushed. In particular, strm->avail_out must be non-zero. ++ ++ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source ++ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR ++ if strm->avail_out was zero. ++*/ ++ ++ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, ++ uLong sourceLen)); ++/* ++ deflateBound() returns an upper bound on the compressed size after ++ deflation of sourceLen bytes. It must be called after deflateInit() ++ or deflateInit2(). This would be used to allocate an output buffer ++ for deflation in a single pass, and so would be called before deflate(). ++*/ ++ ++ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, ++ int bits, ++ int value)); ++/* ++ deflatePrime() inserts bits in the deflate output stream. The intent ++ is that this function is used to start off the deflate output with the ++ bits leftover from a previous deflate stream when appending to it. As such, ++ this function can only be used for raw deflate, and must be used before the ++ first deflate() call after a deflateInit2() or deflateReset(). bits must be ++ less than or equal to 16, and that many of the least significant bits of ++ value will be inserted in the output. ++ ++ deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent. ++*/ ++ ++/* ++ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, ++ int windowBits)); ++ ++ This is another version of inflateInit with an extra parameter. The ++ fields next_in, avail_in, zalloc, zfree and opaque must be initialized ++ before by the caller. ++ ++ The windowBits parameter is the base two logarithm of the maximum window ++ size (the size of the history buffer). It should be in the range 8..15 for ++ this version of the library. The default value is 15 if inflateInit is used ++ instead. windowBits must be greater than or equal to the windowBits value ++ provided to deflateInit2() while compressing, or it must be equal to 15 if ++ deflateInit2() was not used. If a compressed stream with a larger window ++ size is given as input, inflate() will return with the error code ++ Z_DATA_ERROR instead of trying to allocate a larger window. ++ ++ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits ++ determines the window size. inflate() will then process raw deflate data, ++ not looking for a zlib or gzip header, not generating a check value, and not ++ looking for any check values for comparison at the end of the stream. This ++ is for use with other formats that use the deflate compressed data format ++ such as zip. Those formats provide their own check values. If a custom ++ format is developed using the raw deflate format for compressed data, it is ++ recommended that a check value such as an adler32 or a crc32 be applied to ++ the uncompressed data as is done in the zlib, gzip, and zip formats. For ++ most applications, the zlib format should be used as is. Note that comments ++ above on the use in deflateInit2() applies to the magnitude of windowBits. ++ ++ windowBits can also be greater than 15 for optional gzip decoding. Add ++ 32 to windowBits to enable zlib and gzip decoding with automatic header ++ detection, or add 16 to decode only the gzip format (the zlib format will ++ return a Z_DATA_ERROR). ++ ++ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative ++ memLevel). msg is set to null if there is no error message. inflateInit2 ++ does not perform any decompression apart from reading the zlib header if ++ present: this will be done by inflate(). (So next_in and avail_in may be ++ modified, but next_out and avail_out are unchanged.) ++*/ ++ ++ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, ++ const Bytef *dictionary, ++ uInt dictLength)); ++/* ++ Initializes the decompression dictionary from the given uncompressed byte ++ sequence. This function must be called immediately after a call of inflate ++ if this call returned Z_NEED_DICT. The dictionary chosen by the compressor ++ can be determined from the adler32 value returned by this call of ++ inflate. The compressor and decompressor must use exactly the same ++ dictionary (see deflateSetDictionary). ++ ++ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a ++ parameter is invalid (such as NULL dictionary) or the stream state is ++ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the ++ expected one (incorrect adler32 value). inflateSetDictionary does not ++ perform any decompression: this will be done by subsequent calls of ++ inflate(). ++*/ ++ ++ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); ++/* ++ Skips invalid compressed data until a full flush point (see above the ++ description of deflate with Z_FULL_FLUSH) can be found, or until all ++ available input is skipped. No output is provided. ++ ++ inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR ++ if no more input was provided, Z_DATA_ERROR if no flush point has been found, ++ or Z_STREAM_ERROR if the stream structure was inconsistent. In the success ++ case, the application may save the current current value of total_in which ++ indicates where valid compressed data was found. In the error case, the ++ application may repeatedly call inflateSync, providing more input each time, ++ until success or end of the input data. ++*/ ++ ++ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, ++ z_streamp source)); ++/* ++ Sets the destination stream as a complete copy of the source stream. ++ ++ This function can be useful when randomly accessing a large stream. The ++ first pass through the stream can periodically record the inflate state, ++ allowing restarting inflate at those points when randomly accessing the ++ stream. ++ ++ inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not ++ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent ++ (such as zalloc being NULL). msg is left unchanged in both source and ++ destination. ++*/ ++ ++ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); ++/* ++ This function is equivalent to inflateEnd followed by inflateInit, ++ but does not free and reallocate all the internal decompression state. ++ The stream will keep attributes that may have been set by inflateInit2. ++ ++ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source ++ stream state was inconsistent (such as zalloc or state being NULL). ++*/ ++ ++/* ++ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits, ++ unsigned char FAR *window)); ++ ++ Initialize the internal stream state for decompression using inflateBack() ++ calls. The fields zalloc, zfree and opaque in strm must be initialized ++ before the call. If zalloc and zfree are Z_NULL, then the default library- ++ derived memory allocation routines are used. windowBits is the base two ++ logarithm of the window size, in the range 8..15. window is a caller ++ supplied buffer of that size. Except for special applications where it is ++ assured that deflate was used with small window sizes, windowBits must be 15 ++ and a 32K byte window must be supplied to be able to decompress general ++ deflate streams. ++ ++ See inflateBack() for the usage of these routines. ++ ++ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of ++ the paramaters are invalid, Z_MEM_ERROR if the internal state could not ++ be allocated, or Z_VERSION_ERROR if the version of the library does not ++ match the version of the header file. ++*/ ++ ++typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); ++typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); ++ ++ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm, ++ in_func in, void FAR *in_desc, ++ out_func out, void FAR *out_desc)); ++/* ++ inflateBack() does a raw inflate with a single call using a call-back ++ interface for input and output. This is more efficient than inflate() for ++ file i/o applications in that it avoids copying between the output and the ++ sliding window by simply making the window itself the output buffer. This ++ function trusts the application to not change the output buffer passed by ++ the output function, at least until inflateBack() returns. ++ ++ inflateBackInit() must be called first to allocate the internal state ++ and to initialize the state with the user-provided window buffer. ++ inflateBack() may then be used multiple times to inflate a complete, raw ++ deflate stream with each call. inflateBackEnd() is then called to free ++ the allocated state. ++ ++ A raw deflate stream is one with no zlib or gzip header or trailer. ++ This routine would normally be used in a utility that reads zip or gzip ++ files and writes out uncompressed files. The utility would decode the ++ header and process the trailer on its own, hence this routine expects ++ only the raw deflate stream to decompress. This is different from the ++ normal behavior of inflate(), which expects either a zlib or gzip header and ++ trailer around the deflate stream. ++ ++ inflateBack() uses two subroutines supplied by the caller that are then ++ called by inflateBack() for input and output. inflateBack() calls those ++ routines until it reads a complete deflate stream and writes out all of the ++ uncompressed data, or until it encounters an error. The function's ++ parameters and return types are defined above in the in_func and out_func ++ typedefs. inflateBack() will call in(in_desc, &buf) which should return the ++ number of bytes of provided input, and a pointer to that input in buf. If ++ there is no input available, in() must return zero--buf is ignored in that ++ case--and inflateBack() will return a buffer error. inflateBack() will call ++ out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() ++ should return zero on success, or non-zero on failure. If out() returns ++ non-zero, inflateBack() will return with an error. Neither in() nor out() ++ are permitted to change the contents of the window provided to ++ inflateBackInit(), which is also the buffer that out() uses to write from. ++ The length written by out() will be at most the window size. Any non-zero ++ amount of input may be provided by in(). ++ ++ For convenience, inflateBack() can be provided input on the first call by ++ setting strm->next_in and strm->avail_in. If that input is exhausted, then ++ in() will be called. Therefore strm->next_in must be initialized before ++ calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called ++ immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in ++ must also be initialized, and then if strm->avail_in is not zero, input will ++ initially be taken from strm->next_in[0 .. strm->avail_in - 1]. ++ ++ The in_desc and out_desc parameters of inflateBack() is passed as the ++ first parameter of in() and out() respectively when they are called. These ++ descriptors can be optionally used to pass any information that the caller- ++ supplied in() and out() functions need to do their job. ++ ++ On return, inflateBack() will set strm->next_in and strm->avail_in to ++ pass back any unused input that was provided by the last in() call. The ++ return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR ++ if in() or out() returned an error, Z_DATA_ERROR if there was a format ++ error in the deflate stream (in which case strm->msg is set to indicate the ++ nature of the error), or Z_STREAM_ERROR if the stream was not properly ++ initialized. In the case of Z_BUF_ERROR, an input or output error can be ++ distinguished using strm->next_in which will be Z_NULL only if in() returned ++ an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to ++ out() returning non-zero. (in() will always be called before out(), so ++ strm->next_in is assured to be defined if out() returns non-zero.) Note ++ that inflateBack() cannot return Z_OK. ++*/ ++ ++ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm)); ++/* ++ All memory allocated by inflateBackInit() is freed. ++ ++ inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream ++ state was inconsistent. ++*/ ++ ++ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); ++/* Return flags indicating compile-time options. ++ ++ Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: ++ 1.0: size of uInt ++ 3.2: size of uLong ++ 5.4: size of voidpf (pointer) ++ 7.6: size of z_off_t ++ ++ Compiler, assembler, and debug options: ++ 8: DEBUG ++ 9: ASMV or ASMINF -- use ASM code ++ 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention ++ 11: 0 (reserved) ++ ++ One-time table building (smaller code, but not thread-safe if true): ++ 12: BUILDFIXED -- build static block decoding tables when needed ++ 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed ++ 14,15: 0 (reserved) ++ ++ Library content (indicates missing functionality): ++ 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking ++ deflate code when not needed) ++ 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect ++ and decode gzip streams (to avoid linking crc code) ++ 18-19: 0 (reserved) ++ ++ Operation variations (changes in library functionality): ++ 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate ++ 21: FASTEST -- deflate algorithm with only one, lowest compression level ++ 22,23: 0 (reserved) ++ ++ The sprintf variant used by gzprintf (zero is best): ++ 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format ++ 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! ++ 26: 0 = returns value, 1 = void -- 1 means inferred string length returned ++ ++ Remainder: ++ 27-31: 0 (reserved) ++ */ ++ ++ ++ /* utility functions */ ++ ++/* ++ The following utility functions are implemented on top of the ++ basic stream-oriented functions. To simplify the interface, some ++ default options are assumed (compression level and memory usage, ++ standard memory allocation functions). The source code of these ++ utility functions can easily be modified if you need special options. ++*/ ++ ++ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen)); ++/* ++ Compresses the source buffer into the destination buffer. sourceLen is ++ the byte length of the source buffer. Upon entry, destLen is the total ++ size of the destination buffer, which must be at least the value returned ++ by compressBound(sourceLen). Upon exit, destLen is the actual size of the ++ compressed buffer. ++ This function can be used to compress a whole file at once if the ++ input file is mmap'ed. ++ compress returns Z_OK if success, Z_MEM_ERROR if there was not ++ enough memory, Z_BUF_ERROR if there was not enough room in the output ++ buffer. ++*/ ++ ++ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen, ++ int level)); ++/* ++ Compresses the source buffer into the destination buffer. The level ++ parameter has the same meaning as in deflateInit. sourceLen is the byte ++ length of the source buffer. Upon entry, destLen is the total size of the ++ destination buffer, which must be at least the value returned by ++ compressBound(sourceLen). Upon exit, destLen is the actual size of the ++ compressed buffer. ++ ++ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough ++ memory, Z_BUF_ERROR if there was not enough room in the output buffer, ++ Z_STREAM_ERROR if the level parameter is invalid. ++*/ ++ ++ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); ++/* ++ compressBound() returns an upper bound on the compressed size after ++ compress() or compress2() on sourceLen bytes. It would be used before ++ a compress() or compress2() call to allocate the destination buffer. ++*/ ++ ++ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen)); ++/* ++ Decompresses the source buffer into the destination buffer. sourceLen is ++ the byte length of the source buffer. Upon entry, destLen is the total ++ size of the destination buffer, which must be large enough to hold the ++ entire uncompressed data. (The size of the uncompressed data must have ++ been saved previously by the compressor and transmitted to the decompressor ++ by some mechanism outside the scope of this compression library.) ++ Upon exit, destLen is the actual size of the compressed buffer. ++ This function can be used to decompress a whole file at once if the ++ input file is mmap'ed. ++ ++ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not ++ enough memory, Z_BUF_ERROR if there was not enough room in the output ++ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. ++*/ ++ ++ ++typedef voidp gzFile; ++ ++ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); ++/* ++ Opens a gzip (.gz) file for reading or writing. The mode parameter ++ is as in fopen ("rb" or "wb") but can also include a compression level ++ ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for ++ Huffman only compression as in "wb1h", or 'R' for run-length encoding ++ as in "wb1R". (See the description of deflateInit2 for more information ++ about the strategy parameter.) ++ ++ gzopen can be used to read a file which is not in gzip format; in this ++ case gzread will directly read from the file without decompression. ++ ++ gzopen returns NULL if the file could not be opened or if there was ++ insufficient memory to allocate the (de)compression state; errno ++ can be checked to distinguish the two cases (if errno is zero, the ++ zlib error is Z_MEM_ERROR). */ ++ ++ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); ++/* ++ gzdopen() associates a gzFile with the file descriptor fd. File ++ descriptors are obtained from calls like open, dup, creat, pipe or ++ fileno (in the file has been previously opened with fopen). ++ The mode parameter is as in gzopen. ++ The next call of gzclose on the returned gzFile will also close the ++ file descriptor fd, just like fclose(fdopen(fd), mode) closes the file ++ descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). ++ gzdopen returns NULL if there was insufficient memory to allocate ++ the (de)compression state. ++*/ ++ ++ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); ++/* ++ Dynamically update the compression level or strategy. See the description ++ of deflateInit2 for the meaning of these parameters. ++ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not ++ opened for writing. ++*/ ++ ++ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); ++/* ++ Reads the given number of uncompressed bytes from the compressed file. ++ If the input file was not in gzip format, gzread copies the given number ++ of bytes into the buffer. ++ gzread returns the number of uncompressed bytes actually read (0 for ++ end of file, -1 for error). */ ++ ++ZEXTERN int ZEXPORT gzwrite OF((gzFile file, ++ voidpc buf, unsigned len)); ++/* ++ Writes the given number of uncompressed bytes into the compressed file. ++ gzwrite returns the number of uncompressed bytes actually written ++ (0 in case of error). ++*/ ++ ++ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); ++/* ++ Converts, formats, and writes the args to the compressed file under ++ control of the format string, as in fprintf. gzprintf returns the number of ++ uncompressed bytes actually written (0 in case of error). The number of ++ uncompressed bytes written is limited to 4095. The caller should assure that ++ this limit is not exceeded. If it is exceeded, then gzprintf() will return ++ return an error (0) with nothing written. In this case, there may also be a ++ buffer overflow with unpredictable consequences, which is possible only if ++ zlib was compiled with the insecure functions sprintf() or vsprintf() ++ because the secure snprintf() or vsnprintf() functions were not available. ++*/ ++ ++ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); ++/* ++ Writes the given null-terminated string to the compressed file, excluding ++ the terminating null character. ++ gzputs returns the number of characters written, or -1 in case of error. ++*/ ++ ++ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); ++/* ++ Reads bytes from the compressed file until len-1 characters are read, or ++ a newline character is read and transferred to buf, or an end-of-file ++ condition is encountered. The string is then terminated with a null ++ character. ++ gzgets returns buf, or Z_NULL in case of error. ++*/ ++ ++ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); ++/* ++ Writes c, converted to an unsigned char, into the compressed file. ++ gzputc returns the value that was written, or -1 in case of error. ++*/ ++ ++ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); ++/* ++ Reads one byte from the compressed file. gzgetc returns this byte ++ or -1 in case of end of file or error. ++*/ ++ ++ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); ++/* ++ Push one character back onto the stream to be read again later. ++ Only one character of push-back is allowed. gzungetc() returns the ++ character pushed, or -1 on failure. gzungetc() will fail if a ++ character has been pushed but not read yet, or if c is -1. The pushed ++ character will be discarded if the stream is repositioned with gzseek() ++ or gzrewind(). ++*/ ++ ++ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); ++/* ++ Flushes all pending output into the compressed file. The parameter ++ flush is as in the deflate() function. The return value is the zlib ++ error number (see function gzerror below). gzflush returns Z_OK if ++ the flush parameter is Z_FINISH and all output could be flushed. ++ gzflush should be called only when strictly necessary because it can ++ degrade compression. ++*/ ++ ++ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, ++ z_off_t offset, int whence)); ++/* ++ Sets the starting position for the next gzread or gzwrite on the ++ given compressed file. The offset represents a number of bytes in the ++ uncompressed data stream. The whence parameter is defined as in lseek(2); ++ the value SEEK_END is not supported. ++ If the file is opened for reading, this function is emulated but can be ++ extremely slow. If the file is opened for writing, only forward seeks are ++ supported; gzseek then compresses a sequence of zeroes up to the new ++ starting position. ++ ++ gzseek returns the resulting offset location as measured in bytes from ++ the beginning of the uncompressed stream, or -1 in case of error, in ++ particular if the file is opened for writing and the new starting position ++ would be before the current position. ++*/ ++ ++ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); ++/* ++ Rewinds the given file. This function is supported only for reading. ++ ++ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) ++*/ ++ ++ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); ++/* ++ Returns the starting position for the next gzread or gzwrite on the ++ given compressed file. This position represents a number of bytes in the ++ uncompressed data stream. ++ ++ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) ++*/ ++ ++ZEXTERN int ZEXPORT gzeof OF((gzFile file)); ++/* ++ Returns 1 when EOF has previously been detected reading the given ++ input stream, otherwise zero. ++*/ ++ ++ZEXTERN int ZEXPORT gzclose OF((gzFile file)); ++/* ++ Flushes all pending output if necessary, closes the compressed file ++ and deallocates all the (de)compression state. The return value is the zlib ++ error number (see function gzerror below). ++*/ ++ ++ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); ++/* ++ Returns the error message for the last error which occurred on the ++ given compressed file. errnum is set to zlib error number. If an ++ error occurred in the file system and not in the compression library, ++ errnum is set to Z_ERRNO and the application may consult errno ++ to get the exact error code. ++*/ ++ ++ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); ++/* ++ Clears the error and end-of-file flags for file. This is analogous to the ++ clearerr() function in stdio. This is useful for continuing to read a gzip ++ file that is being written concurrently. ++*/ ++ ++ /* checksum functions */ ++ ++/* ++ These functions are not related to compression but are exported ++ anyway because they might be useful in applications using the ++ compression library. ++*/ ++ ++ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); ++ ++/* ++ Update a running Adler-32 checksum with the bytes buf[0..len-1] and ++ return the updated checksum. If buf is NULL, this function returns ++ the required initial value for the checksum. ++ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed ++ much faster. Usage example: ++ ++ uLong adler = adler32(0L, Z_NULL, 0); ++ ++ while (read_buffer(buffer, length) != EOF) { ++ adler = adler32(adler, buffer, length); ++ } ++ if (adler != original_adler) error(); ++*/ ++ ++ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); ++/* ++ Update a running crc with the bytes buf[0..len-1] and return the updated ++ crc. If buf is NULL, this function returns the required initial value ++ for the crc. Pre- and post-conditioning (one's complement) is performed ++ within this function so it shouldn't be done by the application. ++ Usage example: ++ ++ uLong crc = crc32(0L, Z_NULL, 0); ++ ++ while (read_buffer(buffer, length) != EOF) { ++ crc = crc32(crc, buffer, length); ++ } ++ if (crc != original_crc) error(); ++*/ ++ ++ ++ /* various hacks, don't look :) */ ++ ++/* deflateInit and inflateInit are macros to allow checking the zlib version ++ * and the compiler's view of z_stream: ++ */ ++ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, ++ const char *version, int stream_size)); ++ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, ++ const char *version, int stream_size)); ++ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, ++ int windowBits, int memLevel, ++ int strategy, const char *version, ++ int stream_size)); ++ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, ++ const char *version, int stream_size)); ++ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, ++ unsigned char FAR *window, ++ const char *version, ++ int stream_size)); ++#define deflateInit(strm, level) \ ++ deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) ++#define inflateInit(strm) \ ++ inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) ++#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ ++ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ ++ (strategy), ZLIB_VERSION, sizeof(z_stream)) ++#define inflateInit2(strm, windowBits) \ ++ inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) ++#define inflateBackInit(strm, windowBits, window) \ ++ inflateBackInit_((strm), (windowBits), (window), \ ++ ZLIB_VERSION, sizeof(z_stream)) ++ ++ ++#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) ++ struct internal_state {int dummy;}; /* hack for buggy compilers */ ++#endif ++ ++ZEXTERN const char * ZEXPORT zError OF((int err)); ++ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ++ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* ZLIB_H */ --- php5-5.3.6.orig/debian/patches/mssql-null-exception.patch +++ php5-5.3.6/debian/patches/mssql-null-exception.patch @@ -0,0 +1,13 @@ +--- a/ext/pdo_dblib/dblib_driver.c ++++ b/ext/pdo_dblib/dblib_driver.c +@@ -230,8 +230,10 @@ static int pdo_dblib_handle_factory(pdo_ + goto cleanup; + } + ++#if PHP_DBLIB_IS_MSSQL + /* dblib do not return more than this length from text/image */ + DBSETOPT(H->link, DBTEXTLIMIT, "2147483647"); ++#endif + + /* limit text/image from network */ + DBSETOPT(H->link, DBTEXTSIZE, "2147483647"); --- php5-5.3.6.orig/debian/patches/CVE-2011-1938.patch +++ php5-5.3.6/debian/patches/CVE-2011-1938.patch @@ -0,0 +1,14 @@ +--- a/ext/sockets/sockets.c ++++ b/ext/sockets/sockets.c +@@ -1334,6 +1334,11 @@ PHP_FUNCTION(socket_connect) + break; + + case AF_UNIX: ++ if (addr_len >= sizeof(s_un.sun_path)) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long", php_sock->type); ++ RETURN_FALSE; ++ } ++ + memset(&s_un, 0, sizeof(struct sockaddr_un)); + + s_un.sun_family = AF_UNIX; --- php5-5.3.6.orig/debian/patches/temporary-path-fixes-for-multiarch.patch +++ php5-5.3.6/debian/patches/temporary-path-fixes-for-multiarch.patch @@ -0,0 +1,89 @@ +Description: transitional workaround for multiarch + As a stopgap for natty, patch the various config.m4 files for modules whose + libraries have moved to the multiarch dir; we can't use --with-libdir yet + because that requires all the build-deps to have moved. +Author: Jonathan Marsden +Bug-Ubuntu: https://bugs.launchpad.net/bugs/739977 +Forwarded: not-needed +Reviewed-by: Steve Langasek + +Index: php5-5.3.6/ext/dba/config.m4 +=================================================================== +--- php5-5.3.6.orig/ext/dba/config.m4 ++++ php5-5.3.6/ext/dba/config.m4 +@@ -204,7 +204,7 @@ + AC_MSG_ERROR([DBA: Could not find necessary header file(s).]) + fi + for LIB in $2; do +- if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then ++ if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/lib$LIB.$SHLIB_SUFFIX_NAME || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + lib_found=""; + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ + AC_TRY_LINK([ +Index: php5-5.3.6/ext/gd/config.m4 +=================================================================== +--- php5-5.3.6.orig/ext/gd/config.m4 ++++ php5-5.3.6/ext/gd/config.m4 +@@ -72,6 +72,7 @@ + if test "$PHP_JPEG_DIR" != "no"; then + + for i in $PHP_JPEG_DIR /usr/local /usr; do ++ test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break + done + +@@ -97,6 +98,7 @@ + if test "$PHP_PNG_DIR" != "no"; then + + for i in $PHP_PNG_DIR /usr/local /usr; do ++ test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break + done + +@@ -132,6 +134,7 @@ + if test "$PHP_XPM_DIR" != "no"; then + + for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do ++ test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break + done + +Index: php5-5.3.6/ext/pcre/config0.m4 +=================================================================== +--- php5-5.3.6.orig/ext/pcre/config0.m4 ++++ php5-5.3.6/ext/pcre/config0.m4 +@@ -21,7 +21,7 @@ + AC_MSG_RESULT([$PCRE_INCDIR]) + + AC_MSG_CHECKING([for PCRE library location]) +- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do ++ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH $PHP_PCRE_REGEX/$PHP_LIBDIR; do + test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j + done + +Index: php5-5.3.6/acinclude.m4 +=================================================================== +--- php5-5.3.6.orig/acinclude.m4 ++++ php5-5.3.6/acinclude.m4 +@@ -2271,7 +2271,7 @@ + fi + + for i in $PHP_KERBEROS; do +- if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libkrb5.a; then + PHP_KERBEROS_DIR=$i + break + fi +Index: php5-5.3.6/ext/ldap/config.m4 +=================================================================== +--- php5-5.3.6.orig/ext/ldap/config.m4 ++++ php5-5.3.6/ext/ldap/config.m4 +@@ -95,7 +95,7 @@ + LDAP_PTHREAD= + fi + +- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then ++ if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + --- php5-5.3.6.orig/debian/patches/004-ldap_fix.patch +++ php5-5.3.6/debian/patches/004-ldap_fix.patch @@ -0,0 +1,27 @@ +Description: Prevent null dereferencing in ldap_explode_dn() +Origin: vendor +Bug-Debian: http://bugs.debian.org/205405 +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/ldap/ldap.c ++++ b/ext/ldap/ldap.c +@@ -1212,7 +1212,7 @@ PHP_FUNCTION(ldap_explode_dn) + } + + i=0; +- while (ldap_value[i] != NULL) i++; ++ while (ldap_value && ldap_value[i] != NULL) i++; + count = i; + + array_init(return_value); +@@ -1222,7 +1222,8 @@ PHP_FUNCTION(ldap_explode_dn) + add_index_string(return_value, i, ldap_value[i], 1); + } + +- ldap_value_free(ldap_value); ++ if (ldap_value) ++ ldap_value_free(ldap_value); + } + /* }}} */ + --- php5-5.3.6.orig/debian/patches/php5-CVE-2012-0830.patch +++ php5-5.3.6/debian/patches/php5-CVE-2012-0830.patch @@ -0,0 +1,55 @@ +Origin: http://svn.php.net/viewvc?view=revision&revision=323007 + and http://svn.php.net/viewvc?view=revision&revision=323013 +Subject: fix UMR in php_register_variable_ex, reported by Stefan Esser + +Fixed memory leaks + +CVE-2012-0830 + +--- + main/php_variables.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +Index: b/main/php_variables.c +=================================================================== +--- a/main/php_variables.c ++++ b/main/php_variables.c +@@ -182,7 +182,12 @@ PHPAPI void php_register_variable_ex(cha + if (!index) { + MAKE_STD_ZVAL(gpc_element); + array_init(gpc_element); +- zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ if (zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p) == FAILURE) { ++ zval_ptr_dtor(&gpc_element); ++ zval_dtor(val); ++ efree(var_orig); ++ return; ++ } + } else { + if (PG(magic_quotes_gpc)) { + escaped_index = php_addslashes(index, index_len, &index_len, 0 TSRMLS_CC); +@@ -198,6 +203,13 @@ PHPAPI void php_register_variable_ex(cha + MAKE_STD_ZVAL(gpc_element); + array_init(gpc_element); + zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ } else { ++ if (index != escaped_index) { ++ efree(escaped_index); ++ } ++ zval_dtor(val); ++ efree(var_orig); ++ return; + } + } + if (index != escaped_index) { +@@ -223,7 +235,9 @@ plain_var: + gpc_element->value = val->value; + Z_TYPE_P(gpc_element) = Z_TYPE_P(val); + if (!index) { +- zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ if (zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p) == FAILURE) { ++ zval_ptr_dtor(&gpc_element); ++ } + } else { + if (PG(magic_quotes_gpc)) { + escaped_index = php_addslashes(index, index_len, &index_len, 0 TSRMLS_CC); --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-4885.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-4885.patch @@ -0,0 +1,81 @@ +Origin: http://svn.php.net/viewvc?view=revision&revision=321038 + and http://svn.php.net/viewvc?view=revision&revision=321040 + and http://svn.php.net/viewvc?view=revision&revision=321335 +Subject: Added max_input_vars directive to prevent attacks based on + hash collisions + +Fixes CVE-2011-4885; note that this introduces CVE-2012-0830 + +Ubuntu Note: this patch differs upstream in that we drop the changes to +the default php.ini configuration files, to eliminate prompting of the +admin when upgrading the package. + +--- + main/main.c | 1 + + main/php_globals.h | 2 ++ + main/php_variables.c | 20 ++++++++++++++++---- + 3 files changed, 19 insertions(+), 4 deletions(-) + +Index: b/main/php_globals.h +=================================================================== +--- a/main/php_globals.h ++++ b/main/php_globals.h +@@ -170,6 +170,8 @@ struct _php_core_globals { + char *mail_log; + + zend_bool in_error_log; ++ ++ long max_input_vars; + }; + + +Index: b/main/php_variables.c +=================================================================== +--- a/main/php_variables.c ++++ b/main/php_variables.c +@@ -191,9 +191,14 @@ PHPAPI void php_register_variable_ex(cha + } + if (zend_symtable_find(symtable1, escaped_index, index_len + 1, (void **) &gpc_element_p) == FAILURE + || Z_TYPE_PP(gpc_element_p) != IS_ARRAY) { +- MAKE_STD_ZVAL(gpc_element); +- array_init(gpc_element); +- zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ if (zend_hash_num_elements(symtable1) <= PG(max_input_vars)) { ++ if (zend_hash_num_elements(symtable1) == PG(max_input_vars)) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); ++ } ++ MAKE_STD_ZVAL(gpc_element); ++ array_init(gpc_element); ++ zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ } + } + if (index != escaped_index) { + efree(escaped_index); +@@ -236,7 +241,14 @@ plain_var: + zend_symtable_exists(symtable1, escaped_index, index_len + 1)) { + zval_ptr_dtor(&gpc_element); + } else { +- zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ if (zend_hash_num_elements(symtable1) <= PG(max_input_vars)) { ++ if (zend_hash_num_elements(symtable1) == PG(max_input_vars)) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); ++ } ++ zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); ++ } else { ++ zval_ptr_dtor(&gpc_element); ++ } + } + if (escaped_index != index) { + efree(escaped_index); +Index: b/main/main.c +=================================================================== +--- a/main/main.c ++++ b/main/main.c +@@ -503,6 +503,7 @@ PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("post_max_size", "8M", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong, post_max_size, sapi_globals_struct,sapi_globals) + STD_PHP_INI_ENTRY("upload_tmp_dir", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("max_input_nesting_level", "64", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLongGEZero, max_input_nesting_level, php_core_globals, core_globals) ++ STD_PHP_INI_ENTRY("max_input_vars", "1000", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLongGEZero, max_input_vars, php_core_globals, core_globals) + + STD_PHP_INI_ENTRY("user_dir", NULL, PHP_INI_SYSTEM, OnUpdateString, user_dir, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("variables_order", "EGPCS", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, variables_order, php_core_globals, core_globals) --- php5-5.3.6.orig/debian/patches/php_crypt_revamped.patch +++ php5-5.3.6/debian/patches/php_crypt_revamped.patch @@ -0,0 +1,583 @@ +--- a/ext/standard/config.m4 ++++ b/ext/standard/config.m4 +@@ -60,6 +60,12 @@ if test "$ac_cv_func_crypt" = "no"; then + AC_DEFINE(HAVE_CRYPT, 1, [ ]) + ]) + fi ++ ++AC_CHECK_FUNCS(crypt_r, [ php_crypt_r="1" ], [ php_crypt_r="0" ]) ++if test "x$php_crypt_r" = "x1"; then ++ PHP_CRYPT_R_STYLE ++ AC_DEFINE(HAVE_CRYPT_R, 1, [ ]) ++fi + + AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ + AC_TRY_RUN([ +@@ -231,11 +237,68 @@ main() { + ac_cv_crypt_SHA256=no + ])]) + ++dnl ++dnl Define PHP_*_CRYPT according to system ++dnl ++ ++if test "$ac_cv_crypt_des" = "yes"; then ++ ac_result=1 ++ ac_crypt_des=1 ++else ++ ac_result=0 ++ ac_crypt_des=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt]) ++ ++if test "$ac_cv_crypt_md5" = "yes"; then ++ ac_result=1 ++ ac_crypt_md5=1 ++else ++ ac_result=0 ++ ac_crypt_md5=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt]) ++ ++if test "$ac_cv_crypt_blowfish" = "yes"; then ++ ac_result=1 ++ ac_crypt_blowfish=1 ++else ++ ac_result=0 ++ ac_crypt_blowfish=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt]) ++ ++if test "$ac_cv_crypt_ext_des" = "yes"; then ++ ac_result=1 ++ ac_crypt_edes=1 ++else ++ ac_result=0 ++ ac_crypt_edes=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports extended DES salt]) ++ ++if test "$ac_cv_crypt_SHA512" = "yes"; then ++ ac_result=1 ++ ac_crypt_sha512=1 ++else ++ ac_result=0 ++ ac_crypt_sha512=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, $ac_result, [Whether the system supports SHA512 salt]) ++ ++if test "$ac_cv_crypt_SHA256" = "yes"; then ++ ac_result=1 ++ ac_crypt_sha256=1 ++else ++ ac_result=0 ++ ac_crypt_sha256=0 ++fi ++AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, $ac_result, [Whether the system supports SHA256 salt]) + + dnl + dnl If one of them is missing, use our own implementation, portable code is then possible + dnl +-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then ++if test "$ac_cv_crypt_SHA512" = no || test "$ac_cv_crypt_SHA256" = "no" || test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then + + dnl + dnl Check for __alignof__ support in the compiler +@@ -269,74 +332,15 @@ if test "$ac_cv_crypt_blowfish" = "no" | + AC_DEFINE([HAVE_ATTRIBUTE_ALIGNED], 1, [whether the compiler supports __attribute__ ((__aligned__))]) + fi + +- +- AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5]) +- AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) +- AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) +- AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) +- AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) +- AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) +- AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) ++ ac_result=1 + + PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c) + else +- if test "$ac_cv_crypt_des" = "yes"; then +- ac_result=1 +- ac_crypt_des=1 +- else +- ac_result=0 +- ac_crypt_des=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt]) +- +- if test "$ac_cv_crypt_blowfish" = "yes"; then +- ac_result=1 +- ac_crypt_blowfish=1 +- else +- ac_result=0 +- ac_crypt_blowfish=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt]) +- +- if test "$ac_cv_crypt_ext_des" = "yes"; then +- ac_result=1 +- ac_crypt_edes=1 +- else +- ac_result=0 +- ac_crypt_edes=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports extended DES salt]) +- +- if test "$ac_cv_crypt_md5" = "yes"; then +- ac_result=1 +- ac_crypt_md5=1 +- else +- ac_result=0 +- ac_crypt_md5=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt]) +- +- if test "$ac_cv_crypt_sha512" = "yes"; then +- ac_result=1 +- ac_crypt_sha512=1 +- else +- ac_result=0 +- ac_crypt_sha512=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, $ac_result, [Whether the system supports SHA512 salt]) +- +- if test "$ac_cv_crypt_sha256" = "yes"; then +- ac_result=1 +- ac_crypt_sha256=1 +- else +- ac_result=0 +- ac_crypt_sha256=0 +- fi +- AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, $ac_result, [Whether the system supports SHA256 salt]) +- +- AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) ++ ac_result=0 + fi + ++AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, $ac_result, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) ++ + dnl + dnl Check for available functions + dnl +--- a/ext/standard/crypt.c ++++ b/ext/standard/crypt.c +@@ -32,13 +32,12 @@ + #if PHP_USE_PHP_CRYPT_R + # include "php_crypt_r.h" + # include "crypt_freesec.h" +-#else +-# if HAVE_CRYPT_H +-# if defined(CRYPT_R_GNU_SOURCE) && !defined(_GNU_SOURCE) +-# define _GNU_SOURCE +-# endif +-# include ++#endif ++#if HAVE_CRYPT_H ++# if defined(CRYPT_R_GNU_SOURCE) && !defined(_GNU_SOURCE) ++# define _GNU_SOURCE + # endif ++# include + #endif + #if TM_IN_SYS_TIME + #include +@@ -64,56 +63,50 @@ + * PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate + * for the target platform. */ + +-#if PHP_STD_DES_CRYPT +-#define PHP_MAX_SALT_LEN 2 +-#endif +- +-#if PHP_EXT_DES_CRYPT +-#undef PHP_MAX_SALT_LEN +-#define PHP_MAX_SALT_LEN 9 ++#if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE)) ++# define PHP_USE_SYSTEM_CRYPT_R + #endif + +-#if PHP_MD5_CRYPT +-#undef PHP_MAX_SALT_LEN +-#define PHP_MAX_SALT_LEN 12 +-#endif ++#define PHP_MAX_STD_DES_SALT_LEN 2 ++#define PHP_MAX_STD_DES_HASH_LEN 11 + +-#if PHP_BLOWFISH_CRYPT +-#undef PHP_MAX_SALT_LEN +-#define PHP_MAX_SALT_LEN 60 +-#endif +- +-#if PHP_SHA512_CRYPT +-#undef PHP_MAX_SALT_LEN +-#define PHP_MAX_SALT_LEN 123 +-#endif +- +- +-/* If the configure-time checks fail, we provide DES. +- * XXX: This is a hack. Fix the real problem! */ +- +-#ifndef PHP_MAX_SALT_LEN +-#define PHP_MAX_SALT_LEN 2 +-#undef PHP_STD_DES_CRYPT +-#define PHP_STD_DES_CRYPT 1 +-#endif ++#define PHP_MAX_EXT_DES_SALT_LEN 9 ++#define PHP_MAX_EXT_DES_HASH_LEN 11 ++ ++#define PHP_MAX_MD5_SALT_LEN 12 ++#define PHP_MAX_MD5_HASH_LEN 22 ++ ++#define PHP_MAX_BLOWFISH_SALT_LEN 29 ++#define PHP_MAX_BLOWFISH_HASH_LEN 31 ++ ++#define PHP_MAX_SHA256_SALT_LEN 37 ++#define PHP_MAX_SHA256_HASH_LEN 43 ++ ++#define PHP_MAX_SHA512_SALT_LEN 37 ++#define PHP_MAX_SHA512_HASH_LEN 86 ++ ++/* ++ * Maximum salt length is from SHA512 ++ * Maximum hash length is from SHA512 ++ */ ++#define PHP_MAX_SALT_LEN 37 ++#define PHP_MAX_HASH_LEN 86 + + #define PHP_CRYPT_RAND php_rand(TSRMLS_C) + + PHP_MINIT_FUNCTION(crypt) /* {{{ */ + { + REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT); +- ++ REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); + #ifdef PHP_SHA256_CRYPT +- REGISTER_LONG_CONSTANT("CRYPT_SHA256", PHP_SHA256_CRYPT, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("CRYPT_SHA256", PHP_SHA256_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); + #endif + + #ifdef PHP_SHA512_CRYPT +- REGISTER_LONG_CONSTANT("CRYPT_SHA512", PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("CRYPT_SHA512", PHP_SHA512_CRYPT | PHP_USE_PHP_CRYPT_R, CONST_CS | CONST_PERSISTENT); + #endif + + #if PHP_USE_PHP_CRYPT_R +@@ -124,15 +117,15 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */ + } + /* }}} */ + ++#if PHP_USE_PHP_CRYPT_R + PHP_MSHUTDOWN_FUNCTION(crypt) /* {{{ */ + { +-#if PHP_USE_PHP_CRYPT_R + php_shutdown_crypt_r(); +-#endif + + return SUCCESS; + } + /* }}} */ ++#endif + + static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + +@@ -150,158 +143,160 @@ static void php_to64(char *s, long v, in + PHP_FUNCTION(crypt) + { + char salt[PHP_MAX_SALT_LEN + 1]; ++ int salt_len = 0; ++ char output[PHP_MAX_SALT_LEN + PHP_MAX_HASH_LEN + 1]; + char *str, *salt_in = NULL; + int str_len, salt_in_len = 0; +- char *crypt_res; +- salt[0] = salt[PHP_MAX_SALT_LEN] = '\0'; ++ char *crypt_res = NULL; ++#if PHP_USE_PHP_CRYPT_R ++ struct php_crypt_extended_data extended_buffer; ++#endif ++#if defined(PHP_USE_SYSTEM_CRYPT_R) ++# if defined(CRYPT_R_STRUCT_CRYPT_DATA) ++ struct crypt_data buffer; ++# elif defined(CRYPT_R_CRYPTD) ++ CRYPTD buffer; ++# else ++# error Data struct used by crypt_r() is unknown. Please report. ++# endif ++#endif + +- /* This will produce suitable results if people depend on DES-encryption +- * available (passing always 2-character salt). At least for glibc6.1 */ +- memset(&salt[1], '$', PHP_MAX_SALT_LEN - 1); ++ salt[0] = salt[PHP_MAX_SALT_LEN] = '\0'; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &str, &str_len, &salt_in, &salt_in_len) == FAILURE) { + return; + } + +- if (salt_in) { +- memcpy(salt, salt_in, MIN(PHP_MAX_SALT_LEN, salt_in_len)); +- } +- +- /* The automatic salt generation covers standard DES, md5-crypt and Blowfish (simple) */ +- if (!*salt) { +-#if PHP_MD5_CRYPT +- strcpy(salt, "$1$"); ++ if (salt_in && (salt_in_len > 0)) { ++ salt_len = MIN(PHP_MAX_SALT_LEN, salt_in_len); ++ memcpy(salt, salt_in, salt_len); ++ salt[salt_len] = '\0'; ++ } else { ++ /* Use SHA512 as default algorithm */ ++ salt[0] = '$'; salt[1] = '6'; salt[2] = '$'; + php_to64(&salt[3], PHP_CRYPT_RAND, 4); + php_to64(&salt[7], PHP_CRYPT_RAND, 4); +- strcpy(&salt[11], "$"); +-#elif PHP_STD_DES_CRYPT +- php_to64(&salt[0], PHP_CRYPT_RAND, 2); +- salt[2] = '\0'; +-#endif +- salt_in_len = strlen(salt); ++ salt[11] = '$'; salt[12] = '\0'; ++ salt_len = 12; + } + + /* Windows (win32/crypt) has a stripped down version of libxcrypt and + a CryptoApi md5_crypt implementation */ +-#if PHP_USE_PHP_CRYPT_R + { +- struct php_crypt_extended_data buffer; ++#if PHP_USE_PHP_CRYPT_R ++ memset(&extended_buffer, 0, sizeof(extended_buffer)); ++#endif ++#if defined(PHP_USE_SYSTEM_CRYPT_R) ++# if defined(CRYPT_R_STRUCT_CRYPT_DATA) ++ buffer->initialized = 0; ++# else ++ memset(&buffer, 0, sizeof(buffer)); ++# endif ++#endif + + if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$') { +- char output[MD5_HASH_MAX_LEN]; +- +- RETURN_STRING(php_md5_crypt_r(str, salt, output), 1); ++ /* CRYPT_MD5 */ ++#if PHP_MD5_CRYPT ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++# warning Using system MD5 crypt function, which is OK on Debian system ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# error Using PHP MD5 crypt function, should not happen on Debian system ++ crypt_res = php_md5_crypt_r(str, salt, output); ++#endif + } else if (salt[0]=='$' && salt[1]=='6' && salt[2]=='$') { +- const char sha512_salt_prefix[] = "$6$"; +- const char sha512_rounds_prefix[] = "rounds="; +- char *output; +- int needed = (sizeof(sha512_salt_prefix) - 1 +- + sizeof(sha512_rounds_prefix) + 9 + 1 +- + strlen(salt) + 1 + 43 + 1); +- output = emalloc(needed * sizeof(char *)); +- salt[salt_in_len] = '\0'; +- +- crypt_res = php_sha512_crypt_r(str, salt, output, needed); +- if (!crypt_res) { +- if (salt[0]=='*' && salt[1]=='0') { +- RETVAL_STRING("*1", 1); +- } else { +- RETVAL_STRING("*0", 1); +- } +- } else { +- RETVAL_STRING(output, 1); +- } +- +- memset(output, 0, PHP_MAX_SALT_LEN + 1); +- efree(output); ++ /* CRYPT_SHA512 */ ++#if PHP_SHA512_CRYPT ++# warning Using system SHA512 crypt function, which is OK on Debian system ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# error Using PHP SHA512 crypt function, should not happen on Debian system ++ crypt_res = php_sha512_crypt_r(str, salt, output, sizeof(output)); ++#endif + } else if (salt[0]=='$' && salt[1]=='5' && salt[2]=='$') { +- const char sha256_salt_prefix[] = "$5$"; +- const char sha256_rounds_prefix[] = "rounds="; +- char *output; +- int needed = (sizeof(sha256_salt_prefix) - 1 +- + sizeof(sha256_rounds_prefix) + 9 + 1 +- + strlen(salt) + 1 + 43 + 1); +- output = emalloc(needed * sizeof(char *)); +- salt[salt_in_len] = '\0'; +- +- crypt_res = php_sha256_crypt_r(str, salt, output, needed); +- if (!crypt_res) { +- if (salt[0]=='*' && salt[1]=='0') { +- RETVAL_STRING("*1", 1); +- } else { +- RETVAL_STRING("*0", 1); +- } +- } else { +- RETVAL_STRING(output, 1); +- } +- +- memset(output, 0, PHP_MAX_SALT_LEN + 1); +- efree(output); ++ /* CRYPT_SHA256 */ ++#if PHP_SHA256_CRYPT ++# warning Using system SHA256 crypt function, which is OK on Debian system ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# error Using PHP SHA256 crypt function, should not happen on Debian system ++ crypt_res = php_sha256_crypt_r(str, salt, output, sizeof(output)); ++#endif + } else if ( + salt[0] == '$' && + salt[1] == '2' && + salt[2] == 'a' && + salt[3] == '$' && +- salt[4] >= '0' && salt[4] <= '3' && +- salt[5] >= '0' && salt[5] <= '9' && + salt[6] == '$') { +- char output[PHP_MAX_SALT_LEN + 1]; +- +- memset(output, 0, PHP_MAX_SALT_LEN + 1); +- ++ /* CRYPT_BLOWFISH */ ++#if PHP_BLOWFISH_CRYPT ++# error Using system BlowFish crypt function, should not happen on Debian system ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# warning Using PHP BlowFish crypt function, which is OK on Debian system + crypt_res = php_crypt_blowfish_rn(str, salt, output, sizeof(output)); +- if (!crypt_res) { +- if (salt[0]=='*' && salt[1]=='0') { +- RETVAL_STRING("*1", 1); +- } else { +- RETVAL_STRING("*0", 1); +- } +- } else { +- RETVAL_STRING(output, 1); +- } +- +- memset(output, 0, PHP_MAX_SALT_LEN + 1); ++#endif ++ } else if (salt[0]=='_' && ++ salt_len == 9) { ++ /* CRYPT_EXT_DES */ ++#if PHP_EXT_DES_CRYPT ++# error Using system extended DES crypt function, should not happen on Debian system ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# warning Using PHP extended DES crypt function, which is OK on Debian system ++ _crypt_extended_init_r(); ++ crypt_res = _crypt_extended_r(str, salt, &extended_buffer); ++#endif + } else { +- memset(&buffer, 0, sizeof(buffer)); ++ /* CRYPT_STD_DES */ ++#if PHP_STD_DES_CRYPT ++# warning Using system standard DES crypt function, which is OK on Debian system ++# if defined(PHP_USE_SYSTEM_CRYPT_R) ++ crypt_res = crypt_r(str, salt, &buffer); ++# else ++ crypt_res = crypt(str, salt); ++# endif ++#elif PHP_USE_PHP_CRYPT_R ++# error Using PHP standard DES crypt function, should not happen on Debian system + _crypt_extended_init_r(); ++ crypt_res = _crypt_extended_r(str, salt, &extended_buffer); ++#endif ++ } + +- crypt_res = _crypt_extended_r(str, salt, &buffer); +- if (!crypt_res) { +- if (salt[0]=='*' && salt[1]=='0') { +- RETURN_STRING("*1", 1); +- } else { +- RETURN_STRING("*0", 1); +- } ++ if (!crypt_res) { ++ if (salt[0]=='*' && salt[1]=='0') { ++ RETVAL_STRING("*1", 1); + } else { +- RETURN_STRING(crypt_res, 1); ++ RETVAL_STRING("*0", 1); + } ++ } else { ++ RETVAL_STRING(crypt_res, 1); + } +- } +-#else + +-# if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE)) +- { +-# if defined(CRYPT_R_STRUCT_CRYPT_DATA) +- struct crypt_data buffer; +- memset(&buffer, 0, sizeof(buffer)); +-# elif defined(CRYPT_R_CRYPTD) +- CRYPTD buffer; +-# else +-# error Data struct used by crypt_r() is unknown. Please report. +-# endif +- crypt_res = crypt_r(str, salt, &buffer); +- if (!crypt_res) { +- if (salt[0]=='*' && salt[1]=='0') { +- RETURN_STRING("*1", 1); +- } else { +- RETURN_STRING("*0", 1); +- } +- } else { +- RETURN_STRING(crypt_res, 1); ++ memset(salt, 0, sizeof(salt)); ++ if (output[0]!='\0') { ++ memset(output, 0, sizeof(output)); + } + } +-# endif +-#endif + } + /* }}} */ + #endif +--- a/configure.in ++++ b/configure.in +@@ -671,11 +671,6 @@ PHP_TIME_R_TYPE + PHP_READDIR_R_TYPE + PHP_CHECK_IN_ADDR_T + +-AC_CHECK_FUNCS(crypt_r, [ php_crypt_r="1" ], [ php_crypt_r="0" ]) +-if test "x$php_crypt_r" = "x1"; then +- PHP_CRYPT_R_STYLE +-fi +- + dnl divert(4) + + dnl ## In diversion 4 we check user-configurable general settings. --- php5-5.3.6.orig/debian/patches/101-sqlite_is_shared.patch +++ php5-5.3.6/debian/patches/101-sqlite_is_shared.patch @@ -0,0 +1,11 @@ +--- a/ext/sqlite/config.m4 ++++ b/ext/sqlite/config.m4 +@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then + ]) + SQLITE_MODULE_TYPE=external + PHP_SQLITE_CFLAGS=$pdo_inc_path +- sqlite_extra_sources="libsqlite/src/encode.c" ++ sqlite_extra_sources="" + else + # use bundled library + PHP_PROG_LEMON --- php5-5.3.6.orig/debian/patches/lp564920-fix-big-files.patch +++ php5-5.3.6/debian/patches/lp564920-fix-big-files.patch @@ -0,0 +1,22 @@ +Description: don't mmap large files +Author: Marc Deslauriers +Bug: http://bugs.php.net/bug.php?id=52102 +Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/php5/+bug/564920 + +--- a/main/streams/plain_wrapper.c ++++ b/main/streams/plain_wrapper.c +@@ -629,7 +629,13 @@ static int php_stdiop_set_option(php_str + + switch (value) { + case PHP_STREAM_MMAP_SUPPORTED: +- return fd == -1 ? PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK; ++ if (fd == -1) ++ return PHP_STREAM_OPTION_RETURN_ERR; ++ /* Don't mmap large files */ ++ do_fstat(data, 1); ++ if (data->sb.st_size > 4 * 1024 * 1024) ++ return PHP_STREAM_OPTION_RETURN_ERR; ++ return PHP_STREAM_OPTION_RETURN_OK; + + case PHP_STREAM_MMAP_MAP_RANGE: + do_fstat(data, 1); --- php5-5.3.6.orig/debian/patches/broken_5.3_test-posix_uname.patch +++ php5-5.3.6/debian/patches/broken_5.3_test-posix_uname.patch @@ -0,0 +1,53 @@ +Author: Sean Finney +Description: Fix two failing tests + * ext/posix/tests/posix_uname.phpt: removed + * ext/posix/tests/posix_uname_basic.phpt: backported fix from upstream. +Bug: http://bugs.php.net/bug.php?id=50982 +Bug-Debian: http://bugs.debian.org/570286 +--- a/ext/posix/tests/posix_uname.phpt ++++ /dev/null +@@ -1,35 +0,0 @@ +---TEST-- +-Test posix_uname() +---DESCRIPTION-- +-Gets information about the system. +-Source code: ext/posix/posix.c +---CREDITS-- +-Falko Menge, mail at falko-menge dot de +-PHP Testfest Berlin 2009-05-10 +---SKIPIF-- +- +---FILE-- +- +-===DONE=== +---EXPECTF-- +-array(5) { +- ["sysname"]=> +- string(%d) "%s" +- ["nodename"]=> +- string(%d) "%s" +- ["release"]=> +- string(%d) "%s" +- ["version"]=> +- string(%d) "%s" +- ["machine"]=> +- string(%d) "%s" +-} +-===DONE=== +--- a/ext/posix/tests/posix_uname_basic.phpt ++++ b/ext/posix/tests/posix_uname_basic.phpt +@@ -25,4 +25,4 @@ Array + [machine] => %s + ) + ===DONE==== +- +\ No newline at end of file ++ --- php5-5.3.6.orig/debian/patches/013-force_getaddrinfo.patch +++ php5-5.3.6/debian/patches/013-force_getaddrinfo.patch @@ -0,0 +1,103 @@ +Description: Always use getaddrinfo + . + The patch should probably be dropped and the configure check verified. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/configure.in ++++ b/configure.in +@@ -615,50 +615,50 @@ PHP_CHECK_FUNC_LIB(nanosleep, rt) + + dnl Check for getaddrinfo, should be a better way, but... + dnl Also check for working getaddrinfo +-AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, +-[AC_TRY_LINK([#include ], +- [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], +- AC_TRY_RUN([ +-#include +-#include +-#ifndef AF_INET +-# include +-#endif +-int main(void) { +- struct addrinfo *ai, *pai, hints; +- +- memset(&hints, 0, sizeof(hints)); +- hints.ai_flags = AI_NUMERICHOST; +- +- if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) { +- exit(1); +- } +- +- if (ai == 0) { +- exit(1); +- } +- +- pai = ai; +- +- while (pai) { +- if (pai->ai_family != AF_INET) { +- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ +- exit(1); +- } +- if (pai->ai_addr->sa_family != AF_INET) { +- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ +- exit(1); +- } +- pai = pai->ai_next; +- } +- freeaddrinfo(ai); +- exit(0); +-} +- ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no), +-ac_cv_func_getaddrinfo=no)]) +-if test "$ac_cv_func_getaddrinfo" = yes; then ++dnl AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, ++dnl [AC_TRY_LINK([#include ], ++dnl [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], ++dnl AC_TRY_RUN([ ++dnl #include ++dnl #include ++dnl #ifndef AF_INET ++dnl # include ++dnl #endif ++dnl int main(void) { ++dnl struct addrinfo *ai, *pai, hints; ++dnl ++dnl memset(&hints, 0, sizeof(hints)); ++dnl hints.ai_flags = AI_NUMERICHOST; ++dnl ++dnl if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) { ++dnl exit(1); ++dnl } ++dnl ++dnl if (ai == 0) { ++dnl exit(1); ++dnl } ++dnl ++dnl pai = ai; ++dnl ++dnl while (pai) { ++dnl if (pai->ai_family != AF_INET) { ++dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ ++dnl exit(1); ++dnl } ++dnl if (pai->ai_addr->sa_family != AF_INET) { ++dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ ++dnl exit(1); ++dnl } ++dnl pai = pai->ai_next; ++dnl } ++dnl freeaddrinfo(ai); ++dnl exit(0); ++dnl } ++dnl ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no), ++dnl ac_cv_func_getaddrinfo=no)]) ++dnl if test "$ac_cv_func_getaddrinfo" = yes; then + AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function]) +-fi ++dnl fi + + AC_REPLACE_FUNCS(strlcat strlcpy getopt) + AC_FUNC_UTIME_NULL --- php5-5.3.6.orig/debian/patches/deprecate_short_open_tag +++ php5-5.3.6/debian/patches/deprecate_short_open_tag @@ -0,0 +1,36 @@ +--- a/Zend/zend_language_scanner.l ++++ b/Zend/zend_language_scanner.l +@@ -1513,6 +1513,7 @@ NEWLINE ("\r"|"\n"|"\r\n") + + "value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; +@@ -1549,6 +1550,7 @@ NEWLINE ("\r"|"\n"|"\r\n") + + "value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; +--- a/Zend/zend_language_scanner.c ++++ b/Zend/zend_language_scanner.c +@@ -1019,6 +1019,7 @@ yy6: + #line 1550 "Zend/zend_language_scanner.l" + { + if (CG(short_tags)) { ++ zend_error(E_DEPRECATED, "Usage of short open tag value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; +@@ -1298,6 +1299,7 @@ yy45: + #line 1514 "Zend/zend_language_scanner.l" + { + if (CG(short_tags)) { ++ zend_error(E_DEPRECATED, "Usage of short open tag value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; --- php5-5.3.6.orig/debian/patches/044-strtod_arm_fix.patch +++ php5-5.3.6/debian/patches/044-strtod_arm_fix.patch @@ -0,0 +1,54 @@ +--- a/Zend/zend_strtod.c ++++ b/Zend/zend_strtod.c +@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t; + #define IEEE_LITTLE_ENDIAN + #endif + +-#if defined(__arm__) && !defined(__VFP_FP__) +-/* +- * * Although the CPU is little endian the FP has different +- * * byte and word endianness. The byte order is still little endian +- * * but the word order is big endian. +- * */ +-#define IEEE_BIG_ENDIAN ++#if defined(__arm__) || defined(__thumb__) ++/* ARM traditionally used big-endian words; and within those words the ++ byte ordering was big or little endian depending upon the target. ++ Modern floating-point formats are naturally ordered; in this case ++ __VFP_FP__ will be defined, even if soft-float. */ + #undef IEEE_LITTLE_ENDIAN ++#undef IEEE_BIG_ENDIAN ++#if defined(__VFP_FP__) || defined(__MAVERICK__) ++# ifdef __ARMEL__ ++# define IEEE_LITTLE_ENDIAN ++# else ++# define IEEE_BIG_ENDIAN ++# endif ++#else ++# define IEEE_BIG_ENDIAN ++# ifdef __ARMEL__ ++# define IEEE_BYTES_LITTLE_ENDIAN ++# endif ++#endif + #endif + + #ifdef __vax__ +@@ -267,8 +278,7 @@ BEGIN_EXTERN_C() + + #if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \ + defined(IBM) != 1 +- Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or +- IBM should be defined. ++#error "Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or IBM should be defined." + #endif + + typedef union { +@@ -288,7 +298,7 @@ BEGIN_EXTERN_C() + * An alternative that might be better on some machines is + * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) + */ +-#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm__) ++#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(IEEE_BYTES_LITTLE_ENDIAN) + #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ + ((unsigned short *)a)[0] = (unsigned short)c, a++) + #else --- php5-5.3.6.orig/debian/patches/zend_int_overflow.patch +++ php5-5.3.6/debian/patches/zend_int_overflow.patch @@ -0,0 +1,110 @@ +Author: Sean Finney +Description: Another integer overflow/underflow logic fix. + Once again, don't rely on undefined behavior and instead detect + the overflow/underflow conditions intelligently. +Bug: http://bugs.php.net/bug.php?id=51008 +Bug-Debian: http://bugs.debian.org/570144 +--- a/Zend/zend_hash.h ++++ b/Zend/zend_hash.h +@@ -306,9 +306,11 @@ END_EXTERN_C() + + #define ZEND_HANDLE_NUMERIC(key, length, func) do { \ + register const char *tmp = key; \ ++ int negative = 0; \ + \ + if (*tmp == '-') { \ + tmp++; \ ++ negative = 1; \ + } \ + if (*tmp >= '0' && *tmp <= '9') { /* possibly a numeric index */ \ + const char *end = key + length - 1; \ +@@ -322,19 +324,19 @@ END_EXTERN_C() + *tmp > '2')) { /* overflow */ \ + break; \ + } \ +- idx = (*tmp - '0'); \ ++ idx = ((negative)?-1:1) * (*tmp - '0'); \ + while (++tmp != end && *tmp >= '0' && *tmp <= '9') { \ +- idx = (idx * 10) + (*tmp - '0'); \ +- } \ +- if (tmp == end) { \ +- if (*key == '-') { \ +- if (idx-1 > LONG_MAX) { /* overflow */ \ +- break; \ +- } \ +- idx = (ulong)(-(long)idx); \ +- } else if (idx > LONG_MAX) { /* overflow */ \ ++ int digit = (*tmp - '0'); \ ++ if ( (!negative) && idx <= (LONG_MAX-digit)/10 ) { \ ++ idx = (idx * 10) + digit; \ ++ } else if ( (negative) && idx >= (LONG_MIN+digit)/10 ) { \ ++ idx = (idx * 10) - digit; \ ++ } else { \ ++ --tmp; /* overflow or underflow, make sure tmp != end */ \ + break; \ + } \ ++ } \ ++ if (tmp == end) { \ + return func; \ + } \ + } \ +--- a/Zend/tests/bug45877.phpt ++++ b/Zend/tests/bug45877.phpt +@@ -1,23 +1,40 @@ + --TEST-- + Bug #45877 (Array key '2147483647' left as string) +---INI-- +-precision=16 + --FILE-- + +---EXPECTF-- +-array(3) { +- [%d7]=> +- int(1) +- [-%d8]=> +- int(1) +- ["%s"]=> +- int(1) ++function test_value($val, $msg) { ++ $a = array($val => 1); ++ $keys = array_keys($a); ++ if ($val == $keys[0]) $result = "ok"; ++ else $result = "failed ($val != $keys[0])"; ++ echo "$msg: $result\n"; + } ++ ++test_value($max, "max"); ++test_value($overflow, "overflow"); ++test_value($min, "min"); ++test_value($underflow, "underflow"); ++ ++?> ++--EXPECT-- ++max: ok ++overflow: ok ++min: ok ++underflow: ok --- php5-5.3.6.orig/debian/patches/php5-CVE-2012-0788.patch +++ php5-5.3.6/debian/patches/php5-CVE-2012-0788.patch @@ -0,0 +1,42 @@ +Origin: http://svn.php.net/viewvc?view=revision&revision=317272 +Subject: Fix bug #55776 (PDORow to session bug) + +CVE-2012-0788 + +--- + ext/pdo/pdo_stmt.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +Index: b/ext/pdo/pdo_stmt.c +=================================================================== +--- a/ext/pdo/pdo_stmt.c ++++ b/ext/pdo/pdo_stmt.c +@@ -2345,6 +2345,7 @@ static zend_object_value dbstmt_clone_ob + } + + zend_object_handlers pdo_dbstmt_object_handlers; ++static int pdo_row_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC); + + void pdo_stmt_init(TSRMLS_D) + { +@@ -2368,6 +2369,7 @@ void pdo_stmt_init(TSRMLS_D) + pdo_row_ce = zend_register_internal_class(&ce TSRMLS_CC); + pdo_row_ce->ce_flags |= ZEND_ACC_FINAL_CLASS; /* when removing this a lot of handlers need to be redone */ + pdo_row_ce->create_object = pdo_row_new; ++ pdo_row_ce->serialize = pdo_row_serialize; + } + + static void free_statement(pdo_stmt_t *stmt TSRMLS_DC) +@@ -2791,6 +2793,12 @@ zend_object_value pdo_row_new(zend_class + + return retval; + } ++ ++static int pdo_row_serialize(zval *object, unsigned char **buffer, zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC) ++{ ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "PDORow instances may not be serialized"); ++ return FAILURE; ++} + /* }}} */ + + /* --- php5-5.3.6.orig/debian/patches/116-posixness_fix.patch +++ php5-5.3.6/debian/patches/116-posixness_fix.patch @@ -0,0 +1,52 @@ +--- a/TSRM/tsrm_config_common.h ++++ b/TSRM/tsrm_config_common.h +@@ -1,6 +1,10 @@ + #ifndef TSRM_CONFIG_COMMON_H + #define TSRM_CONFIG_COMMON_H + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #ifndef __CYGWIN__ + # if WINNT|WIN32 + # define TSRM_WIN32 +--- a/ext/date/lib/parse_tz.c ++++ b/ext/date/lib/parse_tz.c +@@ -18,6 +18,10 @@ + + /* $Id: parse_tz.c 293036 2010-01-03 09:23:27Z sebastian $ */ + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #include "timelib.h" + + #include +--- a/ext/standard/proc_open.c ++++ b/ext/standard/proc_open.c +@@ -24,6 +24,10 @@ + # define __EXTENSIONS__ 1 /* Solaris: uint */ + #endif + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #include "php.h" + #include + #include +--- a/main/php.h ++++ b/main/php.h +@@ -248,6 +248,10 @@ END_EXTERN_C() + /* macros */ + #define STR_PRINT(str) ((str)?(str):"") + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #ifndef MAXPATHLEN + # ifdef PATH_MAX + # define MAXPATHLEN PATH_MAX --- php5-5.3.6.orig/debian/patches/CVE-2011-2202.patch +++ php5-5.3.6/debian/patches/CVE-2011-2202.patch @@ -0,0 +1,20 @@ +--- a/main/rfc1867.c ++++ b/main/rfc1867.c +@@ -1223,7 +1223,7 @@ filedone: + #endif + + if (!is_anonymous) { +- if (s && s > filename) { ++ if (s && s >= filename) { + safe_php_register_variable(lbuf, s+1, strlen(s+1), NULL, 0 TSRMLS_CC); + } else { + safe_php_register_variable(lbuf, filename, strlen(filename), NULL, 0 TSRMLS_CC); +@@ -1236,7 +1236,7 @@ filedone: + } else { + snprintf(lbuf, llen, "%s[name]", param); + } +- if (s && s > filename) { ++ if (s && s >= filename) { + register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC); + } else { + register_http_post_files_variable(lbuf, filename, http_post_files, 0 TSRMLS_CC); --- php5-5.3.6.orig/debian/patches/configure-as-needed.patch +++ php5-5.3.6/debian/patches/configure-as-needed.patch @@ -0,0 +1,45 @@ +Description: Patching PHP 5.3.3 to build with GCC 4.5 and DSO libs +Author: Clint Byrum +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/676672 + +--- a/ext/ldap/config.m4 ++++ b/ext/ldap/config.m4 +@@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [ + SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2" + fi + +- PHP_CHECK_LIBRARY(ldap, sasl_version, ++ PHP_CHECK_LIBRARY(sasl2, sasl_version, + [ + PHP_ADD_INCLUDE($LDAP_SASL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD) +--- a/ext/openssl/config0.m4 ++++ b/ext/openssl/config0.m4 +@@ -17,6 +17,7 @@ if test "$PHP_OPENSSL" != "no"; then + fi + + AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) ++ AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) + + PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, + [ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2396,6 +2396,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ + ]) + LIBS=$old_LIBS + PHP_ADD_LIBRARY(ssl,,$1) ++ PHP_ADD_LIBRARY(crypto,,$1) + + PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) + fi +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -2398,6 +2398,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ + ]) + LIBS=$old_LIBS + PHP_ADD_LIBRARY(ssl,,$1) ++ PHP_ADD_LIBRARY(crypto,,$1) + + PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) + fi --- php5-5.3.6.orig/debian/patches/use_embedded_timezonedb_fixes.patch +++ php5-5.3.6/debian/patches/use_embedded_timezonedb_fixes.patch @@ -0,0 +1,64 @@ +Author: Sean Finney +Forwarded: no (upstream doesn't want it) +Description: Silence warnings about using the default system timezone info + In vanilla upstream php, this is considered an error (i.e. the user must + set the timezone explicitly), though with our use of the system timezonedb + patch, we actually feel quite comfortable using the default timezone info. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 +--- a/ext/date/php_date.c ++++ b/ext/date/php_date.c +@@ -878,7 +878,7 @@ static char* guess_timezone(const timeli + tzid = "UTC"; + } + +- php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); ++ // php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); + return tzid; + } + #endif +--- a/ext/date/tests/date_default_timezone_get-1.phpt ++++ /dev/null +@@ -1,16 +0,0 @@ +---TEST-- +-date_default_timezone_get() function [1] +---INI-- +-date.timezone= +---FILE-- +- +---EXPECTF-- +-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 3 +-UTC +- +-Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4 +-UTC +--- a/ext/date/tests/date_default_timezone_get-2.phpt ++++ /dev/null +@@ -1,12 +0,0 @@ +---TEST-- +-date_default_timezone_get() function [2] +---INI-- +-date.timezone= +---FILE-- +- +---EXPECTF-- +-Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-2.php on line 3 +-UTC +--- a/ext/date/tests/date_default_timezone_set-1.phpt ++++ b/ext/date/tests/date_default_timezone_set-1.phpt +@@ -18,9 +18,6 @@ date.timezone= + echo date(DATE_ISO8601, $date4), "\n"; + ?> + --EXPECTF-- +-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3 +- +-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4 + America/Indiana/Knox + 2005-01-12T03:00:00-0500 + 2005-07-12T03:00:00-0500 --- php5-5.3.6.orig/debian/patches/bug53070.patch +++ php5-5.3.6/debian/patches/bug53070.patch @@ -0,0 +1,20 @@ +--- a/ext/enchant/enchant.c ++++ b/ext/enchant/enchant.c +@@ -429,6 +429,8 @@ PHP_FUNCTION(enchant_broker_set_dict_pat + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &broker, &dict_type, &value, &value_len) == FAILURE) { + RETURN_FALSE; + } ++ ++ PHP_ENCHANT_GET_BROKER; + + if (!value_len) { + RETURN_FALSE; +@@ -485,6 +487,8 @@ PHP_FUNCTION(enchant_broker_get_dict_pat + default: + RETURN_FALSE; + } ++ ++ PHP_ENCHANT_GET_BROKER; + + RETURN_STRING(value, 1); + } --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-4153.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-4153.patch @@ -0,0 +1,102 @@ +Origin: http://svn.php.net/viewvc?view=revision&revision=319457 + and http://svn.php.net/viewvc?view=revision&revision=319442 + and http://svn.php.net/viewvc?view=revision&revision=314527 +Subject: fixes for bug #55748 (fail to check zend_strndup for failures) + +fixes for bug #55748 +Sync to 5.3 and check additional cases for #55748 +Fix typo + +CVE-2011-4153 + +--- + Zend/zend_builtin_functions.c | 3 +++ + ext/com_dotnet/com_typeinfo.c | 4 ++++ + ext/oci8/oci8.c | 17 ++++++++++++++++- + ext/standard/syslog.c | 3 +++ + 4 files changed, 26 insertions(+), 1 deletion(-) + +Index: b/ext/oci8/oci8.c +=================================================================== +--- a/ext/oci8/oci8.c ++++ b/ext/oci8/oci8.c +@@ -2003,7 +2003,14 @@ php_oci_connection *php_oci_do_connect_e + connection->is_persistent = 0; + } else { + connection = (php_oci_connection *) calloc(1, sizeof(php_oci_connection)); ++ if (connection == NULL) { ++ return NULL; ++ } + connection->hash_key = zend_strndup(hashed_details.c, hashed_details.len); ++ if (connection->hash_key == NULL) { ++ free(connection); ++ return NULL; ++ } + connection->is_persistent = 1; + } + } else { +@@ -2617,12 +2624,20 @@ static php_oci_spool *php_oci_create_spo + ub4 poolmode = OCI_DEFAULT; /* Mode to be passed to OCISessionPoolCreate */ + OCIAuthInfo *spoolAuth = NULL; + +- /*Allocate sessionpool out of persistent memory */ ++ /* Allocate sessionpool out of persistent memory */ + session_pool = (php_oci_spool *) calloc(1, sizeof(php_oci_spool)); ++ if (session_pool == NULL) { ++ iserror = 1; ++ goto exit_create_spool; ++ } + + /* Populate key if passed */ + if (hash_key_len) { + session_pool->spool_hash_key = zend_strndup(hash_key, hash_key_len); ++ if (session_pool->spool_hash_key == NULL) { ++ iserror = 1; ++ goto exit_create_spool; ++ } + } + + /* Create the session pool's env */ +Index: b/ext/standard/syslog.c +=================================================================== +--- a/ext/standard/syslog.c ++++ b/ext/standard/syslog.c +@@ -236,6 +236,9 @@ PHP_FUNCTION(openlog) + free(BG(syslog_device)); + } + BG(syslog_device) = zend_strndup(ident, ident_len); ++ if(BG(syslog_device) == NULL) { ++ RETURN_FALSE; ++ } + openlog(BG(syslog_device), option, facility); + RETURN_TRUE; + } +Index: b/ext/com_dotnet/com_typeinfo.c +=================================================================== +--- a/ext/com_dotnet/com_typeinfo.c ++++ b/ext/com_dotnet/com_typeinfo.c +@@ -187,6 +187,10 @@ PHPAPI int php_com_import_typelib(ITypeL + const_name = php_com_olestring_to_string(bstr_ids, &c.name_len, codepage TSRMLS_CC); + c.name = zend_strndup(const_name, c.name_len); + efree(const_name); ++ if(c.name == NULL) { ++ ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc); ++ continue; ++ } + c.name_len++; /* include NUL */ + SysFreeString(bstr_ids); + +Index: b/Zend/zend_builtin_functions.c +=================================================================== +--- a/Zend/zend_builtin_functions.c ++++ b/Zend/zend_builtin_functions.c +@@ -683,6 +683,9 @@ repeat: + } + c.flags = case_sensitive; /* non persistent */ + c.name = zend_strndup(name, name_len); ++ if(c.name == NULL) { ++ RETURN_FALSE; ++ } + c.name_len = name_len+1; + c.module_number = PHP_USER_CONSTANT; + if (zend_register_constant(&c TSRMLS_CC) == SUCCESS) { --- php5-5.3.6.orig/debian/patches/034-apache2_umask_fix.patch +++ php5-5.3.6/debian/patches/034-apache2_umask_fix.patch @@ -0,0 +1,50 @@ +Description: Save and restore umask across requests correctly. + . + Check if this is still an issue not addressed by upstream in some + other way already. +Origin: other +Bug-Debian: http://bugs.debian.org/286225 +Forwarded: no +Last-Update: 2010-01-18 + +--- a/sapi/apache2handler/sapi_apache2.c ++++ b/sapi/apache2handler/sapi_apache2.c +@@ -469,6 +469,19 @@ static apr_status_t php_server_context_c + return APR_SUCCESS; + } + ++static int saved_umask; ++ ++static void php_save_umask(void) ++{ ++ saved_umask = umask(077); ++ umask(saved_umask); ++} ++ ++static void php_restore_umask(void) ++{ ++ umask(saved_umask); ++} ++ + static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC) + { + char *content_length; +@@ -660,6 +673,8 @@ zend_first_try { + } else { + zend_file_handle zfd; + ++ php_save_umask(); ++ + zfd.type = ZEND_HANDLE_FILENAME; + zfd.filename = (char *) r->filename; + zfd.free_filename = 0; +@@ -671,6 +686,9 @@ zend_first_try { + zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd); + } + ++ php_restore_umask(); ++ ++ + apr_table_set(r->notes, "mod_php_memory_usage", + apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC))); + } --- php5-5.3.6.orig/debian/patches/053-extension_api.patch +++ php5-5.3.6/debian/patches/053-extension_api.patch @@ -0,0 +1,59 @@ +Description: Adds --phpapi argument to php-config(1) + . + TODO: make it more generic and add it to the man page. +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/configure.in ++++ b/configure.in +@@ -1114,8 +1114,13 @@ dnl Build extension directory path + + ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` + ++DEBIAN_PHP_API=`egrep -h '^#define ZEND_EXTENSION_API_NO|^#define ZEND_MODULE_API_NO|#define PHP_API_VERSION' $srcdir/Zend/zend_extensions.h $srcdir/Zend/zend_modules.h $srcdir/main/php.h | awk '{print $3}' | sed -e 's/^2200/200/' | sort -n | tail -n 1` ++if echo "$CPPFLAGS $CFLAGS" | grep -q -- -D_FILE_OFFSET_BITS=64; then ++ DEBIAN_PHP_API="${DEBIAN_PHP_API}+lfs" ++fi ++ + if test -z "$EXTENSION_DIR"; then +- extbasedir=$ZEND_MODULE_API_NO ++ extbasedir=$DEBIAN_PHP_API + if test "$oldstyleextdir" = "yes"; then + if test "$PHP_DEBUG" = "1"; then + part1=debug +@@ -1265,6 +1270,7 @@ PHP_SUBST(CXX) + PHP_SUBST(CXXFLAGS) + PHP_SUBST(CXXFLAGS_CLEAN) + PHP_SUBST_OLD(DEBUG_CFLAGS) ++PHP_SUBST_OLD(DEBIAN_PHP_API) + PHP_SUBST_OLD(EXTENSION_DIR) + PHP_SUBST_OLD(EXTRA_LDFLAGS) + PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM) +--- a/scripts/php-config.in ++++ b/scripts/php-config.in +@@ -17,6 +17,7 @@ php_cli_binary=NONE + php_cgi_binary=NONE + configure_options="@CONFIGURE_OPTIONS@" + php_sapis="@PHP_INSTALLED_SAPIS@" ++phpapi="@DEBIAN_PHP_API@" + + # Set php_cli_binary and php_cgi_binary if available + for sapi in $php_sapis; do +@@ -55,6 +56,8 @@ case "$1" in + echo $include_dir;; + --php-binary) + echo $php_binary;; ++--phpapi) ++ echo $phpapi;; + --php-sapis) + echo $php_sapis;; + --configure-options) +@@ -75,6 +78,7 @@ Options: + --include-dir [$include_dir] + --php-binary [$php_binary] + --php-sapis [$php_sapis] ++ --phpapi [$phpapi] + --configure-options [$configure_options] + --version [$version] + --vernum [$vernum] --- php5-5.3.6.orig/debian/patches/CVE-2011-1144.patch +++ php5-5.3.6/debian/patches/CVE-2011-1144.patch @@ -0,0 +1,142 @@ +--- a/PEAR/REST.php 2011/03/08 22:46:27 309041 ++++ b/PEAR/REST.php 2011/03/08 23:16:30 309042 +@@ -102,7 +102,7 @@ + // reset the age of the cache if the server says it was unmodified + $result = $this->saveCache($url, $ret, null, true, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + } + +@@ -122,7 +122,7 @@ + if ($forcestring) { + $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + + return $content; +@@ -162,7 +162,7 @@ + + $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + + return $content; +@@ -228,59 +228,75 @@ + $cacheidfile = $d . 'rest.cacheid'; + $cachefile = $d . 'rest.cachefile'; + ++ if (!is_dir($cache_dir)) { ++ if (System::mkdir(array('-p', $cache_dir)) === false) { ++ return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory and attempts to create the directory failed."); ++ } ++ } ++ + if ($cacheid === null && $nochange) { + $cacheid = unserialize(implode('', file($cacheidfile))); + } + +- if (is_link($cacheidfile)) { +- return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $cacheidfile . ' as it is symlinked to ' . readlink($cacheidfile) . ' - Possible symlink attack'); +- } ++ $idData = serialize(array( ++ 'age' => time(), ++ 'lastChange' => ($nochange ? $cacheid['lastChange'] : $lastmodified), ++ )); + +- if (is_link($cachefile)) { +- return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $cacheidfile . ' as it is symlinked to ' . readlink($cacheidfile) . ' - Possible symlink attack'); ++ $result = $this->saveCacheFile($cacheidfile, $idData); ++ if (PEAR::isError($result)) { ++ return $result; ++ } elseif ($nochange) { ++ return true; + } + +- $cacheidfile_fp = @fopen($cacheidfile, 'wb'); +- if (!$cacheidfile_fp) { +- if (is_dir($cache_dir)) { +- return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory. "); ++ $result = $this->saveCacheFile($cachefile, serialize($contents)); ++ if (PEAR::isError($result)) { ++ if (file_exists($cacheidfile)) { ++ @unlink($cacheidfile); + } + +- System::mkdir(array('-p', $cache_dir)); +- $cacheidfile_fp = @fopen($cacheidfile, 'wb'); +- if (!$cacheidfile_fp) { +- return PEAR::raiseError("Could not open $cacheidfile for writing."); +- } ++ return $result; + } + +- if ($nochange) { +- fwrite($cacheidfile_fp, serialize(array( +- 'age' => time(), +- 'lastChange' => $cacheid['lastChange'], +- )) +- ); +- +- fclose($cacheidfile_fp); +- return true; +- } ++ return true; ++ } + +- fwrite($cacheidfile_fp, serialize(array( +- 'age' => time(), +- 'lastChange' => $lastmodified, +- )) +- ); +- fclose($cacheidfile_fp); ++ function saveCacheFile($file, $contents) ++ { ++ $len = strlen($contents); + +- $cachefile_fp = @fopen($cachefile, 'wb'); +- if (!$cachefile_fp) { +- if (file_exists($cacheidfile)) { +- @unlink($cacheidfile); ++ $cachefile_fp = @fopen($file, 'xb'); // x is the O_CREAT|O_EXCL mode ++ if ($cachefile_fp !== false) { // create file ++ if (fwrite($cachefile_fp, $contents, $len) < $len) { ++ fclose($cachefile_fp); ++ return PEAR::raiseError("Could not write $file."); ++ } ++ } else { // update file ++ $cachefile_lstat = lstat($file); ++ $cachefile_fp = @fopen($file, 'wb'); ++ if (!$cachefile_fp) { ++ return PEAR::raiseError("Could not open $file for writing."); ++ } ++ ++ $cachefile_fstat = fstat($cachefile_fp); ++ if ( ++ $cachefile_lstat['mode'] == $cachefile_fstat['mode'] && ++ $cachefile_lstat['ino'] == $cachefile_fstat['ino'] && ++ $cachefile_lstat['dev'] == $cachefile_fstat['dev'] && ++ $cachefile_fstat['nlink'] === 1 ++ ) { ++ if (fwrite($cachefile_fp, $contents, $len) < $len) { ++ fclose($cachefile_fp); ++ return PEAR::raiseError("Could not write $file."); ++ } ++ } else { ++ fclose($cachefile_fp); ++ $link = function_exists('readlink') ? readlink($file) : $file; ++ return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $file . ' as it is symlinked to ' . $link . ' - Possible symlink attack'); + } +- +- return PEAR::raiseError("Could not open $cacheidfile for writing."); + } + +- fwrite($cachefile_fp, serialize($contents)); + fclose($cachefile_fp); + return true; + } --- php5-5.3.6.orig/debian/patches/047-zts_with_dl.patch +++ php5-5.3.6/debian/patches/047-zts_with_dl.patch @@ -0,0 +1,15 @@ +--- a/ext/standard/dl.c ++++ b/ext/standard/dl.c +@@ -77,12 +77,7 @@ PHPAPI PHP_FUNCTION(dl) + (strcmp(sapi_module.name, "cli") != 0) && + (strncmp(sapi_module.name, "embed", 5) != 0) + ) { +-#ifdef ZTS +- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in multithreaded Web servers - use extension=%s in your php.ini", filename); +- RETURN_FALSE; +-#else + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "dl() is deprecated - use extension=%s in your php.ini", filename); +-#endif + } + + php_dl(filename, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC); --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-3182.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-3182.patch @@ -0,0 +1,216 @@ +Subject: check the return values of the malloc, calloc, and realloc + library functions +Origin: upstream commits r313782, r313826, r313827, r313828, r313830, + r313831, r313832, r313833, r313835, r313903 +Bug-upstream: http://svn.php.net/viewvc?view=revision&revision=313903 + +r313782 | pajoye | 2011-07-27 07:23:06 -0700 (Wed, 27 Jul 2011) | 1 line +- Fix #55295, check if malloc failed +r313826 | pajoye | 2011-07-28 03:31:34 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (curl part) check if malloc succeded +r313827 | pajoye | 2011-07-28 03:34:16 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (com_dotnet part) check if malloc succeded +r313828 | pajoye | 2011-07-28 03:37:04 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (pdo_odbc part) check if malloc succeded +r313830 | pajoye | 2011-07-28 03:39:19 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (interbase part) check if malloc succeded +r313831 | pajoye | 2011-07-28 03:42:45 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (readline part) check if malloc succeded +r313832 | pajoye | 2011-07-28 03:52:45 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (url scanner part) check if malloc succeded +r313833 | pajoye | 2011-07-28 03:57:31 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (sybase part) check if malloc succeded +r313835 | pajoye | 2011-07-28 04:01:04 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (mssql part) check if malloc succeded +r313903 | pajoye | 2011-07-28 14:16:51 -0700 (Thu, 28 Jul 2011) | 1 line +- Fix #55301 (sybase part, take #2) check if malloc succeded + +CVE-2011-3182 + +--- + TSRM/tsrm_win32.c | 4 ++++ + ext/com_dotnet/com_dotnet.c | 3 +++ + ext/curl/interface.c | 3 +++ + ext/interbase/interbase.c | 7 +++++-- + ext/mssql/php_mssql.c | 7 +++++++ + ext/pdo_odbc/pdo_odbc.c | 3 +++ + ext/readline/readline.c | 8 +++++++- + ext/standard/url_scanner_ex.c | 7 +++++-- + ext/standard/url_scanner_ex.re | 8 ++++++-- + ext/sybase_ct/php_sybase_ct.c | 4 ++++ + 10 files changed, 47 insertions(+), 7 deletions(-) + +Index: b/TSRM/tsrm_win32.c +=================================================================== +--- a/TSRM/tsrm_win32.c ++++ b/TSRM/tsrm_win32.c +@@ -532,6 +532,10 @@ TSRM_API FILE *popen_ex(const char *comm + } + + cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2); ++ if (!cmd) { ++ return NULL; ++ } ++ + sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command); + if (asuser) { + res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process); +Index: b/ext/curl/interface.c +=================================================================== +--- a/ext/curl/interface.c ++++ b/ext/curl/interface.c +@@ -803,6 +803,9 @@ PHP_MINIT_FUNCTION(curl) + int i, c = CRYPTO_num_locks(); + + php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T)); ++ if (!php_curl_openssl_tsl) { ++ return FAILURE; ++ } + + for (i = 0; i < c; ++i) { + php_curl_openssl_tsl[i] = tsrm_mutex_alloc(); +Index: b/ext/com_dotnet/com_dotnet.c +=================================================================== +--- a/ext/com_dotnet/com_dotnet.c ++++ b/ext/com_dotnet/com_dotnet.c +@@ -129,6 +129,9 @@ static HRESULT dotnet_init(char **p_wher + char *where = ""; + + stuff = malloc(sizeof(*stuff)); ++ if (!stuff) { ++ return S_FALSE; ++ } + memset(stuff, 0, sizeof(*stuff)); + + where = "CoCreateInstance"; +Index: b/ext/pdo_odbc/pdo_odbc.c +=================================================================== +--- a/ext/pdo_odbc/pdo_odbc.c ++++ b/ext/pdo_odbc/pdo_odbc.c +@@ -98,6 +98,9 @@ PHP_MINIT_FUNCTION(pdo_odbc) + char *instance = INI_STR("pdo_odbc.db2_instance_name"); + if (instance) { + char *env = malloc(sizeof("DB2INSTANCE=") + strlen(instance)); ++ if (!env) { ++ return FAILURE; ++ } + strcpy(env, "DB2INSTANCE="); + strcat(env, instance); + putenv(env); +Index: b/ext/interbase/interbase.c +=================================================================== +--- a/ext/interbase/interbase.c ++++ b/ext/interbase/interbase.c +@@ -998,9 +998,12 @@ static void _php_ibase_connect(INTERNAL_ + ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link); + } else { + zend_rsrc_list_entry new_le; +- ++ + ib_link = (ibase_db_link *) malloc(sizeof(ibase_db_link)); +- ++ if (!ib_link) { ++ RETURN_FALSE; ++ } ++ + /* hash it up */ + Z_TYPE(new_le) = le_plink; + new_le.ptr = ib_link; +Index: b/ext/readline/readline.c +=================================================================== +--- a/ext/readline/readline.c ++++ b/ext/readline/readline.c +@@ -465,6 +465,9 @@ static char **_readline_completion_cb(co + matches = rl_completion_matches(text,_readline_command_generator); + } else { + matches = malloc(sizeof(char *) * 2); ++ if (!matches) { ++ return NULL; ++ } + matches[0] = strdup(""); + matches[1] = '\0'; + } +@@ -505,7 +508,10 @@ PHP_FUNCTION(readline_completion_functio + zval_copy_ctor(_readline_completion); + + rl_attempted_completion_function = _readline_completion_cb; +- ++ if (rl_attempted_completion_function == NULL) { ++ efree(name); ++ RETURN_FALSE; ++ } + RETURN_TRUE; + } + +Index: b/ext/standard/url_scanner_ex.re +=================================================================== +--- a/ext/standard/url_scanner_ex.re ++++ b/ext/standard/url_scanner_ex.re +@@ -55,9 +55,13 @@ static PHP_INI_MH(OnUpdateTags) + + if (ctx->tags) + zend_hash_destroy(ctx->tags); +- else ++ else { + ctx->tags = malloc(sizeof(HashTable)); +- ++ if (!ctx->tags) { ++ return FAILURE; ++ } ++ } ++ + zend_hash_init(ctx->tags, 0, NULL, NULL, 1); + + for (key = php_strtok_r(tmp, ",", &lasts); +Index: b/ext/standard/url_scanner_ex.c +=================================================================== +--- a/ext/standard/url_scanner_ex.c ++++ b/ext/standard/url_scanner_ex.c +@@ -56,9 +56,12 @@ static PHP_INI_MH(OnUpdateTags) + + if (ctx->tags) + zend_hash_destroy(ctx->tags); +- else ++ else { + ctx->tags = malloc(sizeof(HashTable)); +- ++ if (!ctx->tags) { ++ return FAILURE; ++ } ++ } + zend_hash_init(ctx->tags, 0, NULL, NULL, 1); + + for (key = php_strtok_r(tmp, ",", &lasts); +Index: b/ext/sybase_ct/php_sybase_ct.c +=================================================================== +--- a/ext/sybase_ct/php_sybase_ct.c ++++ b/ext/sybase_ct/php_sybase_ct.c +@@ -777,6 +777,10 @@ static void php_sybase_do_connect(INTERN + } + + sybase_ptr = (sybase_link *) malloc(sizeof(sybase_link)); ++ if (!sybase_ptr) { ++ efree(hashed_details); ++ RETURN_FALSE; ++ } + if (!php_sybase_do_connect_internal(sybase_ptr, host, user, passwd, charset, appname TSRMLS_CC)) { + free(sybase_ptr); + efree(hashed_details); +Index: b/ext/mssql/php_mssql.c +=================================================================== +--- a/ext/mssql/php_mssql.c ++++ b/ext/mssql/php_mssql.c +@@ -717,6 +717,13 @@ static void php_mssql_do_connect(INTERNA + + /* hash it up */ + mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link)); ++ if (!mssql_ptr) { ++ efree(hashed_details); ++ dbfreelogin(mssql.login); ++ dbclose(mssql.link); ++ RETURN_FALSE; ++ } ++ + memcpy(mssql_ptr, &mssql, sizeof(mssql_link)); + Z_TYPE(new_le) = le_plink; + new_le.ptr = mssql_ptr; --- php5-5.3.6.orig/debian/patches/page_size_fixes.patch +++ php5-5.3.6/debian/patches/page_size_fixes.patch @@ -0,0 +1,104 @@ +Description: Don't assume value of PAGE_SIZE if sys/mman.h does not + define it. Instead, use sysconf() at runtime if available. +Origin: vendor +Bug: http://bugs.php.net/bug.php?id=50982 +Last-Update: 2010-02-17 + +--- a/Zend/zend_stream.c ++++ b/Zend/zend_stream.c +@@ -27,10 +27,15 @@ + + #include + #include +-#if HAVE_SYS_MMAN_H +-# include +-# ifndef PAGE_SIZE +-# define PAGE_SIZE 4096 ++#if HAVE_UNISTD_H ++# include ++#endif ++#if !HAVE_UNISTD_H || (!defined(_SC_PAGESIZE) && !defined(_SC_PAGE_SIZE)) ++# if HAVE_SYS_MMAN_H ++# include ++# ifndef PAGE_SIZE ++# define PAGE_SIZE 4096 ++# endif + # endif + #endif + +@@ -215,9 +220,21 @@ ZEND_API int zend_stream_fixup(zend_file + + if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) { + #if HAVE_MMAP ++ long page_size = 0; ++ ++# if HAVE_UNISTD_H ++# ifdef _SC_PAGESIZE ++ page_size = sysconf(_SC_PAGESIZE); ++# else ++ page_size = sysconf(_SC_PAGE_SIZE); ++# endif ++# else ++ page_size = PAGE_SIZE; ++# endif ++ + if (file_handle->handle.fp && + size != 0 && +- ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) { ++ ((size - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD) { + /* *buf[size] is zeroed automatically by the kernel */ + *buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0); + if (*buf != MAP_FAILED) { +--- a/main/main.c ++++ b/main/main.c +@@ -91,15 +91,17 @@ + #include "SAPI.h" + #include "rfc1867.h" + +-#if HAVE_SYS_MMAN_H +-# include +-# ifndef PAGE_SIZE ++#if !HAVE_UNISTD_H || (!defined(_SC_PAGESIZE) && !defined(_SC_PAGE_SIZE)) ++# if HAVE_SYS_MMAN_H ++# include ++# ifndef PAGE_SIZE ++# define PAGE_SIZE 4096 ++# endif ++# endif ++# ifdef PHP_WIN32 + # define PAGE_SIZE 4096 + # endif + #endif +-#ifdef PHP_WIN32 +-# define PAGE_SIZE 4096 +-#endif + /* }}} */ + + PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions; +@@ -1194,6 +1196,17 @@ PHPAPI int php_stream_open_for_zend_ex(c + char *p; + size_t len, mapped_len; + php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path); ++ long page_size = 0; ++ ++#if HAVE_UNISTD_H ++# ifdef _SC_PAGESIZE ++ page_size = sysconf(_SC_PAGESIZE); ++# else ++ page_size = sysconf(_SC_PAGE_SIZE); ++# endif ++#else ++ page_size = PAGE_SIZE; ++#endif + + if (stream) { + handle->filename = (char*)filename; +@@ -1206,7 +1219,7 @@ PHPAPI int php_stream_open_for_zend_ex(c + memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap)); + len = php_zend_stream_fsizer(stream TSRMLS_CC); + if (len != 0 +- && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD ++ && ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD + && php_stream_mmap_possible(stream) + && (p = php_stream_mmap_range(stream, 0, len, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) { + handle->handle.stream.closer = php_zend_stream_mmap_closer; --- php5-5.3.6.orig/debian/patches/libtool2.2.patch +++ php5-5.3.6/debian/patches/libtool2.2.patch @@ -0,0 +1,31 @@ +--- a/scripts/phpize.in ++++ b/scripts/phpize.in +@@ -5,10 +5,16 @@ prefix='@prefix@' + exec_prefix="`eval echo @exec_prefix@`" + phpdir="$prefix/lib/php5/build" + includedir="$prefix/include/php5" ++aclocaldir="$prefix/share/aclocal" + builddir="`pwd`" + SED="@SED@" + +-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" ++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool" ++if [ -f "$aclocaldir/ltsugar.m4" ]; then ++ LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4" ++else ++ LIBTOOL_FILES="libtool.m4" ++fi + FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" + CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ + mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ +@@ -144,8 +150,9 @@ phpize_copy_files() + test -d build || mkdir build + + (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) ++ (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build) + (cd "$phpdir" && cp $FILES "$builddir") +- (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) ++ (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4) + } + + phpize_replace_prefix() --- php5-5.3.6.orig/debian/patches/036-fd_setsize_fix.patch +++ php5-5.3.6/debian/patches/036-fd_setsize_fix.patch @@ -0,0 +1,26 @@ +Description: Fixes misuse of FD_SET() +Origin: vendor +Forwarded: no +Last-Update: 2010-01-18 + +--- a/ext/sockets/sockets.c ++++ b/ext/sockets/sockets.c +@@ -720,6 +720,7 @@ static int php_sock_array_to_fd_set(zval + + php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket); + if (!php_sock) continue; /* If element is not a resource, skip it */ ++ if (php_sock->bsd_socket > FD_SETSIZE) continue; /* must ignore it */ + + PHP_SAFE_FD_SET(php_sock->bsd_socket, fds); + if (php_sock->bsd_socket > *max_fd) { +--- a/ext/standard/streamsfuncs.c ++++ b/ext/standard/streamsfuncs.c +@@ -635,6 +635,8 @@ static int stream_array_to_fd_set(zval * + * is not displayed. + * */ + if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) { ++ if (this_fd > FD_SETSIZE) ++ continue; + + PHP_SAFE_FD_SET(this_fd, fds); + --- php5-5.3.6.orig/debian/patches/use_embedded_timezonedb.patch +++ php5-5.3.6/debian/patches/use_embedded_timezonedb.patch @@ -0,0 +1,655 @@ + +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +r7: per Sean Finney's review: simpler lat/long rounding, + use stat() not access() to check existence of timezone, + improve comments throughout. +r6: fix fd leak in r5, fix country code/BC flag use in + timezone_identifiers_list() using system db, + fix use of PECL timezonedb to override system db, +r5: reverts addition of "System/Localtime" fake tzname. + updated for 5.3.0, parses zone.tab to pick up mapping between + timezone name, country code and long/lat coords +r4: added "System/Localtime" tzname which uses /etc/localtime +r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) +r2: add filesystem trawl to set up name alias index +r1: initial revision + +--- a/ext/date/lib/parse_tz.c ++++ b/ext/date/lib/parse_tz.c +@@ -24,6 +24,16 @@ + + #include "timelib.h" + ++#ifdef HAVE_SYSTEM_TZDATA ++#include ++#include ++#include ++#include ++#include ++ ++#include "php_scandir.h" ++#endif ++ + #include + + #ifdef HAVE_LOCALE_H +@@ -35,7 +45,12 @@ + #else + #include + #endif ++ ++#ifndef HAVE_SYSTEM_TZDATA + #include "timezonedb.h" ++#endif ++ ++#include + + #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) + # if defined(__LITTLE_ENDIAN__) +@@ -55,6 +70,11 @@ + + static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) + { ++ if (memcmp(tzf, "TZif", 4) == 0) { ++ *tzf += 20; ++ return; ++ } ++ + /* skip ID */ + *tzf += 4; + +@@ -257,7 +277,435 @@ void timelib_dump_tzinfo(timelib_tzinfo + } + } + +-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++#ifdef HAVE_SYSTEM_TZDATA ++ ++#ifdef HAVE_SYSTEM_TZDATA_PREFIX ++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX ++#else ++#define ZONEINFO_PREFIX "/usr/share/zoneinfo" ++#endif ++ ++/* Hash table entry for the cache of the zone.tab mapping table. */ ++struct location_info { ++ char code[2]; /* Country code. */ ++ double latitude, longitude; ++ char name[64]; ++ char *comment; ++ struct location_info *next; ++}; ++ ++/* System timezone database pointer. */ ++static const timelib_tzdb *timezonedb_system = NULL; ++ ++/* Cache of zone.tab location data. */ ++static struct location_info **system_location_table; ++ ++/* Size of the zone.tab hash table; a random-ish prime big enough to ++ * prevent too many collisions. */ ++#define LOCINFO_HASH_SIZE (1021) ++ ++/* Hash function for indexing the location_info hash table. */ ++static uint32_t tz_hash(const char *str) ++{ ++ const unsigned char *p = (const unsigned char *)str; ++ uint32_t hash = 5381; ++ int c; ++ ++ while ((c = *p++) != '\0') { ++ hash = (hash << 5) ^ hash ^ c; ++ } ++ ++ return hash % LOCINFO_HASH_SIZE; ++} ++ ++/* Parse an ISO-6709 co-ordinate as used in zone.tab. Returns end of ++ * the parsed string on success, or NULL on parse error. On success, ++ * writes the parsed number to *result. */ ++static char *parse_iso6709(char *p, double *result) ++{ ++ double v, sign; ++ char *pend; ++ size_t len; ++ ++ if (*p == '+') ++ sign = 1.0; ++ else if (*p == '-') ++ sign = -1.0; ++ else ++ return NULL; ++ ++ p++; ++ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) ++ ;; ++ ++ /* Annoying encoding used by zone.tab has no decimal point, so use ++ * the length to determine the format: ++ * ++ * 4 = DDMM ++ * 5 = DDDMM ++ * 6 = DDMMSS ++ * 7 = DDDMMSS ++ */ ++ len = pend - p; ++ if (len < 4 || len > 7) { ++ return NULL; ++ } ++ ++ /* p => [D]DD */ ++ v = (p[0] - '0') * 10.0 + (p[1] - '0'); ++ p += 2; ++ if (len == 5 || len == 7) ++ v = v * 10.0 + (*p++ - '0'); ++ /* p => MM[SS] */ ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 60.0; ++ p += 2; ++ /* p => [SS] */ ++ if (len > 5) { ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 3600.0; ++ p += 2; ++ } ++ ++ /* Round to five decimal place, not because it's a good idea, ++ * but, because the builtin data uses rounded data, so, match ++ * that. */ ++ *result = sign * (int)(v * 100000.0 + 0.5) / 100000.0; ++ ++ return p; ++} ++ ++/* This function parses the zone.tab file to build up the mapping of ++ * timezone to country code and geographic location, and returns a ++ * hash table. The hash table is indexed by the function: ++ * ++ * tz_hash(timezone-name) ++ */ ++static struct location_info **create_location_table(void) ++{ ++ struct location_info **li, *i; ++ char zone_tab[PATH_MAX]; ++ char line[512]; ++ FILE *fp; ++ ++ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); ++ ++ fp = fopen(zone_tab, "r"); ++ if (!fp) { ++ return NULL; ++ } ++ ++ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); ++ ++ while (fgets(line, sizeof line, fp)) { ++ char *p = line, *code, *name, *comment; ++ uint32_t hash; ++ double latitude, longitude; ++ ++ while (isspace(*p)) ++ p++; ++ ++ if (*p == '#' || *p == '\0' || *p == '\n') ++ continue; ++ ++ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') ++ continue; ++ ++ /* code => AA */ ++ code = p; ++ p[2] = 0; ++ p += 3; ++ ++ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ ++ p = parse_iso6709(p, &latitude); ++ if (!p) { ++ continue; ++ } ++ p = parse_iso6709(p, &longitude); ++ if (!p) { ++ continue; ++ } ++ ++ if (!p || *p != '\t') { ++ continue; ++ } ++ ++ /* name = string */ ++ name = ++p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ *p++ = '\0'; ++ ++ /* comment = string */ ++ comment = p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ if (*p == '\n' || *p == '\t') ++ *p = '\0'; ++ ++ hash = tz_hash(name); ++ i = malloc(sizeof *i); ++ memcpy(i->code, code, 2); ++ strncpy(i->name, name, sizeof i->name); ++ i->comment = strdup(comment); ++ i->longitude = longitude; ++ i->latitude = latitude; ++ i->next = li[hash]; ++ li[hash] = i; ++ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ ++ } ++ ++ fclose(fp); ++ ++ return li; ++} ++ ++/* Return location info from hash table, using given timezone name. ++ * Returns NULL if the name could not be found. */ ++const struct location_info *find_zone_info(struct location_info **li, ++ const char *name) ++{ ++ uint32_t hash = tz_hash(name); ++ const struct location_info *l; ++ ++ if (!li) { ++ return NULL; ++ } ++ ++ for (l = li[hash]; l; l = l->next) { ++ if (strcasecmp(l->name, name) == 0) ++ return l; ++ } ++ ++ return NULL; ++} ++ ++/* Filter out some non-tzdata files and the posix/right databases, if ++ * present. */ ++static int index_filter(const struct dirent *ent) ++{ ++ return strcmp(ent->d_name, ".") != 0 ++ && strcmp(ent->d_name, "..") != 0 ++ && strcmp(ent->d_name, "posix") != 0 ++ && strcmp(ent->d_name, "posixrules") != 0 ++ && strcmp(ent->d_name, "right") != 0 ++ && strstr(ent->d_name, ".tab") == NULL; ++} ++ ++/* Comparison callback for qsort(), used to alpha-sort the index ++ * array by timezone name. */ ++static int sysdbcmp(const void *first, const void *second) ++{ ++ const timelib_tzdb_index_entry *alpha = first, *beta = second; ++ ++ return strcmp(alpha->id, beta->id); ++} ++ ++ ++/* Create the zone identifier index by trawling the filesystem. */ ++static void create_zone_index(timelib_tzdb *db) ++{ ++ size_t dirstack_size, dirstack_top; ++ size_t index_size, index_next; ++ timelib_tzdb_index_entry *db_index; ++ char **dirstack; ++ ++ /* LIFO stack to hold directory entries to scan; each slot is a ++ * directory name relative to the zoneinfo prefix. */ ++ dirstack_size = 32; ++ dirstack = malloc(dirstack_size * sizeof *dirstack); ++ dirstack_top = 1; ++ dirstack[0] = strdup(""); ++ ++ /* Index array. */ ++ index_size = 64; ++ db_index = malloc(index_size * sizeof *db_index); ++ index_next = 0; ++ ++ do { ++ struct dirent **ents; ++ char name[PATH_MAX], *top; ++ int count; ++ ++ /* Pop the top stack entry, and iterate through its contents. */ ++ top = dirstack[--dirstack_top]; ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); ++ ++ count = php_scandir(name, &ents, index_filter, php_alphasort); ++ ++ while (count > 0) { ++ struct stat st; ++ const char *leaf = ents[count - 1]->d_name; ++ ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", ++ top, leaf); ++ ++ if (strlen(name) && stat(name, &st) == 0) { ++ /* Name, relative to the zoneinfo prefix. */ ++ const char *root = top; ++ ++ if (root[0] == '/') root++; ++ ++ snprintf(name, sizeof name, "%s%s%s", root, ++ *root ? "/": "", leaf); ++ ++ if (S_ISDIR(st.st_mode)) { ++ if (dirstack_top == dirstack_size) { ++ dirstack_size *= 2; ++ dirstack = realloc(dirstack, ++ dirstack_size * sizeof *dirstack); ++ } ++ dirstack[dirstack_top++] = strdup(name); ++ } ++ else { ++ if (index_next == index_size) { ++ index_size *= 2; ++ db_index = realloc(db_index, ++ index_size * sizeof *db_index); ++ } ++ ++ db_index[index_next++].id = strdup(name); ++ } ++ } ++ ++ free(ents[--count]); ++ } ++ ++ if (count != -1) free(ents); ++ free(top); ++ } while (dirstack_top); ++ ++ /* Alpha-sort the index array; shouldn't be technically necessary ++ * but some of the test cases rely on this, and, it matches the ++ * builtin database. */ ++ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); ++ ++ db->index = db_index; ++ db->index_size = index_next; ++ ++ free(dirstack); ++} ++ ++#define FAKE_HEADER "1234\0??\1??" ++#define FAKE_BC_POS (0) ++#define FAKE_UTC_POS (7 - 4) ++ ++/* Create a fake data segment for database 'sysdb'. This mocks ++ * up a fake ->data segment for the given timezone database. ++ * php_date.c::timezone_identifiers_list() looks at data[pos + 4] ++ * through data[pos + 6] to compare the country code and BC flag, ++ * which are stored in the builtin data array like: ++ * ++ * (pos + 4) => BC flag ++ * (pos + 5, pos + 6) => Two chars of country code ++ * ++ * where pos is the index corresponding to the timezone name. ++ * ++ * Timezone names are classified here into three types: ++ * 1) UTC, which is special ++ * 2) "normal" zone names ++ * 3) "backwards-compat" zone names ++ * ++ * (boolean logic of the BC flag seems to be inverted, but hey) ++ * ++ * UTC is special since it has BC=\1, code = "??" ++ * "normal" zones exist in zone.tab and have the given c-code and BC=\1 ++ * "backwards-compat" zones don't exist in zone.tab and have BC=\0 ++ * ++ * Since UTC and the BC zones are constant, they are encoded in the ++ * FAKE_HEADER prefix, and pos pointers index into that. ++ * ++ * FAKE_HEADER is hence four random bytes, then the BC zone segment ++ * (three bytes), then the UTC zone segment (another three). ++ * ++ * For all "normal" zones, three bytes are appended to the data array; ++ * the BC flag, always 1, and the two bytes of country code. ++ */ ++static void fake_data_segment(timelib_tzdb *sysdb, ++ struct location_info **info) ++{ ++ size_t n; ++ char *data, *p; ++ ++ /* Worst case maximum is 3 bytes per zone, plus the header. */ ++ data = malloc((3 * sysdb->index_size) + sizeof(FAKE_HEADER) - 1); ++ ++ /* Append the fake header, p then = next byte */ ++ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); ++ ++ for (n = 0; n < sysdb->index_size; n++) { ++ const struct location_info *li; ++ timelib_tzdb_index_entry *ent; ++ ++ /* Lost const'ness since we're modifying the pos pointer. */ ++ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; ++ ++ /* Lookup the timezone name in the hash table. */ ++ if (strcmp(ent->id, "UTC") == 0) { ++ ent->pos = FAKE_UTC_POS; ++ continue; ++ } ++ ++ li = find_zone_info(info, ent->id); ++ if (li) { ++ /* If found, append the BC byte and the country code; set ++ * the position index for the timezone to point to ++ * this. */ ++ ent->pos = (p - data) - 4; ++ *p++ = '\x01'; ++ *p++ = li->code[0]; ++ *p++ = li->code[1]; ++ } ++ else { ++ /* If not found, the timezone data can ++ * point at the header. */ ++ ent->pos = 0; ++ } ++ } ++ ++ /* Store the fake data array */ ++ sysdb->data = (unsigned char *)data; ++} ++ ++/* Evaluates to true if given timezone name is valid. */ ++#define is_valid_tz_name(tz_) (tz_[0] && strstr(tz_, "..") == NULL) ++ ++/* Return the mmap()ed tzfile if found, else NULL. On success, the ++ * length of the mapped data is placed in *length. */ ++static char *map_tzfile(const char *timezone, size_t *length) ++{ ++ char fname[PATH_MAX]; ++ struct stat st; ++ char *p; ++ int fd; ++ ++ if (!is_valid_tz_name(timezone)) { ++ return NULL; ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); ++ ++ fd = open(fname, O_RDONLY); ++ if (fd == -1) { ++ return NULL; ++ } else if (fstat(fd, &st) != 0 || st.st_size < 21) { ++ close(fd); ++ return NULL; ++ } ++ ++ *length = st.st_size; ++ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); ++ close(fd); ++ ++ return p != MAP_FAILED ? p : NULL; ++} ++#endif ++ ++/* seek_to_tz_position() for a builtin/external database. */ ++static int inmem_seek_to_tz_position(const unsigned char **tzf, ++ char *timezone, const timelib_tzdb *tzdb) + { + int left = 0, right = tzdb->index_size - 1; + #ifdef HAVE_SETLOCALE +@@ -296,36 +744,131 @@ static int seek_to_tz_position(const uns + return 0; + } + ++/* Modified seek_to_tz_position wrapper which handles the system ++ * database and the builtin/external databases in the same way. ++ * Returns zero on failure on non-zero on success. On success, (*map, ++ * *maplen) is an mmap'ed region if *map is non-NULL, and must be ++ * munmaped after use. */ ++static int seek_to_tz_position(const unsigned char **tzf, char *timezone, ++ char **map, size_t *maplen, ++ const timelib_tzdb *tzdb) ++{ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char *orig; ++ ++ orig = map_tzfile(timezone, maplen); ++ if (orig == NULL) { ++ return 0; ++ } ++ ++ (*tzf) = (unsigned char *)orig ; ++ *map = orig; ++ ++ return 1; ++ } ++ else ++#endif ++ { ++ return inmem_seek_to_tz_position(tzf, timezone, tzdb); ++ } ++} ++ + const timelib_tzdb *timelib_builtin_db(void) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ if (timezonedb_system == NULL) { ++ timelib_tzdb *tmp = malloc(sizeof *tmp); ++ ++ tmp->version = "0.system"; ++ tmp->data = NULL; ++ create_zone_index(tmp); ++ system_location_table = create_location_table(); ++ fake_data_segment(tmp, system_location_table); ++ timezonedb_system = tmp; ++ } ++ ++ return timezonedb_system; ++#else + return &timezonedb_builtin; ++#endif + } + + const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ *count = timezonedb_system->index_size; ++ return timezonedb_system->index; ++#else + *count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); + return timezonedb_idx_builtin; ++#endif + } + + int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; +- return (seek_to_tz_position(&tzf, timezone, tzdb)); ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char fname[PATH_MAX]; ++ struct stat st; ++ ++ if (!is_valid_tz_name(timezone)) { ++ return 0; ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); ++ ++ return stat(fname, &st) == 0 && S_ISREG(st.st_mode); ++ } ++#endif ++ ++ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); + } + + timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; ++ char *memmap = NULL; ++ size_t maplen; + timelib_tzinfo *tmp; + +- if (seek_to_tz_position(&tzf, timezone, tzdb)) { ++ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { + tmp = timelib_tzinfo_ctor(timezone); + + read_preamble(&tzf, tmp); + read_header(&tzf, tmp); + read_transistions(&tzf, tmp); + read_types(&tzf, tmp); +- read_location(&tzf, tmp); ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (memmap) { ++ const struct location_info *li; ++ ++ /* TZif-style - grok the location info from the system database, ++ * if possible. */ ++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { ++ tmp->location.comments = strdup(li->comment); ++ strncpy(tmp->location.country_code, li->code, 2); ++ tmp->location.longitude = li->longitude; ++ tmp->location.latitude = li->latitude; ++ tmp->bc = 1; ++ } ++ else { ++ strcpy(tmp->location.country_code, "??"); ++ tmp->bc = 0; ++ tmp->location.comments = strdup(""); ++ } ++ ++ /* Now done with the mmap segment - discard it. */ ++ munmap(memmap, maplen); ++#endif ++ } ++ else { ++ /* PHP-style - use the embedded info. */ ++ read_location(&tzf, tmp); ++ } + } else { + tmp = NULL; + } +--- a/ext/date/lib/timelib.m4 ++++ b/ext/date/lib/timelib.m4 +@@ -78,3 +78,17 @@ stdlib.h + + dnl Check for strtoll, atoll + AC_CHECK_FUNCS(strtoll atoll strftime) ++ ++PHP_ARG_WITH(system-tzdata, for use of system timezone data, ++[ --with-system-tzdata[=DIR] to specify use of system timezone data], ++no, no) ++ ++if test "$PHP_SYSTEM_TZDATA" != "no"; then ++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) ++ ++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then ++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", ++ [Define for location of system timezone data]) ++ fi ++fi ++ --- php5-5.3.6.orig/debian/patches/lang-test-use-utf8.patch +++ php5-5.3.6/debian/patches/lang-test-use-utf8.patch @@ -0,0 +1,39 @@ +--- a/tests/lang/bug30638.phpt ++++ b/tests/lang/bug30638.phpt +@@ -2,7 +2,7 @@ + Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X) + --SKIPIF-- + + --FILE-- + --- php5-5.3.6.orig/debian/patches/session_save_path.patch +++ php5-5.3.6/debian/patches/session_save_path.patch @@ -0,0 +1,18 @@ +Description: Set the default session.save_path dir to /var/lib/php5. + This is the directory that has been used in Debian to store the + session files and is partially protected by dir permissions. +Origin: vendor +Forwarded: not-needed +Last-Update: 2010-05-01 + +--- a/ext/session/session.c ++++ b/ext/session/session.c +@@ -788,7 +788,7 @@ static PHP_INI_MH(OnUpdateHashFunc) /* { + PHP_INI_BEGIN() + STD_PHP_INI_BOOLEAN("session.bug_compat_42", "1", PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals, ps_globals) + STD_PHP_INI_BOOLEAN("session.bug_compat_warn", "1", PHP_INI_ALL, OnUpdateBool, bug_compat_warn, php_ps_globals, ps_globals) +- STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals, ps_globals) ++ STD_PHP_INI_ENTRY("session.save_path", "/var/lib/php5", PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals, ps_globals) + STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals, ps_globals) + PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL, OnUpdateSaveHandler) + STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_ALL, OnUpdateBool, auto_start, php_ps_globals, ps_globals) --- php5-5.3.6.orig/debian/patches/php5-CVE-2012-0057.patch +++ php5-5.3.6/debian/patches/php5-CVE-2012-0057.patch @@ -0,0 +1,282 @@ +Origin: http://svn.php.net/viewvc/?view=revision&revision=317759 + and http://svn.php.net/viewvc/?view=revision&revision=317801 + and http://svn.php.net/viewvc/?view=revision&revision=317953 +Subject: Added xsl.security_prefs ini option to define forbidden + operations within XSLT stylesheets + +Added xsl.security_prefs ini option to define forbidden +operations within XSLT stylesheets, default is not to enable +write operations. This option won't be in 5.4, since there's a new +method. Bug #54446 + +Added the xsl.security_prefs option to 5_4 and trunk and +mark it as deprecated for BC-reasons +Added tests for ini option and combination of both + +CVE-2012-0057 + +--- + ext/xsl/php_xsl.c | 17 ++++++ + ext/xsl/php_xsl.h | 10 +++ + ext/xsl/tests/bug54446_with_ini.phpt | 95 +++++++++++++++++++++++++++++++++++ + ext/xsl/xsltprocessor.c | 52 ++++++++++++++++++- + 4 files changed, 172 insertions(+), 2 deletions(-) + +Index: b/ext/xsl/php_xsl.h +=================================================================== +--- a/ext/xsl/php_xsl.h ++++ b/ext/xsl/php_xsl.h +@@ -32,6 +32,7 @@ extern zend_module_entry xsl_module_entr + #include + #include + #include ++#include + #if HAVE_XSL_EXSLT + #include + #include +@@ -43,6 +44,15 @@ extern zend_module_entry xsl_module_entr + #include + #include + ++#define XSL_SECPREF_NONE 0 ++#define XSL_SECPREF_READ_FILE 2 ++#define XSL_SECPREF_WRITE_FILE 4 ++#define XSL_SECPREF_CREATE_DIRECTORY 8 ++#define XSL_SECPREF_READ_NETWORK 16 ++#define XSL_SECPREF_WRITE_NETWORK 32 ++/* Default == disable all write access == XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_FILE */ ++#define XSL_SECPREF_DEFAULT 44 ++ + typedef struct _xsl_object { + zend_object std; + void *ptr; +Index: b/ext/xsl/xsltprocessor.c +=================================================================== +--- a/ext/xsl/xsltprocessor.c ++++ b/ext/xsl/xsltprocessor.c +@@ -465,7 +465,7 @@ PHP_FUNCTION(xsl_xsltprocessor_import_st + + static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */ + { +- xmlDocPtr newdocp; ++ xmlDocPtr newdocp = NULL; + xmlDocPtr doc = NULL; + xmlNodePtr node = NULL; + xsltTransformContextPtr ctxt; +@@ -475,6 +475,9 @@ static xmlDocPtr php_xsl_apply_styleshee + zval *doXInclude, *member; + zend_object_handlers *std_hnd; + FILE *f; ++ int secPrefsError = 0; ++ int secPrefsValue; ++ xsltSecurityPrefsPtr secPrefs = NULL; + + node = php_libxml_import_node(docp TSRMLS_CC); + +@@ -531,11 +534,56 @@ static xmlDocPtr php_xsl_apply_styleshee + } + efree(member); + +- newdocp = xsltApplyStylesheetUser(style, doc, (const char**) params, NULL, f, ctxt); ++ ++ secPrefsValue = INI_INT("xsl.security_prefs"); ++ ++ /* if securityPrefs is set to NONE, we don't have to do any checks, but otherwise... */ ++ if (secPrefsValue != XSL_SECPREF_NONE) { ++ secPrefs = xsltNewSecurityPrefs(); ++ if (secPrefsValue & XSL_SECPREF_READ_FILE ) { ++ if (0 != xsltSetSecurityPrefs(secPrefs, XSLT_SECPREF_READ_FILE, xsltSecurityForbid)) { ++ secPrefsError = 1; ++ } ++ } ++ if (secPrefsValue & XSL_SECPREF_WRITE_FILE ) { ++ if (0 != xsltSetSecurityPrefs(secPrefs, XSLT_SECPREF_WRITE_FILE, xsltSecurityForbid)) { ++ secPrefsError = 1; ++ } ++ } ++ if (secPrefsValue & XSL_SECPREF_CREATE_DIRECTORY ) { ++ if (0 != xsltSetSecurityPrefs(secPrefs, XSLT_SECPREF_CREATE_DIRECTORY, xsltSecurityForbid)) { ++ secPrefsError = 1; ++ } ++ } ++ if (secPrefsValue & XSL_SECPREF_READ_NETWORK) { ++ if (0 != xsltSetSecurityPrefs(secPrefs, XSLT_SECPREF_READ_NETWORK, xsltSecurityForbid)) { ++ secPrefsError = 1; ++ } ++ } ++ if (secPrefsValue & XSL_SECPREF_WRITE_NETWORK) { ++ if (0 != xsltSetSecurityPrefs(secPrefs, XSLT_SECPREF_WRITE_NETWORK, xsltSecurityForbid)) { ++ secPrefsError = 1; ++ } ++ } ++ ++ if (0 != xsltSetCtxtSecurityPrefs(secPrefs, ctxt)) { ++ secPrefsError = 1; ++ } ++ } ++ ++ if (secPrefsError == 1) { ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't set libxslt security properties, not doing transformation for security reasons"); ++ } else { ++ newdocp = xsltApplyStylesheetUser(style, doc, (const char**) params, NULL, f, ctxt); ++ } + if (f) { + fclose(f); + } ++ + xsltFreeTransformContext(ctxt); ++ if (secPrefs) { ++ xsltFreeSecurityPrefs(secPrefs); ++ } + + if (intern->node_list != NULL) { + zend_hash_destroy(intern->node_list); +Index: b/ext/xsl/php_xsl.c +=================================================================== +--- a/ext/xsl/php_xsl.c ++++ b/ext/xsl/php_xsl.c +@@ -141,6 +141,11 @@ zend_object_value xsl_objects_new(zend_c + } + /* }}} */ + ++PHP_INI_BEGIN() ++//XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE == 44 ++PHP_INI_ENTRY("xsl.security_prefs", "44", PHP_INI_ALL, NULL) ++PHP_INI_END() ++ + /* {{{ PHP_MINIT_FUNCTION + */ + PHP_MINIT_FUNCTION(xsl) +@@ -167,6 +172,14 @@ PHP_MINIT_FUNCTION(xsl) + REGISTER_LONG_CONSTANT("XSL_CLONE_NEVER", -1, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XSL_CLONE_ALWAYS", 1, CONST_CS | CONST_PERSISTENT); + ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_NONE", XSL_SECPREF_NONE, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_READ_FILE", XSL_SECPREF_READ_FILE, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_WRITE_FILE", XSL_SECPREF_WRITE_FILE, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_CREATE_DIRECTORY", XSL_SECPREF_CREATE_DIRECTORY, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_READ_NETWORK", XSL_SECPREF_READ_NETWORK, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_WRITE_NETWORK", XSL_SECPREF_WRITE_NETWORK, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("XSL_SECPREF_DEFAULT", XSL_SECPREF_DEFAULT, CONST_CS | CONST_PERSISTENT); ++ + REGISTER_LONG_CONSTANT("LIBXSLT_VERSION", LIBXSLT_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("LIBXSLT_DOTTED_VERSION", LIBXSLT_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); + +@@ -175,6 +188,8 @@ PHP_MINIT_FUNCTION(xsl) + REGISTER_STRING_CONSTANT("LIBEXSLT_DOTTED_VERSION", LIBEXSLT_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); + #endif + ++ REGISTER_INI_ENTRIES(); ++ + return SUCCESS; + } + /* }}} */ +@@ -258,6 +273,8 @@ PHP_MSHUTDOWN_FUNCTION(xsl) + + xsltCleanupGlobals(); + ++ UNREGISTER_INI_ENTRIES(); ++ + return SUCCESS; + } + /* }}} */ +Index: b/ext/xsl/tests/bug54446_with_ini.phpt +=================================================================== +--- /dev/null ++++ b/ext/xsl/tests/bug54446_with_ini.phpt +@@ -0,0 +1,95 @@ ++--TEST-- ++Bug #54446 (Arbitrary file creation via libxslt 'output' extension with php.ini setting) ++--SKIPIF-- ++ ++--FILE-- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++EOT; ++ ++$xsl->loadXML( $sXsl ); ++ ++# START XSLT ++$proc->importStylesheet( $xsl ); ++ ++# TRASNFORM & PRINT ++print $proc->transformToXML( $dom ); ++ ++ ++if (file_exists($outputfile)) { ++ print "$outputfile exists, but shouldn't!\n"; ++} else { ++ print "OK, no file created\n"; ++} ++ ++#SET NO SECURITY PREFS ++ini_set("xsl.security_prefs", XSL_SECPREF_NONE); ++ ++# TRASNFORM & PRINT ++print $proc->transformToXML( $dom ); ++ ++ ++if (file_exists($outputfile)) { ++ print "OK, file exists\n"; ++} else { ++ print "$outputfile doesn't exist, but should!\n"; ++} ++ ++unlink($outputfile); ++ ++#SET SECURITY PREFS AGAIN ++ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); ++ ++# TRASNFORM & PRINT ++print $proc->transformToXML( $dom ); ++ ++if (file_exists($outputfile)) { ++ print "$outputfile exists, but shouldn't!\n"; ++} else { ++ print "OK, no file created\n"; ++} ++ ++ ++--EXPECTF-- ++Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d ++ ++Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test.txt refused in %s on line %s ++ ++Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element output in %s on line %d ++ ++Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d ++OK, no file created ++OK, file exists ++ ++Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d ++ ++Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test.txt refused in %s on line %s ++ ++Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element output in %s on line %d ++ ++Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d ++OK, no file created ++--CREDITS-- ++Christian Stocker, chregu@php.net ++ --- php5-5.3.6.orig/debian/patches/108-64_bit_datetime.patch +++ php5-5.3.6/debian/patches/108-64_bit_datetime.patch @@ -0,0 +1,12 @@ +--- a/ext/standard/datetime.c ++++ b/ext/standard/datetime.c +@@ -20,6 +20,9 @@ + + /* $Id: datetime.c 306939 2011-01-01 02:19:59Z felipe $ */ + ++#define _XOPEN_SOURCE /* needed to get strptime() declared */ ++#define _BSD_SOURCE /* needed to get ulong declared */ ++ + #include "php.h" + #include "zend_operators.h" + #include "datetime.h" --- php5-5.3.6.orig/debian/patches/suhosin.patch +++ php5-5.3.6/debian/patches/suhosin.patch @@ -0,0 +1,5702 @@ +suhosin hardening patch + +this patch was downloaded from: + + http://download.suhosin.org/suhosin-patch-5.3.4-0.9.10.patch.gz + +the following modifications have been made: + + * removed changes to ./configure & ./main/php_config.h.in since those + files are autogenerated + * "quilt refresh" has been run to clean up the offsets, etc +--- a/Zend/Makefile.am ++++ b/Zend/Makefile.am +@@ -17,7 +17,7 @@ libZend_la_SOURCES=\ + zend_objects_API.c zend_ts_hash.c zend_stream.c \ + zend_default_classes.c \ + zend_iterators.c zend_interfaces.c zend_exceptions.c \ +- zend_strtod.c zend_closures.c zend_float.c ++ zend_strtod.c zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c + + libZend_la_LDFLAGS = + libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ +--- a/Zend/Zend.dsp ++++ b/Zend/Zend.dsp +@@ -247,6 +247,14 @@ SOURCE=.\zend_strtod.c + # End Source File + # Begin Source File + ++SOURCE=.\zend_canary.c ++# End Source File ++# Begin Source File ++ ++SOURCE=.\zend_alloc_canary.c ++# End Source File ++# Begin Source File ++ + SOURCE=.\zend_ts_hash.c + # End Source File + # Begin Source File +--- a/Zend/ZendTS.dsp ++++ b/Zend/ZendTS.dsp +@@ -277,6 +277,14 @@ SOURCE=.\zend_strtod.c + # End Source File + # Begin Source File + ++SOURCE=.\zend_canary.c ++# End Source File ++# Begin Source File ++ ++SOURCE=.\zend_alloc_canary.c ++# End Source File ++# Begin Source File ++ + SOURCE=.\zend_ts_hash.c + # End Source File + # Begin Source File +--- a/Zend/zend.c ++++ b/Zend/zend.c +@@ -60,6 +60,10 @@ int (*zend_vspprintf)(char **pbuf, size_ + ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); + ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC); + ++#if SUHOSIN_PATCH ++ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...); ++#endif ++ + void (*zend_on_timeout)(int seconds TSRMLS_DC); + + static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC); +@@ -88,6 +92,74 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* + } + /* }}} */ + ++#if SUHOSIN_PATCH ++static ZEND_INI_MH(OnUpdateSuhosin_log_syslog) ++{ ++ if (!new_value) { ++ SPG(log_syslog) = S_ALL & ~S_SQL | S_MEMORY; ++ } else { ++ SPG(log_syslog) = atoi(new_value) | S_MEMORY; ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_facility) ++{ ++ if (!new_value) { ++ SPG(log_syslog_facility) = LOG_USER; ++ } else { ++ SPG(log_syslog_facility) = atoi(new_value); ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_priority) ++{ ++ if (!new_value) { ++ SPG(log_syslog_priority) = LOG_ALERT; ++ } else { ++ SPG(log_syslog_priority) = atoi(new_value); ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_sapi) ++{ ++ if (!new_value) { ++ SPG(log_sapi) = S_ALL & ~S_SQL; ++ } else { ++ SPG(log_sapi) = atoi(new_value); ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_script) ++{ ++ if (!new_value) { ++ SPG(log_script) = S_ALL & ~S_MEMORY; ++ } else { ++ SPG(log_script) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL); ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_scriptname) ++{ ++ if (SPG(log_scriptname)) { ++ pefree(SPG(log_scriptname),1); ++ } ++ SPG(log_scriptname) = NULL; ++ if (new_value) { ++ SPG(log_scriptname) = pestrdup(new_value,1); ++ } ++ return SUCCESS; ++} ++static ZEND_INI_MH(OnUpdateSuhosin_log_phpscript) ++{ ++ if (!new_value) { ++ SPG(log_phpscript) = S_ALL & ~S_MEMORY; ++ } else { ++ SPG(log_phpscript) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL); ++ } ++ return SUCCESS; ++} ++#endif ++ + ZEND_INI_BEGIN() + ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting) + STD_ZEND_INI_BOOLEAN("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, gc_enabled, zend_gc_globals, gc_globals) +--- a/Zend/zend.h ++++ b/Zend/zend.h +@@ -627,6 +627,9 @@ extern ZEND_API int (*zend_stream_open_f + extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); + extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); + extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC); ++#if SUHOSIN_PATCH ++extern ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...); ++#endif + + ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); + +@@ -774,6 +777,16 @@ ZEND_API void zend_restore_error_handlin + #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0) + #define DEBUG_BACKTRACE_IGNORE_ARGS (1<<1) + ++#if SUHOSIN_PATCH ++#include "suhosin_globals.h" ++#include "suhosin_patch.h" ++#include "php_syslog.h" ++ ++ZEND_API void zend_canary(void *buf, int len); ++ZEND_API char suhosin_get_config(int element); ++ ++#endif ++ + #endif /* ZEND_H */ + + /* +--- a/Zend/zend_alloc.c ++++ b/Zend/zend_alloc.c +@@ -32,6 +32,10 @@ + # include + #endif + ++#if SUHOSIN_PATCH ++#include "suhosin_patch.h" ++#endif ++ + #ifdef ZEND_WIN32 + # include + # include +@@ -59,6 +63,7 @@ + # define PTR_FMT "0x%0.8lx" + #endif + ++#ifndef SUHOSIN_MM_CLONE_FILE + #if ZEND_DEBUG + void zend_debug_alloc_output(char *format, ...) + { +@@ -76,6 +81,7 @@ void zend_debug_alloc_output(char *forma + #endif + } + #endif ++#endif + + #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) + static void zend_mm_panic(const char *message) __attribute__ ((noreturn)); +@@ -134,6 +140,8 @@ static void zend_mm_panic(const char *me + # endif + #endif + ++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; ++ + static zend_mm_storage* zend_mm_mem_dummy_init(void *params) + { + return malloc(sizeof(zend_mm_storage)); +@@ -332,13 +340,28 @@ static const zend_mm_mem_handlers mem_ha + #define MEM_BLOCK_GUARD 0x2A8FCC84 + #define MEM_BLOCK_LEAK 0x6C5E8F2D + ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++# define CANARY_SIZE sizeof(size_t) ++#else ++# define CANARY_SIZE 0 ++#endif ++ + /* mm block type */ + typedef struct _zend_mm_block_info { + #if ZEND_MM_COOKIES + size_t _cookie; + #endif +- size_t _size; +- size_t _prev; ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ size_t canary_1; ++#endif ++ size_t _size; ++ size_t _prev; ++#if SUHOSIN_PATCH ++ size_t size; ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ size_t canary_2; ++#endif ++#endif + } zend_mm_block_info; + + #if ZEND_DEBUG +@@ -412,7 +435,7 @@ typedef struct _zend_mm_free_block { + # define ZEND_MM_CACHE_STAT 0 + #endif + +-struct _zend_mm_heap { ++typedef struct _zend_mm_heap { + int use_zend_alloc; + void *(*_malloc)(size_t); + void (*_free)(void*); +@@ -447,6 +470,9 @@ struct _zend_mm_heap { + int miss; + } cache_stat[ZEND_MM_NUM_BUCKETS+1]; + #endif ++#if SUHOSIN_PATCH ++ size_t canary_1,canary_2,canary_3; ++#endif + }; + + #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \ +@@ -520,18 +546,31 @@ static unsigned int _zend_mm_cookie = 0; + /* optimized access */ + #define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size + ++#ifndef ZEND_MM_ALIGNMENT ++# define ZEND_MM_ALIGNMENT 8 ++# define ZEND_MM_ALIGNMENT_LOG2 3 ++#elif ZEND_MM_ALIGNMENT < 4 ++# undef ZEND_MM_ALIGNMENT ++# undef ZEND_MM_ALIGNMENT_LOG2 ++# define ZEND_MM_ALIGNMENT 4 ++# define ZEND_MM_ALIGNMENT_LOG2 2 ++#endif ++ ++#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1) ++ + /* Aligned header size */ ++#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) + #define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block)) + #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block)) +-#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE) ++#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE) + #define ZEND_MM_ALIGNED_MIN_HEADER_SIZE (ZEND_MM_MIN_ALLOC_BLOCK_SIZE>ZEND_MM_ALIGNED_FREE_HEADER_SIZE?ZEND_MM_MIN_ALLOC_BLOCK_SIZE:ZEND_MM_ALIGNED_FREE_HEADER_SIZE) + #define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment)) + +-#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE)):0) ++#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)):0) + + #define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2)) + +@@ -593,6 +632,44 @@ static unsigned int _zend_mm_cookie = 0; + + #endif + ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ ++# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \ ++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \ ++ if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \ ++ canary_mismatch: \ ++ zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { (block)->info.canary_1 = heap->canary_1; (block)->info.canary_2 = heap->canary_2; }\ ++ } \ ++ memcpy(&check, p, CANARY_SIZE); \ ++ if (check != heap->canary_3) { \ ++ zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \ ++ } \ ++ } while (0) ++ ++# define SUHOSIN_MM_SET_CANARIES(block) do { \ ++ (block)->info.canary_1 = heap->canary_1; \ ++ (block)->info.canary_2 = heap->canary_2; \ ++ } while (0) ++ ++# define SUHOSIN_MM_END_CANARY_PTR(block) \ ++ (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE) ++ ++# define SUHOSIN_MM_SET_END_CANARY(block) do { \ ++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); \ ++ memcpy(p, &heap->canary_3, CANARY_SIZE); \ ++ } while (0) ++ ++#else ++ ++# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) ++# define SUHOSIN_MM_SET_CANARIES(block) ++# define SUHOSIN_MM_END_CANARY_PTR(block) ++# define SUHOSIN_MM_SET_END_CANARY(block) ++ ++#endif ++ + + #if ZEND_MM_HEAP_PROTECTION + +@@ -715,7 +792,7 @@ static inline unsigned int zend_mm_low_b + #endif + } + +-static inline void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) ++static void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) + { + zend_mm_free_block *prev, *next; + +@@ -725,14 +802,14 @@ static inline void zend_mm_add_to_rest_l + mm_block->parent = NULL; + } + +- prev = heap->rest_buckets[0]; +- next = prev->next_free_block; +- mm_block->prev_free_block = prev; +- mm_block->next_free_block = next; +- prev->next_free_block = next->prev_free_block = mm_block; ++ prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); ++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block); ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); + } + +-static inline void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) ++static void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) + { + size_t size; + size_t index; +@@ -749,7 +826,7 @@ static inline void zend_mm_add_to_free_l + if (!*p) { + *p = mm_block; + mm_block->parent = p; +- mm_block->prev_free_block = mm_block->next_free_block = mm_block; ++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); + heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); + } else { + size_t m; +@@ -762,15 +839,15 @@ static inline void zend_mm_add_to_free_l + if (!*p) { + *p = mm_block; + mm_block->parent = p; +- mm_block->prev_free_block = mm_block->next_free_block = mm_block; ++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); + break; + } + } else { +- zend_mm_free_block *next = prev->next_free_block; ++ zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(prev->next_free_block); + +- prev->next_free_block = next->prev_free_block = mm_block; +- mm_block->next_free_block = next; +- mm_block->prev_free_block = prev; ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); + mm_block->parent = NULL; + break; + } +@@ -782,27 +859,33 @@ static inline void zend_mm_add_to_free_l + index = ZEND_MM_BUCKET_INDEX(size); + + prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index); +- if (prev->prev_free_block == prev) { ++ if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) { + heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); + } +- next = prev->next_free_block; ++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block); + +- mm_block->prev_free_block = prev; +- mm_block->next_free_block = next; +- prev->next_free_block = next->prev_free_block = mm_block; ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); + } + } + +-static inline void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) ++static void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) + { +- zend_mm_free_block *prev = mm_block->prev_free_block; +- zend_mm_free_block *next = mm_block->next_free_block; ++ zend_mm_free_block *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); ++ zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block); + + ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED); + + if (EXPECTED(prev == mm_block)) { + zend_mm_free_block **rp, **cp; + ++#if SUHOSIN_PATCH ++ if (next != mm_block) { ++ zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block); ++ _exit(1); ++ } ++#endif + #if ZEND_MM_SAFE_UNLINKING + if (UNEXPECTED(next != mm_block)) { + zend_mm_panic("zend_mm_heap corrupted"); +@@ -841,14 +924,21 @@ subst_block: + } + } else { + ++#if SUHOSIN_PATCH ++ if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) { ++ zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block); ++ _exit(1); ++ } ++#endif ++ + #if ZEND_MM_SAFE_UNLINKING +- if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) { ++ if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) { + zend_mm_panic("zend_mm_heap corrupted"); + } + #endif + +- prev->next_free_block = next; +- next->prev_free_block = prev; ++ prev->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ next->prev_free_block = SUHOSIN_MANGLE_PTR(prev); + + if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) { + if (EXPECTED(prev == next)) { +@@ -864,7 +954,7 @@ subst_block: + } + } + +-static inline void zend_mm_init(zend_mm_heap *heap) ++static void zend_mm_init(zend_mm_heap *heap) + { + zend_mm_free_block* p; + int i; +@@ -882,12 +972,19 @@ static inline void zend_mm_init(zend_mm_ + #endif + p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { +- p->next_free_block = p; +- p->prev_free_block = p; ++ p->next_free_block = SUHOSIN_MANGLE_PTR(p); ++ p->prev_free_block = SUHOSIN_MANGLE_PTR(p); + p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2); + heap->large_free_buckets[i] = NULL; + } +- heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap); ++ heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap)); ++#if SUHOSIN_PATCH ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { ++ zend_canary(&heap->canary_1, sizeof(heap->canary_1)); ++ zend_canary(&heap->canary_2, sizeof(heap->canary_2)); ++ zend_canary(&heap->canary_3, sizeof(heap->canary_3)); ++ } ++#endif + } + + static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment) +@@ -908,12 +1005,13 @@ static void zend_mm_free_cache(zend_mm_h + int i; + + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { ++ /* NULL means NULL even MANGLED */ + if (heap->cache[i]) { +- zend_mm_free_block *mm_block = heap->cache[i]; ++ zend_mm_free_block *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]); + + while (mm_block) { + size_t size = ZEND_MM_BLOCK_SIZE(mm_block); +- zend_mm_free_block *q = mm_block->prev_free_block; ++ zend_mm_free_block *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); + zend_mm_block *next_block = ZEND_MM_NEXT_BLOCK(mm_block); + + heap->cached -= size; +@@ -1009,14 +1107,20 @@ static void zend_mm_random(unsigned char + /* }}} */ + #endif + ++ + /* Notes: + * - This function may alter the block_sizes values to match platform alignment + * - This function does *not* perform sanity checks on the arguments + */ +-ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params) ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++zend_mm_heap *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params) ++#else ++static zend_mm_heap *__zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params) ++#endif + { + zend_mm_storage *storage; + zend_mm_heap *heap; ++ zend_mm_free_block *tmp; + + #if 0 + int i; +@@ -1050,6 +1154,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e + } + #endif + ++ /* get the pointer guardian and ensure low 3 bits are 1 */ ++ if (SUHOSIN_POINTER_GUARD == 0) { ++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); ++ SUHOSIN_POINTER_GUARD |= 7; ++ } ++ + if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) { + fprintf(stderr, "'block_size' must be a power of two\n"); + /* See http://support.microsoft.com/kb/190351 */ +@@ -1097,12 +1207,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e + heap->reserve = NULL; + heap->reserve_size = reserve_size; + if (reserve_size > 0) { +- heap->reserve = _zend_mm_alloc_int(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ heap->reserve = _zend_mm_alloc(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); + } + if (internal) { + int i; + zend_mm_free_block *p, *q, *orig; +- zend_mm_heap *mm_heap = _zend_mm_alloc_int(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ zend_mm_heap *mm_heap = _zend_mm_alloc(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); + + *mm_heap = *heap; + +@@ -1110,22 +1220,22 @@ ZEND_API zend_mm_heap *zend_mm_startup_e + orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { + q = p; +- while (q->prev_free_block != orig) { +- q = q->prev_free_block; ++ while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) { ++ q = SUHOSIN_MANGLE_PTR(q->prev_free_block); + } +- q->prev_free_block = p; ++ q->prev_free_block = SUHOSIN_MANGLE_PTR(p); + q = p; +- while (q->next_free_block != orig) { +- q = q->next_free_block; ++ while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) { ++ q = SUHOSIN_MANGLE_PTR(q->next_free_block); + } +- q->next_free_block = p; ++ q->next_free_block = SUHOSIN_MANGLE_PTR(p); + p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2); + orig = (zend_mm_free_block*)((char*)orig + sizeof(zend_mm_free_block*) * 2); + if (mm_heap->large_free_buckets[i]) { + mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i]; + } + } +- mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap); ++ mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap)); + + free(heap); + heap = mm_heap; +@@ -1133,7 +1243,11 @@ ZEND_API zend_mm_heap *zend_mm_startup_e + return heap; + } + +-ZEND_API zend_mm_heap *zend_mm_startup(void) ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++zend_mm_heap *__zend_mm_startup_canary(void) ++#else ++static zend_mm_heap *__zend_mm_startup(void) ++#endif + { + int i; + size_t seg_size; +@@ -1203,6 +1317,27 @@ ZEND_API zend_mm_heap *zend_mm_startup(v + return heap; + } + ++#ifndef SUHOSIN_MM_CLONE_FILE ++zend_mm_heap_canary *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params); ++zend_mm_heap_canary *__zend_mm_startup_canary(void); ++ ++ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params) ++{ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { ++ return (zend_mm_heap *)__zend_mm_startup_canary_ex(handlers, block_size, reserve_size, internal, params); ++ } ++ return __zend_mm_startup_ex(handlers, block_size, reserve_size, internal, params); ++} ++ZEND_API zend_mm_heap *zend_mm_startup(void) ++{ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { ++ return (zend_mm_heap *)__zend_mm_startup_canary(); ++ } ++ return __zend_mm_startup(); ++} ++ ++#endif ++ + #if ZEND_DEBUG + static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b) + { +@@ -1571,7 +1706,11 @@ static int zend_mm_check_heap(zend_mm_he + } + #endif + +-ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++void __zend_mm_shutdown_canary(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) ++#else ++static void __zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) ++#endif + { + zend_mm_storage *storage; + zend_mm_segment *segment; +@@ -1581,7 +1720,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_h + if (heap->reserve) { + #if ZEND_DEBUG + if (!silent) { +- _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); + } + #endif + heap->reserve = NULL; +@@ -1664,12 +1803,23 @@ ZEND_API void zend_mm_shutdown(zend_mm_h + heap->size = 0; + heap->peak = 0; + if (heap->reserve_size) { +- heap->reserve = _zend_mm_alloc_int(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ heap->reserve = _zend_mm_alloc(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); + } + heap->overflow = 0; + } + } + ++#ifndef SUHOSIN_MM_CLONE_FILE ++ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) ++{ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { ++ __zend_mm_shutdown_canary(heap, full_shutdown, silent TSRMLS_CC); ++ return; ++ } ++ __zend_mm_shutdown(heap, full_shutdown, silent TSRMLS_CC); ++} ++#endif ++ + static void zend_mm_safe_error(zend_mm_heap *heap, + const char *format, + size_t limit, +@@ -1680,7 +1830,11 @@ static void zend_mm_safe_error(zend_mm_h + size_t size) + { + if (heap->reserve) { ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++#else + _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++#endif + heap->reserve = NULL; + } + if (heap->overflow == 0) { +@@ -1755,7 +1909,7 @@ static zend_mm_free_block *zend_mm_searc + p = heap->large_free_buckets[index]; + for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { +- return p->next_free_block; ++ return SUHOSIN_MANGLE_PTR(p->next_free_block); + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size && + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); +@@ -1779,7 +1933,7 @@ static zend_mm_free_block *zend_mm_searc + + for (p = rst; p; p = p->child[p->child[0] != NULL]) { + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { +- return p->next_free_block; ++ return SUHOSIN_MANGLE_PTR(p->next_free_block); + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); +@@ -1788,7 +1942,7 @@ static zend_mm_free_block *zend_mm_searc + } + + if (best_fit) { +- return best_fit->next_free_block; ++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); + } + bitmap = bitmap >> 1; + if (!bitmap) { +@@ -1804,9 +1958,12 @@ static zend_mm_free_block *zend_mm_searc + best_fit = p; + } + } +- return best_fit->next_free_block; ++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); + } + ++#if SUHOSIN_PATCH ++void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ++#endif + static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { + zend_mm_free_block *best_fit; +@@ -1816,7 +1973,7 @@ static void *_zend_mm_alloc_int(zend_mm_ + size_t segment_size; + zend_mm_segment *segment; + int keep_rest = 0; +- ++ + if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) { + size_t index = ZEND_MM_BUCKET_INDEX(true_size); + size_t bitmap; +@@ -1831,9 +1988,14 @@ static void *_zend_mm_alloc_int(zend_mm_ + heap->cache_stat[index].count--; + heap->cache_stat[index].hit++; + #endif +- best_fit = heap->cache[index]; ++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); + heap->cache[index] = best_fit->prev_free_block; + heap->cached -= true_size; ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); + return ZEND_MM_DATA_OF(best_fit); +@@ -1847,7 +2009,7 @@ static void *_zend_mm_alloc_int(zend_mm_ + if (bitmap) { + /* Found some "small" free block that can be used */ + index += zend_mm_low_bit(bitmap); +- best_fit = heap->free_buckets[index*2]; ++ best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]); + #if ZEND_MM_CACHE_STAT + heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++; + #endif +@@ -1862,7 +2024,7 @@ static void *_zend_mm_alloc_int(zend_mm_ + best_fit = zend_mm_search_large_block(heap, true_size); + + if (!best_fit && heap->real_size >= heap->limit - heap->block_size) { +- zend_mm_free_block *p = heap->rest_buckets[0]; ++ zend_mm_free_block *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); + size_t best_size = -1; + + while (p != ZEND_MM_REST_BUCKET(heap)) { +@@ -1874,7 +2036,7 @@ static void *_zend_mm_alloc_int(zend_mm_ + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); + best_fit = p; + } +- p = p->prev_free_block; ++ p = SUHOSIN_MANGLE_PTR(p->prev_free_block); + } + } + +@@ -1973,13 +2135,19 @@ zend_mm_finished_searching_for_block: + + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1); + ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif ++ + heap->size += true_size; + if (heap->peak < heap->size) { + heap->peak = heap->size; + } + + HANDLE_UNBLOCK_INTERRUPTIONS(); +- ++ + return ZEND_MM_DATA_OF(best_fit); + } + +@@ -1996,19 +2164,26 @@ static void _zend_mm_free_int(zend_mm_he + + mm_block = ZEND_MM_HEADER_OF(p); + size = ZEND_MM_BLOCK_SIZE(mm_block); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()"); ++#endif + ZEND_MM_CHECK_PROTECTION(mm_block); + + #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size); + #endif +- ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) { ++ memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size); ++ } ++#endif + #if ZEND_MM_CACHE + if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) { + size_t index = ZEND_MM_BUCKET_INDEX(size); + zend_mm_free_block **cache = &heap->cache[index]; + + ((zend_mm_free_block*)mm_block)->prev_free_block = *cache; +- *cache = (zend_mm_free_block*)mm_block; ++ *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block); + heap->cached += size; + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); + #if ZEND_MM_CACHE_STAT +@@ -2044,6 +2219,9 @@ static void _zend_mm_free_int(zend_mm_he + HANDLE_UNBLOCK_INTERRUPTIONS(); + } + ++#if SUHOSIN_PATCH ++void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ++#endif + static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { + zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p); +@@ -2053,11 +2231,18 @@ static void *_zend_mm_realloc_int(zend_m + void *ptr; + + if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) { ++#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION ++ return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#else + return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + mm_block = ZEND_MM_HEADER_OF(p); + true_size = ZEND_MM_TRUE_SIZE(size); + orig_size = ZEND_MM_BLOCK_SIZE(mm_block); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()"); ++#endif + ZEND_MM_CHECK_PROTECTION(mm_block); + + if (UNEXPECTED(true_size < size)) { +@@ -2089,6 +2274,11 @@ static void *_zend_mm_realloc_int(zend_m + HANDLE_UNBLOCK_INTERRUPTIONS(); + } + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif + return p; + } + +@@ -2104,17 +2294,22 @@ static void *_zend_mm_realloc_int(zend_m + heap->cache_stat[index].count--; + heap->cache_stat[index].hit++; + #endif +- best_fit = heap->cache[index]; ++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); + heap->cache[index] = best_fit->prev_free_block; + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); +- ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); +- ++ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif ++ + ptr = ZEND_MM_DATA_OF(best_fit); + + #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION + memcpy(ptr, p, mm_block->debug.size); + #else +- memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE); ++ memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); + #endif + + heap->cached -= true_size - orig_size; +@@ -2123,14 +2318,13 @@ static void *_zend_mm_realloc_int(zend_m + cache = &heap->cache[index]; + + ((zend_mm_free_block*)mm_block)->prev_free_block = *cache; +- *cache = (zend_mm_free_block*)mm_block; ++ *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block); + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); + #if ZEND_MM_CACHE_STAT + if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { + heap->cache_stat[index].max_count = heap->cache_stat[index].count; + } + #endif +- + return ptr; + } + } +@@ -2173,6 +2367,11 @@ static void *_zend_mm_realloc_int(zend_m + heap->peak = heap->size; + } + HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif + return p; + } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) { +@@ -2275,38 +2474,90 @@ out_of_memory: + } + + HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif + return ZEND_MM_DATA_OF(mm_block); + } + ++#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION ++ ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#else + ptr = _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION + memcpy(ptr, p, mm_block->debug.size); + #else +- memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE); ++ memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); + #endif ++#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION ++ _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#else + _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + return ptr; + } + ++#ifndef SUHOSIN_MM_CLONE_FILE + ZEND_API void *_zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { +- return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif ++ return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ return _zend_mm_alloc_canary_int((zend_mm_heap_canary *)heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API void _zend_mm_free(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { +- _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif ++ { _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; } ++#if SUHOSIN_PATCH ++ _zend_mm_free_canary_int((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API void *_zend_mm_realloc(zend_mm_heap *heap, void *ptr, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { +- return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif ++ return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ return _zend_mm_realloc_canary_int((zend_mm_heap_canary *)heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API size_t _zend_mm_block_size(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { + zend_mm_block *mm_block; + ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) != 0) { ++ return _zend_mm_block_size_canary((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ ++ if (!ZEND_MM_VALID_PTR(p)) { ++ return 0; ++ } ++ mm_block = ZEND_MM_HEADER_OF(p); ++ ZEND_MM_CHECK_PROTECTION(mm_block); ++#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION ++ return mm_block->debug.size; ++#else ++ return ZEND_MM_BLOCK_SIZE(mm_block); ++#endif ++} ++#else ++ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_block *mm_block; ++ + if (!ZEND_MM_VALID_PTR(p)) { + return 0; + } +@@ -2319,6 +2570,8 @@ ZEND_API size_t _zend_mm_block_size(zend + #endif + } + ++#endif ++ + /**********************/ + /* Allocation Manager */ + /**********************/ +@@ -2335,6 +2588,7 @@ static int alloc_globals_id; + static zend_alloc_globals alloc_globals; + #endif + ++#ifndef SUHOSIN_MM_CLONE_FILE + ZEND_API int is_zend_mm(TSRMLS_D) + { + return AG(mm_heap)->use_zend_alloc; +@@ -2347,7 +2601,13 @@ ZEND_API void *_emalloc(size_t size ZEND + if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { + return AG(mm_heap)->_malloc(size); + } ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif + return _zend_mm_alloc_int(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ return _zend_mm_alloc_canary_int((zend_mm_heap_canary *)AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) +@@ -2358,7 +2618,13 @@ ZEND_API void _efree(void *ptr ZEND_FILE + AG(mm_heap)->_free(ptr); + return; + } +- _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif ++ { _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; } ++#if SUHOSIN_PATCH ++ _zend_mm_free_canary_int((zend_mm_heap_canary *)AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) +@@ -2368,7 +2634,13 @@ ZEND_API void *_erealloc(void *ptr, size + if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { + return AG(mm_heap)->_realloc(ptr, size); + } ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif + return _zend_mm_realloc_int(AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ return _zend_mm_realloc_canary_int((zend_mm_heap_canary *)AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } + + ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) +@@ -2376,8 +2648,15 @@ ZEND_API size_t _zend_mem_block_size(voi + if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { + return 0; + } +- return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) ++#endif ++ return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if SUHOSIN_PATCH ++ return _zend_mm_block_size_canary((zend_mm_heap_canary *)AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#endif + } ++#endif + + #if defined(__GNUC__) && defined(i386) + +@@ -2448,7 +2727,7 @@ static inline size_t safe_address(size_t + } + #endif + +- ++#ifndef SUHOSIN_MM_CLONE_FILE + ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) + { + return emalloc_rel(safe_address(nmemb, size, offset)); +@@ -2561,6 +2840,7 @@ ZEND_API void shutdown_memory_manager(in + { + zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC); + } ++#endif + + static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) + { +@@ -2585,6 +2865,7 @@ static void alloc_globals_dtor(zend_allo + } + #endif + ++#ifndef SUHOSIN_MM_CLONE_FILE + ZEND_API void start_memory_manager(TSRMLS_D) + { + #ifdef ZTS +@@ -2649,6 +2930,7 @@ ZEND_API void _full_mem_check(int silent + zend_debug_alloc_output("------------------------------------------------\n"); + } + #endif ++#endif + + /* + * Local variables: +--- a/Zend/zend_alloc.h ++++ b/Zend/zend_alloc.h +@@ -203,6 +203,8 @@ END_EXTERN_C() + + /* Heap functions */ + typedef struct _zend_mm_heap zend_mm_heap; ++typedef struct _zend_mm_heap_canary zend_mm_heap_canary; ++ + + ZEND_API zend_mm_heap *zend_mm_startup(void); + ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC); +--- /dev/null ++++ b/Zend/zend_alloc_canary.c +@@ -0,0 +1,2498 @@ ++/* ++ +----------------------------------------------------------------------+ ++ | Suhosin-Patch for PHP | ++ +----------------------------------------------------------------------+ ++ | Copyright (c) 2004-2010 Stefan Esser | ++ +----------------------------------------------------------------------+ ++ | This source file is subject to version 2.02 of the PHP license, | ++ | that is bundled with this package in the file LICENSE, and is | ++ | available at through the world-wide-web at | ++ | http://www.php.net/license/2_02.txt. | ++ | If you did not receive a copy of the PHP license and are unable to | ++ | obtain it through the world-wide-web, please send a note to | ++ | license@php.net so we can mail you a copy immediately. | ++ +----------------------------------------------------------------------+ ++ | Author: Stefan Esser | ++ +----------------------------------------------------------------------+ ++ */ ++/* $Id: zend_alloc_canary.c, $ */ ++ ++#include "zend.h" ++#include "zend_alloc.h" ++#include "zend_globals.h" ++#include "zend_operators.h" ++ ++#ifdef HAVE_SIGNAL_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ ++#if SUHOSIN_PATCH ++#include "suhosin_patch.h" ++#endif ++ ++#ifdef ZEND_WIN32 ++# include ++# include ++#endif ++ ++#ifndef ZEND_MM_HEAP_PROTECTION ++# define ZEND_MM_HEAP_PROTECTION ZEND_DEBUG ++#endif ++ ++#ifndef ZEND_MM_SAFE_UNLINKING ++# define ZEND_MM_SAFE_UNLINKING 1 ++#endif ++ ++#ifndef ZEND_MM_COOKIES ++# define ZEND_MM_COOKIES ZEND_DEBUG ++#endif ++ ++#ifdef _WIN64 ++# define PTR_FMT "0x%0.16I64x" ++/* ++#elif sizeof(long) == 8 ++# define PTR_FMT "0x%0.16lx" ++*/ ++#else ++# define PTR_FMT "0x%0.8lx" ++#endif ++ ++#define SUHOSIN_MM_WITH_CANARY_PROTECTION 1 ++ ++#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) ++static void zend_mm_panic(const char *message) __attribute__ ((noreturn)); ++#endif ++ ++static void zend_mm_panic(const char *message) ++{ ++ fprintf(stderr, "%s\n", message); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID) ++ kill(getpid(), SIGSEGV); ++#endif ++ exit(1); ++} ++ ++/*******************/ ++/* Storage Manager */ ++/*******************/ ++ ++#ifdef ZEND_WIN32 ++# define HAVE_MEM_WIN32 /* use VirtualAlloc() to allocate memory */ ++#endif ++#define HAVE_MEM_MALLOC /* use malloc() to allocate segments */ ++ ++#include ++#include ++#if HAVE_LIMITS_H ++#include ++#endif ++#include ++#include ++ ++#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO) ++# ifdef HAVE_MREMAP ++# ifndef _GNU_SOURCE ++# define _GNU_SOURCE ++# endif ++# ifndef __USE_GNU ++# define __USE_GNU ++# endif ++# endif ++# include ++# ifndef MAP_ANON ++# ifdef MAP_ANONYMOUS ++# define MAP_ANON MAP_ANONYMOUS ++# endif ++# endif ++# ifndef MREMAP_MAYMOVE ++# define MREMAP_MAYMOVE 0 ++# endif ++# ifndef MAP_FAILED ++# define MAP_FAILED ((void*)-1) ++# endif ++#endif ++ ++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; ++ ++static zend_mm_storage* zend_mm_mem_dummy_init(void *params) ++{ ++ return malloc(sizeof(zend_mm_storage)); ++} ++ ++static void zend_mm_mem_dummy_dtor(zend_mm_storage *storage) ++{ ++ free(storage); ++} ++ ++static void zend_mm_mem_dummy_compact(zend_mm_storage *storage) ++{ ++} ++ ++#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO) ++ ++static zend_mm_segment* zend_mm_mem_mmap_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size) ++{ ++ zend_mm_segment *ret; ++#ifdef HAVE_MREMAP ++#if defined(__NetBSD__) ++ /* NetBSD 5 supports mremap but takes an extra newp argument */ ++ ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE); ++#else ++ ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE); ++#endif ++ if (ret == MAP_FAILED) { ++#endif ++ ret = storage->handlers->_alloc(storage, size); ++ if (ret) { ++ memcpy(ret, segment, size > segment->size ? segment->size : size); ++ storage->handlers->_free(storage, segment); ++ } ++#ifdef HAVE_MREMAP ++ } ++#endif ++ return ret; ++} ++ ++static void zend_mm_mem_mmap_free(zend_mm_storage *storage, zend_mm_segment* segment) ++{ ++ munmap((void*)segment, segment->size); ++} ++ ++#endif ++ ++#ifdef HAVE_MEM_MMAP_ANON ++ ++static zend_mm_segment* zend_mm_mem_mmap_anon_alloc(zend_mm_storage *storage, size_t size) ++{ ++ zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); ++ if (ret == MAP_FAILED) { ++ ret = NULL; ++ } ++ return ret; ++} ++ ++# define ZEND_MM_MEM_MMAP_ANON_DSC {"mmap_anon", zend_mm_mem_dummy_init, zend_mm_mem_dummy_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_mmap_anon_alloc, zend_mm_mem_mmap_realloc, zend_mm_mem_mmap_free} ++ ++#endif ++ ++#ifdef HAVE_MEM_MMAP_ZERO ++ ++static int zend_mm_dev_zero_fd = -1; ++ ++static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params) ++{ ++ if (zend_mm_dev_zero_fd != -1) { ++ zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR); ++ } ++ if (zend_mm_dev_zero_fd >= 0) { ++ return malloc(sizeof(zend_mm_storage)); ++ } else { ++ return NULL; ++ } ++} ++ ++static void zend_mm_mem_mmap_zero_dtor(zend_mm_storage *storage) ++{ ++ close(zend_mm_dev_zero_fd); ++ free(storage); ++} ++ ++static zend_mm_segment* zend_mm_mem_mmap_zero_alloc(zend_mm_storage *storage, size_t size) ++{ ++ zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zend_mm_dev_zero_fd, 0); ++ if (ret == MAP_FAILED) { ++ ret = NULL; ++ } ++ return ret; ++} ++ ++# define ZEND_MM_MEM_MMAP_ZERO_DSC {"mmap_zero", zend_mm_mem_mmap_zero_init, zend_mm_mem_mmap_zero_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_mmap_zero_alloc, zend_mm_mem_mmap_realloc, zend_mm_mem_mmap_free} ++ ++#endif ++ ++#ifdef HAVE_MEM_WIN32 ++ ++static zend_mm_storage* zend_mm_mem_win32_init(void *params) ++{ ++ HANDLE heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); ++ zend_mm_storage* storage; ++ ++ if (heap == NULL) { ++ return NULL; ++ } ++ storage = (zend_mm_storage*)malloc(sizeof(zend_mm_storage)); ++ storage->data = (void*) heap; ++ return storage; ++} ++ ++static void zend_mm_mem_win32_dtor(zend_mm_storage *storage) ++{ ++ HeapDestroy((HANDLE)storage->data); ++ free(storage); ++} ++ ++static void zend_mm_mem_win32_compact(zend_mm_storage *storage) ++{ ++ HeapDestroy((HANDLE)storage->data); ++ storage->data = (void*)HeapCreate(HEAP_NO_SERIALIZE, 0, 0); ++} ++ ++static zend_mm_segment* zend_mm_mem_win32_alloc(zend_mm_storage *storage, size_t size) ++{ ++ return (zend_mm_segment*) HeapAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, size); ++} ++ ++static void zend_mm_mem_win32_free(zend_mm_storage *storage, zend_mm_segment* segment) ++{ ++ HeapFree((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment); ++} ++ ++static zend_mm_segment* zend_mm_mem_win32_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size) ++{ ++ return (zend_mm_segment*) HeapReAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment, size); ++} ++ ++# define ZEND_MM_MEM_WIN32_DSC {"win32", zend_mm_mem_win32_init, zend_mm_mem_win32_dtor, zend_mm_mem_win32_compact, zend_mm_mem_win32_alloc, zend_mm_mem_win32_realloc, zend_mm_mem_win32_free} ++ ++#endif ++ ++#ifdef HAVE_MEM_MALLOC ++ ++static zend_mm_segment* zend_mm_mem_malloc_alloc(zend_mm_storage *storage, size_t size) ++{ ++ return (zend_mm_segment*)malloc(size); ++} ++ ++static zend_mm_segment* zend_mm_mem_malloc_realloc(zend_mm_storage *storage, zend_mm_segment *ptr, size_t size) ++{ ++ return (zend_mm_segment*)realloc(ptr, size); ++} ++ ++static void zend_mm_mem_malloc_free(zend_mm_storage *storage, zend_mm_segment *ptr) ++{ ++ free(ptr); ++} ++ ++# define ZEND_MM_MEM_MALLOC_DSC {"malloc", zend_mm_mem_dummy_init, zend_mm_mem_dummy_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_malloc_alloc, zend_mm_mem_malloc_realloc, zend_mm_mem_malloc_free} ++ ++#endif ++ ++static const zend_mm_mem_handlers mem_handlers[] = { ++#ifdef HAVE_MEM_WIN32 ++ ZEND_MM_MEM_WIN32_DSC, ++#endif ++#ifdef HAVE_MEM_MALLOC ++ ZEND_MM_MEM_MALLOC_DSC, ++#endif ++#ifdef HAVE_MEM_MMAP_ANON ++ ZEND_MM_MEM_MMAP_ANON_DSC, ++#endif ++#ifdef HAVE_MEM_MMAP_ZERO ++ ZEND_MM_MEM_MMAP_ZERO_DSC, ++#endif ++ {NULL, NULL, NULL, NULL, NULL, NULL} ++}; ++ ++# define ZEND_MM_STORAGE_DTOR() heap->storage->handlers->dtor(heap->storage) ++# define ZEND_MM_STORAGE_ALLOC(size) heap->storage->handlers->_alloc(heap->storage, size) ++# define ZEND_MM_STORAGE_REALLOC(ptr, size) heap->storage->handlers->_realloc(heap->storage, ptr, size) ++# define ZEND_MM_STORAGE_FREE(ptr) heap->storage->handlers->_free(heap->storage, ptr) ++ ++/****************/ ++/* Heap Manager */ ++/****************/ ++ ++#define MEM_BLOCK_VALID 0x7312F8DC ++#define MEM_BLOCK_FREED 0x99954317 ++#define MEM_BLOCK_CACHED 0xFB8277DC ++#define MEM_BLOCK_GUARD 0x2A8FCC84 ++#define MEM_BLOCK_LEAK 0x6C5E8F2D ++ ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++# define CANARY_SIZE sizeof(size_t) ++#else ++# define CANARY_SIZE 0 ++#endif ++ ++/* mm block type */ ++typedef struct _zend_mm_block_info_canary { ++#if ZEND_MM_COOKIES ++ size_t _cookie; ++#endif ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ size_t canary_1; ++#endif ++ size_t _size; ++ size_t _prev; ++#if SUHOSIN_PATCH ++ size_t size; ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ size_t canary_2; ++#endif ++#endif ++} zend_mm_block_info_canary; ++ ++#if ZEND_DEBUG ++ ++typedef struct _zend_mm_debug_info_canary { ++ char *filename; ++ uint lineno; ++ char *orig_filename; ++ uint orig_lineno; ++ size_t size; ++#if ZEND_MM_HEAP_PROTECTION ++ unsigned int start_magic; ++#endif ++} zend_mm_debug_info_canary; ++ ++#elif ZEND_MM_HEAP_PROTECTION ++ ++typedef struct _zend_mm_debug_info_canary { ++ size_t size; ++ unsigned int start_magic; ++} zend_mm_debug_info_canary; ++ ++#endif ++ ++typedef struct _zend_mm_block_canary { ++ zend_mm_block_info_canary info; ++#if ZEND_DEBUG ++ unsigned int magic; ++# ifdef ZTS ++ THREAD_T thread_id; ++# endif ++ zend_mm_debug_info_canary debug; ++#elif ZEND_MM_HEAP_PROTECTION ++ zend_mm_debug_info_canary debug; ++#endif ++} zend_mm_block_canary; ++ ++typedef struct _zend_mm_small_free_block_canary { ++ zend_mm_block_info_canary info; ++#if ZEND_DEBUG ++ unsigned int magic; ++# ifdef ZTS ++ THREAD_T thread_id; ++# endif ++#endif ++ struct _zend_mm_free_block_canary *prev_free_block; ++ struct _zend_mm_free_block_canary *next_free_block; ++} zend_mm_small_free_block_canary; ++ ++typedef struct _zend_mm_free_block_canary { ++ zend_mm_block_info_canary info; ++#if ZEND_DEBUG ++ unsigned int magic; ++# ifdef ZTS ++ THREAD_T thread_id; ++# endif ++#endif ++ struct _zend_mm_free_block_canary *prev_free_block; ++ struct _zend_mm_free_block_canary *next_free_block; ++ ++ struct _zend_mm_free_block_canary **parent; ++ struct _zend_mm_free_block_canary *child[2]; ++} zend_mm_free_block_canary; ++ ++#define ZEND_MM_NUM_BUCKETS (sizeof(size_t) << 3) ++ ++#define ZEND_MM_CACHE 1 ++#define ZEND_MM_CACHE_SIZE (ZEND_MM_NUM_BUCKETS * 4 * 1024) ++ ++#ifndef ZEND_MM_CACHE_STAT ++# define ZEND_MM_CACHE_STAT 0 ++#endif ++ ++typedef struct _zend_mm_heap_canary { ++ int use_zend_alloc; ++ void *(*_malloc)(size_t); ++ void (*_free)(void*); ++ void *(*_realloc)(void*, size_t); ++ size_t free_bitmap; ++ size_t large_free_bitmap; ++ size_t block_size; ++ size_t compact_size; ++ zend_mm_segment *segments_list; ++ zend_mm_storage *storage; ++ size_t real_size; ++ size_t real_peak; ++ size_t limit; ++ size_t size; ++ size_t peak; ++ size_t reserve_size; ++ void *reserve; ++ int overflow; ++ int internal; ++#if ZEND_MM_CACHE ++ unsigned int cached; ++ zend_mm_free_block_canary *cache[ZEND_MM_NUM_BUCKETS]; ++#endif ++ zend_mm_free_block_canary *free_buckets[ZEND_MM_NUM_BUCKETS*2]; ++ zend_mm_free_block_canary *large_free_buckets[ZEND_MM_NUM_BUCKETS]; ++ zend_mm_free_block_canary *rest_buckets[2]; ++#if ZEND_MM_CACHE_STAT ++ struct { ++ int count; ++ int max_count; ++ int hit; ++ int miss; ++ } cache_stat[ZEND_MM_NUM_BUCKETS+1]; ++#endif ++#if SUHOSIN_PATCH ++ size_t canary_1,canary_2,canary_3; ++#endif ++}; ++ ++#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \ ++ (zend_mm_free_block_canary*) ((char*)&heap->free_buckets[index * 2] + \ ++ sizeof(zend_mm_free_block_canary*) * 2 - \ ++ sizeof(zend_mm_small_free_block_canary)) ++ ++#define ZEND_MM_REST_BUCKET(heap) \ ++ (zend_mm_free_block_canary*)((char*)&heap->rest_buckets[0] + \ ++ sizeof(zend_mm_free_block_canary*) * 2 - \ ++ sizeof(zend_mm_small_free_block_canary)) ++ ++#if ZEND_MM_COOKIES ++ ++static unsigned int _zend_mm_cookie = 0; ++ ++# define ZEND_MM_COOKIE(block) \ ++ (((size_t)(block)) ^ _zend_mm_cookie) ++# define ZEND_MM_SET_COOKIE(block) \ ++ (block)->info._cookie = ZEND_MM_COOKIE(block) ++# define ZEND_MM_CHECK_COOKIE(block) \ ++ if (UNEXPECTED((block)->info._cookie != ZEND_MM_COOKIE(block))) { \ ++ zend_mm_panic("zend_mm_heap corrupted"); \ ++ } ++#else ++# define ZEND_MM_SET_COOKIE(block) ++# define ZEND_MM_CHECK_COOKIE(block) ++#endif ++ ++/* Default memory segment size */ ++#define ZEND_MM_SEG_SIZE (256 * 1024) ++ ++/* Reserved space for error reporting in case of memory overflow */ ++#define ZEND_MM_RESERVE_SIZE (8*1024) ++ ++#ifdef _WIN64 ++# define ZEND_MM_LONG_CONST(x) (x##i64) ++#else ++# define ZEND_MM_LONG_CONST(x) (x##L) ++#endif ++ ++#define ZEND_MM_TYPE_MASK ZEND_MM_LONG_CONST(0x3) ++ ++#define ZEND_MM_FREE_BLOCK ZEND_MM_LONG_CONST(0x0) ++#define ZEND_MM_USED_BLOCK ZEND_MM_LONG_CONST(0x1) ++#define ZEND_MM_GUARD_BLOCK ZEND_MM_LONG_CONST(0x3) ++ ++#define ZEND_MM_BLOCK(b, type, size) do { \ ++ size_t _size = (size); \ ++ (b)->info._size = (type) | _size; \ ++ ZEND_MM_BLOCK_AT(b, _size)->info._prev = (type) | _size; \ ++ ZEND_MM_SET_COOKIE(b); \ ++ } while (0); ++#define ZEND_MM_LAST_BLOCK(b) do { \ ++ (b)->info._size = ZEND_MM_GUARD_BLOCK | ZEND_MM_ALIGNED_HEADER_SIZE; \ ++ ZEND_MM_SET_MAGIC(b, MEM_BLOCK_GUARD); \ ++ } while (0); ++#define ZEND_MM_BLOCK_SIZE(b) ((b)->info._size & ~ZEND_MM_TYPE_MASK) ++#define ZEND_MM_IS_FREE_BLOCK(b) (!((b)->info._size & ZEND_MM_USED_BLOCK)) ++#define ZEND_MM_IS_USED_BLOCK(b) ((b)->info._size & ZEND_MM_USED_BLOCK) ++#define ZEND_MM_IS_GUARD_BLOCK(b) (((b)->info._size & ZEND_MM_TYPE_MASK) == ZEND_MM_GUARD_BLOCK) ++ ++#define ZEND_MM_NEXT_BLOCK(b) ZEND_MM_BLOCK_AT(b, ZEND_MM_BLOCK_SIZE(b)) ++#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(int)((b)->info._prev & ~ZEND_MM_TYPE_MASK)) ++ ++#define ZEND_MM_PREV_BLOCK_IS_FREE(b) (!((b)->info._prev & ZEND_MM_USED_BLOCK)) ++ ++#define ZEND_MM_MARK_FIRST_BLOCK(b) ((b)->info._prev = ZEND_MM_GUARD_BLOCK) ++#define ZEND_MM_IS_FIRST_BLOCK(b) ((b)->info._prev == ZEND_MM_GUARD_BLOCK) ++ ++/* optimized access */ ++#define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size ++ ++#ifndef ZEND_MM_ALIGNMENT ++# define ZEND_MM_ALIGNMENT 8 ++# define ZEND_MM_ALIGNMENT_LOG2 3 ++#elif ZEND_MM_ALIGNMENT < 4 ++# undef ZEND_MM_ALIGNMENT ++# undef ZEND_MM_ALIGNMENT_LOG2 ++# define ZEND_MM_ALIGNMENT 4 ++# define ZEND_MM_ALIGNMENT_LOG2 2 ++#endif ++ ++#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1) ++ ++/* Aligned header size */ ++#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) ++#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block_canary)) ++#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block_canary)) ++#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE) ++#define ZEND_MM_ALIGNED_MIN_HEADER_SIZE (ZEND_MM_MIN_ALLOC_BLOCK_SIZE>ZEND_MM_ALIGNED_FREE_HEADER_SIZE?ZEND_MM_MIN_ALLOC_BLOCK_SIZE:ZEND_MM_ALIGNED_FREE_HEADER_SIZE) ++#define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment)) ++ ++#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)):0) ++ ++#define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2)) ++ ++#define ZEND_MM_SMALL_SIZE(true_size) (true_size < ZEND_MM_MAX_SMALL_SIZE) ++ ++/* Memory calculations */ ++#define ZEND_MM_BLOCK_AT(blk, offset) ((zend_mm_block_canary *) (((char *) (blk))+(offset))) ++#define ZEND_MM_DATA_OF(p) ((void *) (((char *) (p))+ZEND_MM_ALIGNED_HEADER_SIZE)) ++#define ZEND_MM_HEADER_OF(blk) ZEND_MM_BLOCK_AT(blk, -(int)ZEND_MM_ALIGNED_HEADER_SIZE) ++ ++/* Debug output */ ++#if ZEND_DEBUG ++ ++# ifdef ZTS ++# define ZEND_MM_SET_THREAD_ID(block) \ ++ ((zend_mm_block_canary*)(block))->thread_id = tsrm_thread_id() ++# define ZEND_MM_BAD_THREAD_ID(block) ((block)->thread_id != tsrm_thread_id()) ++# else ++# define ZEND_MM_SET_THREAD_ID(block) ++# define ZEND_MM_BAD_THREAD_ID(block) 0 ++# endif ++ ++# define ZEND_MM_VALID_PTR(block) \ ++ zend_mm_check_ptr(heap, block, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC) ++ ++# define ZEND_MM_SET_MAGIC(block, val) do { \ ++ (block)->magic = (val); \ ++ } while (0) ++ ++# define ZEND_MM_CHECK_MAGIC(block, val) do { \ ++ if ((block)->magic != (val)) { \ ++ zend_mm_panic("zend_mm_heap corrupted"); \ ++ } \ ++ } while (0) ++ ++# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) do { \ ++ ((zend_mm_block_canary*)(block))->debug.filename = __zend_filename; \ ++ ((zend_mm_block_canary*)(block))->debug.lineno = __zend_lineno; \ ++ ((zend_mm_block_canary*)(block))->debug.orig_filename = __zend_orig_filename; \ ++ ((zend_mm_block_canary*)(block))->debug.orig_lineno = __zend_orig_lineno; \ ++ ZEND_MM_SET_BLOCK_SIZE(block, __size); \ ++ if (set_valid) { \ ++ ZEND_MM_SET_MAGIC(block, MEM_BLOCK_VALID); \ ++ } \ ++ if (set_thread) { \ ++ ZEND_MM_SET_THREAD_ID(block); \ ++ } \ ++ } while (0) ++ ++#else ++ ++# define ZEND_MM_VALID_PTR(ptr) EXPECTED(ptr != NULL) ++ ++# define ZEND_MM_SET_MAGIC(block, val) ++ ++# define ZEND_MM_CHECK_MAGIC(block, val) ++ ++# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) ZEND_MM_SET_BLOCK_SIZE(block, __size) ++ ++#endif ++ ++#if SUHOSIN_MM_WITH_CANARY_PROTECTION ++ ++# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \ ++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \ ++ if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \ ++ canary_mismatch: \ ++ zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { (block)->info.canary_1 = heap->canary_1; (block)->info.canary_2 = heap->canary_2; }\ ++ } \ ++ memcpy(&check, p, CANARY_SIZE); \ ++ if (check != heap->canary_3) { \ ++ zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \ ++ } \ ++ } while (0) ++ ++# define SUHOSIN_MM_SET_CANARIES(block) do { \ ++ (block)->info.canary_1 = heap->canary_1; \ ++ (block)->info.canary_2 = heap->canary_2; \ ++ } while (0) ++ ++# define SUHOSIN_MM_END_CANARY_PTR(block) \ ++ (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->info.size + END_MAGIC_SIZE) ++ ++# define SUHOSIN_MM_SET_END_CANARY(block) do { \ ++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); \ ++ memcpy(p, &heap->canary_3, CANARY_SIZE); \ ++ } while (0) ++ ++#else ++ ++# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) ++# define SUHOSIN_MM_SET_CANARIES(block) ++# define SUHOSIN_MM_END_CANARY_PTR(block) ++# define SUHOSIN_MM_SET_END_CANARY(block) ++ ++#endif ++ ++ ++#if ZEND_MM_HEAP_PROTECTION ++ ++# define ZEND_MM_CHECK_PROTECTION(block) \ ++ do { \ ++ if ((block)->debug.start_magic != _mem_block_start_magic || \ ++ memcmp(ZEND_MM_END_MAGIC_PTR(block), &_mem_block_end_magic, END_MAGIC_SIZE) != 0) { \ ++ zend_mm_panic("zend_mm_heap corrupted"); \ ++ } \ ++ } while (0) ++ ++# define ZEND_MM_END_MAGIC_PTR(block) \ ++ (((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->debug.size) ++ ++# define END_MAGIC_SIZE sizeof(unsigned int) ++ ++# define ZEND_MM_SET_BLOCK_SIZE(block, __size) do { \ ++ char *p; \ ++ ((zend_mm_block_canary*)(block))->debug.size = (__size); \ ++ p = ZEND_MM_END_MAGIC_PTR(block); \ ++ ((zend_mm_block_canary*)(block))->debug.start_magic = _mem_block_start_magic; \ ++ memcpy(p, &_mem_block_end_magic, END_MAGIC_SIZE); \ ++ } while (0) ++ ++static unsigned int _mem_block_start_magic = 0; ++static unsigned int _mem_block_end_magic = 0; ++ ++#else ++ ++# if ZEND_DEBUG ++# define ZEND_MM_SET_BLOCK_SIZE(block, _size) \ ++ ((zend_mm_block_canary*)(block))->debug.size = (_size) ++# else ++# define ZEND_MM_SET_BLOCK_SIZE(block, _size) ++# endif ++ ++# define ZEND_MM_CHECK_PROTECTION(block) ++ ++# define END_MAGIC_SIZE 0 ++ ++#endif ++ ++#if ZEND_MM_SAFE_UNLINKING ++# define ZEND_MM_CHECK_BLOCK_LINKAGE(block) \ ++ if (UNEXPECTED((block)->info._size != ZEND_MM_BLOCK_AT(block, ZEND_MM_FREE_BLOCK_SIZE(block))->info._prev) || \ ++ UNEXPECTED(!UNEXPECTED(ZEND_MM_IS_FIRST_BLOCK(block)) && \ ++ UNEXPECTED(ZEND_MM_PREV_BLOCK(block)->info._size != (block)->info._prev))) { \ ++ zend_mm_panic("zend_mm_heap corrupted"); \ ++ } ++#define ZEND_MM_CHECK_TREE(block) \ ++ if (UNEXPECTED(*((block)->parent) != (block))) { \ ++ zend_mm_panic("zend_mm_heap corrupted"); \ ++ } ++#else ++# define ZEND_MM_CHECK_BLOCK_LINKAGE(block) ++# define ZEND_MM_CHECK_TREE(block) ++#endif ++ ++#define ZEND_MM_LARGE_BUCKET_INDEX(S) zend_mm_high_bit(S) ++ ++void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ++void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ++void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ++ ++ ++static inline unsigned int zend_mm_high_bit(size_t _size) ++{ ++#if defined(__GNUC__) && defined(i386) ++ unsigned int n; ++ ++ __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size)); ++ return n; ++#elif defined(__GNUC__) && defined(__x86_64__) ++ unsigned long n; ++ ++ __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); ++ return (unsigned int)n; ++#elif defined(_MSC_VER) && defined(_M_IX86) ++ __asm { ++ bsr eax, _size ++ } ++#else ++ unsigned int n = 0; ++ while (_size != 0) { ++ _size = _size >> 1; ++ n++; ++ } ++ return n-1; ++#endif ++} ++ ++static inline unsigned int zend_mm_low_bit(size_t _size) ++{ ++#if defined(__GNUC__) && defined(i386) ++ unsigned int n; ++ ++ __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size)); ++ return n; ++#elif defined(__GNUC__) && defined(__x86_64__) ++ unsigned long n; ++ ++ __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); ++ return (unsigned int)n; ++#elif defined(_MSC_VER) && defined(_M_IX86) ++ __asm { ++ bsf eax, _size ++ } ++#else ++ static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; ++ unsigned int n; ++ unsigned int index = 0; ++ ++ n = offset[_size & 15]; ++ while (n == 4) { ++ _size >>= 4; ++ index += n; ++ n = offset[_size & 15]; ++ } ++ ++ return index + n; ++#endif ++} ++ ++static void zend_mm_add_to_rest_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) ++{ ++ zend_mm_free_block_canary *prev, *next; ++ ++ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED); ++ ++ if (!ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block))) { ++ mm_block->parent = NULL; ++ } ++ ++ prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); ++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block); ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++} ++ ++static void zend_mm_add_to_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) ++{ ++ size_t size; ++ size_t index; ++ ++ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED); ++ ++ size = ZEND_MM_FREE_BLOCK_SIZE(mm_block); ++ if (EXPECTED(!ZEND_MM_SMALL_SIZE(size))) { ++ zend_mm_free_block_canary **p; ++ ++ index = ZEND_MM_LARGE_BUCKET_INDEX(size); ++ p = &heap->large_free_buckets[index]; ++ mm_block->child[0] = mm_block->child[1] = NULL; ++ if (!*p) { ++ *p = mm_block; ++ mm_block->parent = p; ++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++ heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); ++ } else { ++ size_t m; ++ ++ for (m = size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { ++ zend_mm_free_block_canary *prev = *p; ++ ++ if (ZEND_MM_FREE_BLOCK_SIZE(prev) != size) { ++ p = &prev->child[(m >> (ZEND_MM_NUM_BUCKETS-1)) & 1]; ++ if (!*p) { ++ *p = mm_block; ++ mm_block->parent = p; ++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++ break; ++ } ++ } else { ++ zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(prev->next_free_block); ++ ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ mm_block->parent = NULL; ++ break; ++ } ++ } ++ } ++ } else { ++ zend_mm_free_block_canary *prev, *next; ++ ++ index = ZEND_MM_BUCKET_INDEX(size); ++ ++ prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index); ++ if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) { ++ heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); ++ } ++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block); ++ ++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); ++ } ++} ++ ++static void zend_mm_remove_from_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) ++{ ++ zend_mm_free_block_canary *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); ++ zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block); ++ ++ ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED); ++ ++ if (EXPECTED(prev == mm_block)) { ++ zend_mm_free_block_canary **rp, **cp; ++ ++#if SUHOSIN_PATCH ++ if (next != mm_block) { ++ zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block); ++ _exit(1); ++ } ++#endif ++#if ZEND_MM_SAFE_UNLINKING ++ if (UNEXPECTED(next != mm_block)) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++#endif ++ ++ rp = &mm_block->child[mm_block->child[1] != NULL]; ++ prev = *rp; ++ if (EXPECTED(prev == NULL)) { ++ size_t index = ZEND_MM_LARGE_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block)); ++ ++ ZEND_MM_CHECK_TREE(mm_block); ++ *mm_block->parent = NULL; ++ if (mm_block->parent == &heap->large_free_buckets[index]) { ++ heap->large_free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index); ++ } ++ } else { ++ while (*(cp = &(prev->child[prev->child[1] != NULL])) != NULL) { ++ prev = *cp; ++ rp = cp; ++ } ++ *rp = NULL; ++ ++subst_block: ++ ZEND_MM_CHECK_TREE(mm_block); ++ *mm_block->parent = prev; ++ prev->parent = mm_block->parent; ++ if ((prev->child[0] = mm_block->child[0])) { ++ ZEND_MM_CHECK_TREE(prev->child[0]); ++ prev->child[0]->parent = &prev->child[0]; ++ } ++ if ((prev->child[1] = mm_block->child[1])) { ++ ZEND_MM_CHECK_TREE(prev->child[1]); ++ prev->child[1]->parent = &prev->child[1]; ++ } ++ } ++ } else { ++ ++#if SUHOSIN_PATCH ++ if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) { ++ zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block); ++ _exit(1); ++ } ++#endif ++ ++#if ZEND_MM_SAFE_UNLINKING ++ if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++#endif ++ ++ prev->next_free_block = SUHOSIN_MANGLE_PTR(next); ++ next->prev_free_block = SUHOSIN_MANGLE_PTR(prev); ++ ++ if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) { ++ if (EXPECTED(prev == next)) { ++ size_t index = ZEND_MM_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block)); ++ ++ if (EXPECTED(heap->free_buckets[index*2] == heap->free_buckets[index*2+1])) { ++ heap->free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index); ++ } ++ } ++ } else if (UNEXPECTED(mm_block->parent != NULL)) { ++ goto subst_block; ++ } ++ } ++} ++ ++static void zend_mm_init(zend_mm_heap_canary *heap) ++{ ++ zend_mm_free_block_canary* p; ++ int i; ++ ++ heap->free_bitmap = 0; ++ heap->large_free_bitmap = 0; ++#if ZEND_MM_CACHE ++ heap->cached = 0; ++ memset(heap->cache, 0, sizeof(heap->cache)); ++#endif ++#if ZEND_MM_CACHE_STAT ++ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { ++ heap->cache_stat[i].count = 0; ++ } ++#endif ++ p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); ++ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { ++ p->next_free_block = SUHOSIN_MANGLE_PTR(p); ++ p->prev_free_block = SUHOSIN_MANGLE_PTR(p); ++ p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2); ++ heap->large_free_buckets[i] = NULL; ++ } ++ heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap)); ++#if SUHOSIN_PATCH ++ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { ++ zend_canary(&heap->canary_1, sizeof(heap->canary_1)); ++ zend_canary(&heap->canary_2, sizeof(heap->canary_2)); ++ zend_canary(&heap->canary_3, sizeof(heap->canary_3)); ++ } ++#endif ++} ++ ++static void zend_mm_del_segment(zend_mm_heap_canary *heap, zend_mm_segment *segment) ++{ ++ zend_mm_segment **p = &heap->segments_list; ++ ++ while (*p != segment) { ++ p = &(*p)->next_segment; ++ } ++ *p = segment->next_segment; ++ heap->real_size -= segment->size; ++ ZEND_MM_STORAGE_FREE(segment); ++} ++ ++#if ZEND_MM_CACHE ++static void zend_mm_free_cache(zend_mm_heap_canary *heap) ++{ ++ int i; ++ ++ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { ++ /* SUHOSIN_MANGLE_PTR should NOT affect NULL pointers */ ++ if (heap->cache[i]) { ++ zend_mm_free_block_canary *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]); ++ ++ while (mm_block) { ++ size_t size = ZEND_MM_BLOCK_SIZE(mm_block); ++ zend_mm_free_block_canary *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); ++ zend_mm_block_canary *next_block = ZEND_MM_NEXT_BLOCK(mm_block); ++ ++ heap->cached -= size; ++ ++ if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) { ++ mm_block = (zend_mm_free_block_canary*)ZEND_MM_PREV_BLOCK(mm_block); ++ size += ZEND_MM_FREE_BLOCK_SIZE(mm_block); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block); ++ } ++ if (ZEND_MM_IS_FREE_BLOCK(next_block)) { ++ size += ZEND_MM_FREE_BLOCK_SIZE(next_block); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ } ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size); ++ ++ if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ++ ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_NEXT_BLOCK(mm_block))) { ++ zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE)); ++ } else { ++ zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block); ++ } ++ ++ mm_block = q; ++ } ++ heap->cache[i] = NULL; ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[i].count = 0; ++#endif ++ } ++ } ++} ++#endif ++ ++#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES ++static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */ ++{ ++ size_t i = 0; ++ unsigned char t; ++ ++#ifdef ZEND_WIN32 ++ HCRYPTPROV hCryptProv; ++ int has_context = 0; ++ ++ if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) { ++ /* Could mean that the key container does not exist, let try ++ again by asking for a new one */ ++ if (GetLastError() == NTE_BAD_KEYSET) { ++ if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) { ++ has_context = 1; ++ } ++ } ++ } else { ++ has_context = 1; ++ } ++ if (has_context) { ++ do { ++ BOOL ret = CryptGenRandom(hCryptProv, size, buf); ++ CryptReleaseContext(hCryptProv, 0); ++ if (ret) { ++ while (i < size && buf[i] != 0) { ++ i++; ++ } ++ if (i == size) { ++ return; ++ } ++ } ++ } while (0); ++ } ++#elif defined(HAVE_DEV_URANDOM) ++ int fd = open("/dev/urandom", 0); ++ ++ if (fd >= 0) { ++ if (read(fd, buf, size) == size) { ++ while (i < size && buf[i] != 0) { ++ i++; ++ } ++ if (i == size) { ++ close(fd); ++ return; ++ } ++ } ++ close(fd); ++ } ++#endif ++ t = (unsigned char)getpid(); ++ while (i < size) { ++ do { ++ buf[i] = ((unsigned char)rand()) ^ t; ++ } while (buf[i] == 0); ++ t = buf[i++] << 1; ++ } ++} ++/* }}} */ ++#endif ++ ++ ++/* Notes: ++ * - This function may alter the block_sizes values to match platform alignment ++ * - This function does *not* perform sanity checks on the arguments ++ */ ++zend_mm_heap_canary *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params) ++{ ++ zend_mm_storage *storage; ++ zend_mm_heap_canary *heap; ++ zend_mm_free_block_canary *tmp; ++ ++#if 0 ++ int i; ++ ++ printf("ZEND_MM_ALIGNMENT=%d\n", ZEND_MM_ALIGNMENT); ++ printf("ZEND_MM_ALIGNMENT_LOG2=%d\n", ZEND_MM_ALIGNMENT_LOG2); ++ printf("ZEND_MM_MIN_SIZE=%d\n", ZEND_MM_MIN_SIZE); ++ printf("ZEND_MM_MAX_SMALL_SIZE=%d\n", ZEND_MM_MAX_SMALL_SIZE); ++ printf("ZEND_MM_ALIGNED_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_HEADER_SIZE); ++ printf("ZEND_MM_ALIGNED_FREE_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_FREE_HEADER_SIZE); ++ printf("ZEND_MM_MIN_ALLOC_BLOCK_SIZE=%d\n", ZEND_MM_MIN_ALLOC_BLOCK_SIZE); ++ printf("ZEND_MM_ALIGNED_MIN_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_MIN_HEADER_SIZE); ++ printf("ZEND_MM_ALIGNED_SEGMENT_SIZE=%d\n", ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ for (i = 0; i < ZEND_MM_MAX_SMALL_SIZE; i++) { ++ printf("%3d%c: %3ld %d %2ld\n", i, (i == ZEND_MM_MIN_SIZE?'*':' '), (long)ZEND_MM_TRUE_SIZE(i), ZEND_MM_SMALL_SIZE(ZEND_MM_TRUE_SIZE(i)), (long)ZEND_MM_BUCKET_INDEX(ZEND_MM_TRUE_SIZE(i))); ++ } ++ exit(0); ++#endif ++ ++#if ZEND_MM_HEAP_PROTECTION ++ if (_mem_block_start_magic == 0) { ++ zend_mm_random((unsigned char*)&_mem_block_start_magic, sizeof(_mem_block_start_magic)); ++ } ++ if (_mem_block_end_magic == 0) { ++ zend_mm_random((unsigned char*)&_mem_block_end_magic, sizeof(_mem_block_end_magic)); ++ } ++#endif ++#if ZEND_MM_COOKIES ++ if (_zend_mm_cookie == 0) { ++ zend_mm_random((unsigned char*)&_zend_mm_cookie, sizeof(_zend_mm_cookie)); ++ } ++#endif ++ ++ /* get the pointer guardian and ensure low 3 bits are 1 */ ++ if (SUHOSIN_POINTER_GUARD == 0) { ++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); ++ SUHOSIN_POINTER_GUARD |= 7; ++ } ++ ++ if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) { ++ fprintf(stderr, "'block_size' must be a power of two\n"); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ exit(255); ++ } ++ storage = handlers->init(params); ++ if (!storage) { ++ fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ exit(255); ++ } ++ storage->handlers = handlers; ++ ++ heap = malloc(sizeof(struct _zend_mm_heap_canary)); ++ ++ heap->storage = storage; ++ heap->block_size = block_size; ++ heap->compact_size = 0; ++ heap->segments_list = NULL; ++ zend_mm_init(heap); ++# if ZEND_MM_CACHE_STAT ++ memset(heap->cache_stat, 0, sizeof(heap->cache_stat)); ++# endif ++ ++ heap->use_zend_alloc = 1; ++ heap->real_size = 0; ++ heap->overflow = 0; ++ heap->real_peak = 0; ++ heap->limit = ZEND_MM_LONG_CONST(1)<<(ZEND_MM_NUM_BUCKETS-2); ++ heap->size = 0; ++ heap->peak = 0; ++ heap->internal = internal; ++ heap->reserve = NULL; ++ heap->reserve_size = reserve_size; ++ if (reserve_size > 0) { ++ heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ } ++ if (internal) { ++ int i; ++ zend_mm_free_block_canary *p, *q, *orig; ++ zend_mm_heap_canary *mm_heap = _zend_mm_alloc((zend_mm_heap *)heap, sizeof(zend_mm_heap_canary) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ ++ *mm_heap = *heap; ++ ++ p = ZEND_MM_SMALL_FREE_BUCKET(mm_heap, 0); ++ orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); ++ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { ++ q = p; ++ while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) { ++ q = SUHOSIN_MANGLE_PTR(q->prev_free_block); ++ } ++ q->prev_free_block = SUHOSIN_MANGLE_PTR(p); ++ q = p; ++ while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) { ++ q = SUHOSIN_MANGLE_PTR(q->next_free_block); ++ } ++ q->next_free_block = SUHOSIN_MANGLE_PTR(p); ++ p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2); ++ orig = (zend_mm_free_block_canary*)((char*)orig + sizeof(zend_mm_free_block_canary*) * 2); ++ if (mm_heap->large_free_buckets[i]) { ++ mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i]; ++ } ++ } ++ mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap)); ++ ++ free(heap); ++ heap = mm_heap; ++ } ++ return heap; ++} ++ ++zend_mm_heap_canary *__zend_mm_startup_canary(void) ++{ ++ int i; ++ size_t seg_size; ++ char *mem_type = getenv("ZEND_MM_MEM_TYPE"); ++ char *tmp; ++ const zend_mm_mem_handlers *handlers; ++ zend_mm_heap_canary *heap; ++ ++ if (mem_type == NULL) { ++ i = 0; ++ } else { ++ for (i = 0; mem_handlers[i].name; i++) { ++ if (strcmp(mem_handlers[i].name, mem_type) == 0) { ++ break; ++ } ++ } ++ if (!mem_handlers[i].name) { ++ fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type); ++ fprintf(stderr, " supported types:\n"); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ for (i = 0; mem_handlers[i].name; i++) { ++ fprintf(stderr, " '%s'\n", mem_handlers[i].name); ++ } ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ exit(255); ++ } ++ } ++ handlers = &mem_handlers[i]; ++ ++ tmp = getenv("ZEND_MM_SEG_SIZE"); ++ if (tmp) { ++ seg_size = zend_atoi(tmp, 0); ++ if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) { ++ fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n"); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ exit(255); ++ } else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) { ++ fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n"); ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ exit(255); ++ } ++ } else { ++ seg_size = ZEND_MM_SEG_SIZE; ++ } ++ ++ heap = __zend_mm_startup_canary_ex(handlers, seg_size, ZEND_MM_RESERVE_SIZE, 0, NULL); ++ if (heap) { ++ tmp = getenv("ZEND_MM_COMPACT"); ++ if (tmp) { ++ heap->compact_size = zend_atoi(tmp, 0); ++ } else { ++ heap->compact_size = 2 * 1024 * 1024; ++ } ++ } ++ return heap; ++} ++ ++#if ZEND_DEBUG ++static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block_canary *b) ++{ ++ long leaks = 0; ++ zend_mm_block_canary *p, *q; ++ ++ p = ZEND_MM_NEXT_BLOCK(b); ++ while (1) { ++ if (ZEND_MM_IS_GUARD_BLOCK(p)) { ++ ZEND_MM_CHECK_MAGIC(p, MEM_BLOCK_GUARD); ++ segment = segment->next_segment; ++ if (!segment) { ++ break; ++ } ++ p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ continue; ++ } ++ q = ZEND_MM_NEXT_BLOCK(p); ++ if (q <= p || ++ (char*)q > (char*)segment + segment->size || ++ p->info._size != q->info._prev) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ if (!ZEND_MM_IS_FREE_BLOCK(p)) { ++ if (p->magic == MEM_BLOCK_VALID) { ++ if (p->debug.filename==b->debug.filename && p->debug.lineno==b->debug.lineno) { ++ ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK); ++ leaks++; ++ } ++#if ZEND_MM_CACHE ++ } else if (p->magic == MEM_BLOCK_CACHED) { ++ /* skip it */ ++#endif ++ } else if (p->magic != MEM_BLOCK_LEAK) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ } ++ p = q; ++ } ++ return leaks; ++} ++ ++static void zend_mm_check_leaks(zend_mm_heap_canary *heap TSRMLS_DC) ++{ ++ zend_mm_segment *segment = heap->segments_list; ++ zend_mm_block_canary *p, *q; ++ zend_uint total = 0; ++ ++ if (!segment) { ++ return; ++ } ++ p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ while (1) { ++ q = ZEND_MM_NEXT_BLOCK(p); ++ if (q <= p || ++ (char*)q > (char*)segment + segment->size || ++ p->info._size != q->info._prev) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ if (!ZEND_MM_IS_FREE_BLOCK(p)) { ++ if (p->magic == MEM_BLOCK_VALID) { ++ long repeated; ++ zend_leak_info leak; ++ ++ ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK); ++ ++ leak.addr = ZEND_MM_DATA_OF(p); ++ leak.size = p->debug.size; ++ leak.filename = p->debug.filename; ++ leak.lineno = p->debug.lineno; ++ leak.orig_filename = p->debug.orig_filename; ++ leak.orig_lineno = p->debug.orig_lineno; ++ ++ zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); ++ zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak TSRMLS_CC); ++ repeated = zend_mm_find_leaks(segment, p); ++ total += 1 + repeated; ++ if (repeated) { ++ zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated TSRMLS_CC); ++ } ++#if ZEND_MM_CACHE ++ } else if (p->magic == MEM_BLOCK_CACHED) { ++ /* skip it */ ++#endif ++ } else if (p->magic != MEM_BLOCK_LEAK) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ } ++ if (ZEND_MM_IS_GUARD_BLOCK(q)) { ++ segment = segment->next_segment; ++ if (!segment) { ++ break; ++ } ++ q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ } ++ p = q; ++ } ++ if (total) { ++ zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total TSRMLS_CC); ++ } ++} ++ ++static int zend_mm_check_ptr(zend_mm_heap_canary *heap, void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_block_canary *p; ++ int no_cache_notice = 0; ++ int had_problems = 0; ++ int valid_beginning = 1; ++ ++ if (silent==2) { ++ silent = 1; ++ no_cache_notice = 1; ++ } else if (silent==3) { ++ silent = 0; ++ no_cache_notice = 1; ++ } ++ if (!silent) { ++ TSRMLS_FETCH(); ++ ++ zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); ++ zend_debug_alloc_output("---------------------------------------\n"); ++ zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr); ++ if (__zend_orig_filename) { ++ zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ if (!ptr) { ++ zend_debug_alloc_output("NULL\n"); ++ zend_debug_alloc_output("---------------------------------------\n"); ++ return 0; ++ } ++ } ++ ++ if (!ptr) { ++ if (silent) { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } ++ ++ p = ZEND_MM_HEADER_OF(ptr); ++ ++#ifdef ZTS ++ if (ZEND_MM_BAD_THREAD_ID(p)) { ++ if (!silent) { ++ zend_debug_alloc_output("Invalid pointer: ((thread_id=0x%0.8X) != (expected=0x%0.8X))\n", (long)p->thread_id, (long)tsrm_thread_id()); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } ++#endif ++ ++ if (p->info._size != ZEND_MM_NEXT_BLOCK(p)->info._prev) { ++ if (!silent) { ++ zend_debug_alloc_output("Invalid pointer: ((size="PTR_FMT") != (next.prev="PTR_FMT"))\n", p->info._size, ZEND_MM_NEXT_BLOCK(p)->info._prev); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } ++ if (p->info._prev != ZEND_MM_GUARD_BLOCK && ++ ZEND_MM_PREV_BLOCK(p)->info._size != p->info._prev) { ++ if (!silent) { ++ zend_debug_alloc_output("Invalid pointer: ((prev="PTR_FMT") != (prev.size="PTR_FMT"))\n", p->info._prev, ZEND_MM_PREV_BLOCK(p)->info._size); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } ++ ++ if (had_problems) { ++ zend_debug_alloc_output("---------------------------------------\n"); ++ return 0; ++ } ++ ++ if (!silent) { ++ zend_debug_alloc_output("%10s\t","Beginning: "); ++ } ++ ++ if (!ZEND_MM_IS_USED_BLOCK(p)) { ++ if (!silent) { ++ if (p->magic != MEM_BLOCK_FREED) { ++ zend_debug_alloc_output("Freed (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED); ++ } else { ++ zend_debug_alloc_output("Freed\n"); ++ } ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } else if (ZEND_MM_IS_GUARD_BLOCK(p)) { ++ if (!silent) { ++ if (p->magic != MEM_BLOCK_FREED) { ++ zend_debug_alloc_output("Guard (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED); ++ } else { ++ zend_debug_alloc_output("Guard\n"); ++ } ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } else { ++ switch (p->magic) { ++ case MEM_BLOCK_VALID: ++ case MEM_BLOCK_LEAK: ++ if (!silent) { ++ zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->debug.filename, p->debug.lineno, (int)p->debug.size); ++ } ++ break; /* ok */ ++ case MEM_BLOCK_CACHED: ++ if (!no_cache_notice) { ++ if (!silent) { ++ zend_debug_alloc_output("Cached\n"); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ } ++ case MEM_BLOCK_FREED: ++ if (!silent) { ++ zend_debug_alloc_output("Freed (invalid)\n"); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ break; ++ case MEM_BLOCK_GUARD: ++ if (!silent) { ++ zend_debug_alloc_output("Guard (invalid)\n"); ++ had_problems = 1; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ break; ++ default: ++ if (!silent) { ++ zend_debug_alloc_output("Unknown (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_VALID); ++ had_problems = 1; ++ valid_beginning = 0; ++ } else { ++ return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ break; ++ } ++ } ++ ++#if ZEND_MM_HEAP_PROTECTION ++ if (!valid_beginning) { ++ if (!silent) { ++ zend_debug_alloc_output("%10s\t", "Start:"); ++ zend_debug_alloc_output("Unknown\n"); ++ zend_debug_alloc_output("%10s\t", "End:"); ++ zend_debug_alloc_output("Unknown\n"); ++ } ++ } else { ++ char *end_magic = ZEND_MM_END_MAGIC_PTR(p); ++ ++ if (p->debug.start_magic == _mem_block_start_magic) { ++ if (!silent) { ++ zend_debug_alloc_output("%10s\t", "Start:"); ++ zend_debug_alloc_output("OK\n"); ++ } ++ } else { ++ char *overflow_ptr, *magic_ptr=(char *) &_mem_block_start_magic; ++ int overflows=0; ++ int i; ++ ++ if (silent) { ++ return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ had_problems = 1; ++ overflow_ptr = (char *) &p->debug.start_magic; ++ i = END_MAGIC_SIZE; ++ while (--i >= 0) { ++ if (overflow_ptr[i]!=magic_ptr[i]) { ++ overflows++; ++ } ++ } ++ zend_debug_alloc_output("%10s\t", "Start:"); ++ zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", p->debug.start_magic, _mem_block_start_magic); ++ zend_debug_alloc_output("%10s\t",""); ++ if (overflows >= END_MAGIC_SIZE) { ++ zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE); ++ } else { ++ zend_debug_alloc_output("%d byte(s) overflown\n", overflows); ++ } ++ } ++ if (memcmp(end_magic, &_mem_block_end_magic, END_MAGIC_SIZE)==0) { ++ if (!silent) { ++ zend_debug_alloc_output("%10s\t", "End:"); ++ zend_debug_alloc_output("OK\n"); ++ } ++ } else { ++ char *overflow_ptr, *magic_ptr=(char *) &_mem_block_end_magic; ++ int overflows=0; ++ int i; ++ ++ if (silent) { ++ return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ had_problems = 1; ++ overflow_ptr = (char *) end_magic; ++ ++ for (i=0; i < END_MAGIC_SIZE; i++) { ++ if (overflow_ptr[i]!=magic_ptr[i]) { ++ overflows++; ++ } ++ } ++ ++ zend_debug_alloc_output("%10s\t", "End:"); ++ zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", *end_magic, _mem_block_end_magic); ++ zend_debug_alloc_output("%10s\t",""); ++ if (overflows >= END_MAGIC_SIZE) { ++ zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE); ++ } else { ++ zend_debug_alloc_output("%d byte(s) overflown\n", overflows); ++ } ++ } ++ } ++#endif ++ ++ if (!silent) { ++ zend_debug_alloc_output("---------------------------------------\n"); ++ } ++ return ((!had_problems) ? 1 : 0); ++} ++ ++static int zend_mm_check_heap(zend_mm_heap_canary *heap, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_segment *segment = heap->segments_list; ++ zend_mm_block_canary *p, *q; ++ int errors = 0; ++ ++ if (!segment) { ++ return 0; ++ } ++ p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ while (1) { ++ q = ZEND_MM_NEXT_BLOCK(p); ++ if (q <= p || ++ (char*)q > (char*)segment + segment->size || ++ p->info._size != q->info._prev) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ if (!ZEND_MM_IS_FREE_BLOCK(p)) { ++ if (p->magic == MEM_BLOCK_VALID || p->magic == MEM_BLOCK_LEAK) { ++ if (!zend_mm_check_ptr(heap, ZEND_MM_DATA_OF(p), (silent?2:3) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) { ++ errors++; ++ } ++#if ZEND_MM_CACHE ++ } else if (p->magic == MEM_BLOCK_CACHED) { ++ /* skip it */ ++#endif ++ } else if (p->magic != MEM_BLOCK_LEAK) { ++ zend_mm_panic("zend_mm_heap corrupted"); ++ } ++ } ++ if (ZEND_MM_IS_GUARD_BLOCK(q)) { ++ segment = segment->next_segment; ++ if (!segment) { ++ return errors; ++ } ++ q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ } ++ p = q; ++ } ++} ++#endif ++ ++void __zend_mm_shutdown_canary(zend_mm_heap_canary *heap, int full_shutdown, int silent TSRMLS_DC) ++{ ++ zend_mm_storage *storage; ++ zend_mm_segment *segment; ++ zend_mm_segment *prev; ++ int internal; ++ ++ if (heap->reserve) { ++#if ZEND_DEBUG ++ if (!silent) { ++ _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ } ++#endif ++ heap->reserve = NULL; ++ } ++ ++#if ZEND_MM_CACHE_STAT ++ if (full_shutdown) { ++ FILE *f; ++ ++ f = fopen("zend_mm.log", "w"); ++ if (f) { ++ int i,j; ++ size_t size, true_size, min_size, max_size; ++ int hit = 0, miss = 0; ++ ++ fprintf(f, "\nidx min_size max_size true_size max_len hits misses\n"); ++ size = 0; ++ while (1) { ++ true_size = ZEND_MM_TRUE_SIZE(size); ++ if (ZEND_MM_SMALL_SIZE(true_size)) { ++ min_size = size; ++ i = ZEND_MM_BUCKET_INDEX(true_size); ++ size++; ++ while (1) { ++ true_size = ZEND_MM_TRUE_SIZE(size); ++ if (ZEND_MM_SMALL_SIZE(true_size)) { ++ j = ZEND_MM_BUCKET_INDEX(true_size); ++ if (j > i) { ++ max_size = size-1; ++ break; ++ } ++ } else { ++ max_size = size-1; ++ break; ++ } ++ size++; ++ } ++ hit += heap->cache_stat[i].hit; ++ miss += heap->cache_stat[i].miss; ++ fprintf(f, "%2d %8d %8d %9d %8d %8d %8d\n", i, (int)min_size, (int)max_size, ZEND_MM_TRUE_SIZE(max_size), heap->cache_stat[i].max_count, heap->cache_stat[i].hit, heap->cache_stat[i].miss); ++ } else { ++ break; ++ } ++ } ++ fprintf(f, " %8d %8d\n", hit, miss); ++ fprintf(f, " %8d %8d\n", heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit, heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss); ++ fclose(f); ++ } ++ } ++#endif ++ ++#if ZEND_DEBUG ++ if (!silent) { ++ zend_mm_check_leaks(heap TSRMLS_CC); ++ } ++#endif ++ ++ internal = heap->internal; ++ storage = heap->storage; ++ segment = heap->segments_list; ++ while (segment) { ++ prev = segment; ++ segment = segment->next_segment; ++ ZEND_MM_STORAGE_FREE(prev); ++ } ++ if (full_shutdown) { ++ storage->handlers->dtor(storage); ++ if (!internal) { ++ free(heap); ++ } ++ } else { ++ if (heap->compact_size && ++ heap->real_peak > heap->compact_size) { ++ storage->handlers->compact(storage); ++ } ++ heap->segments_list = NULL; ++ zend_mm_init(heap); ++ heap->real_size = 0; ++ heap->real_peak = 0; ++ heap->size = 0; ++ heap->peak = 0; ++ if (heap->reserve_size) { ++ heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ } ++ heap->overflow = 0; ++ } ++} ++ ++static void zend_mm_safe_error(zend_mm_heap_canary *heap, ++ const char *format, ++ size_t limit, ++#if ZEND_DEBUG ++ const char *filename, ++ uint lineno, ++#endif ++ size_t size) ++{ ++ if (heap->reserve) { ++ _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); ++ heap->reserve = NULL; ++ } ++ if (heap->overflow == 0) { ++ char *error_filename; ++ uint error_lineno; ++ TSRMLS_FETCH(); ++ if (zend_is_compiling(TSRMLS_C)) { ++ error_filename = zend_get_compiled_filename(TSRMLS_C); ++ error_lineno = zend_get_compiled_lineno(TSRMLS_C); ++ } else if (EG(in_execution)) { ++ error_filename = EG(active_op_array)?EG(active_op_array)->filename:NULL; ++ error_lineno = EG(opline_ptr)?(*EG(opline_ptr))->lineno:0; ++ } else { ++ error_filename = NULL; ++ error_lineno = 0; ++ } ++ if (!error_filename) { ++ error_filename = "Unknown"; ++ } ++ heap->overflow = 1; ++ zend_try { ++ zend_error_noreturn(E_ERROR, ++ format, ++ limit, ++#if ZEND_DEBUG ++ filename, ++ lineno, ++#endif ++ size); ++ } zend_catch { ++ if (heap->overflow == 2) { ++ fprintf(stderr, "\nFatal error: "); ++ fprintf(stderr, ++ format, ++ limit, ++#if ZEND_DEBUG ++ filename, ++ lineno, ++#endif ++ size); ++ fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno); ++ } ++/* See http://support.microsoft.com/kb/190351 */ ++#ifdef PHP_WIN32 ++ fflush(stderr); ++#endif ++ } zend_end_try(); ++ } else { ++ heap->overflow = 2; ++ } ++ zend_bailout(); ++} ++ ++static zend_mm_free_block_canary *zend_mm_search_large_block(zend_mm_heap_canary *heap, size_t true_size) ++{ ++ zend_mm_free_block_canary *best_fit; ++ size_t index = ZEND_MM_LARGE_BUCKET_INDEX(true_size); ++ size_t bitmap = heap->large_free_bitmap >> index; ++ zend_mm_free_block_canary *p; ++ ++ if (bitmap == 0) { ++ return NULL; ++ } ++ ++ if (UNEXPECTED((bitmap & 1) != 0)) { ++ /* Search for best "large" free block */ ++ zend_mm_free_block_canary *rst = NULL; ++ size_t m; ++ size_t best_size = -1; ++ ++ best_fit = NULL; ++ p = heap->large_free_buckets[index]; ++ for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { ++ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { ++ return SUHOSIN_MANGLE_PTR(p->next_free_block); ++ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size && ++ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { ++ best_size = ZEND_MM_FREE_BLOCK_SIZE(p); ++ best_fit = p; ++ } ++ if ((m & (ZEND_MM_LONG_CONST(1) << (ZEND_MM_NUM_BUCKETS-1))) == 0) { ++ if (p->child[1]) { ++ rst = p->child[1]; ++ } ++ if (p->child[0]) { ++ p = p->child[0]; ++ } else { ++ break; ++ } ++ } else if (p->child[1]) { ++ p = p->child[1]; ++ } else { ++ break; ++ } ++ } ++ ++ for (p = rst; p; p = p->child[p->child[0] != NULL]) { ++ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { ++ return SUHOSIN_MANGLE_PTR(p->next_free_block); ++ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && ++ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { ++ best_size = ZEND_MM_FREE_BLOCK_SIZE(p); ++ best_fit = p; ++ } ++ } ++ ++ if (best_fit) { ++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); ++ } ++ bitmap = bitmap >> 1; ++ if (!bitmap) { ++ return NULL; ++ } ++ index++; ++ } ++ ++ /* Search for smallest "large" free block */ ++ best_fit = p = heap->large_free_buckets[index + zend_mm_low_bit(bitmap)]; ++ while ((p = p->child[p->child[0] != NULL])) { ++ if (ZEND_MM_FREE_BLOCK_SIZE(p) < ZEND_MM_FREE_BLOCK_SIZE(best_fit)) { ++ best_fit = p; ++ } ++ } ++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); ++} ++ ++void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_free_block_canary *best_fit; ++ size_t true_size = ZEND_MM_TRUE_SIZE(size); ++ size_t block_size; ++ size_t remaining_size; ++ size_t segment_size; ++ zend_mm_segment *segment; ++ int keep_rest = 0; ++ ++ if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) { ++ size_t index = ZEND_MM_BUCKET_INDEX(true_size); ++ size_t bitmap; ++ ++ if (UNEXPECTED(true_size < size)) { ++ goto out_of_memory; ++ } ++#if ZEND_MM_CACHE ++ if (EXPECTED(heap->cache[index] != NULL)) { ++ /* Get block from cache */ ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[index].count--; ++ heap->cache_stat[index].hit++; ++#endif ++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); ++ heap->cache[index] = best_fit->prev_free_block; ++ heap->cached -= true_size; ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block_canary*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif ++ ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); ++ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); ++ return ZEND_MM_DATA_OF(best_fit); ++ } ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[index].miss++; ++#endif ++#endif ++ ++ bitmap = heap->free_bitmap >> index; ++ if (bitmap) { ++ /* Found some "small" free block that can be used */ ++ index += zend_mm_low_bit(bitmap); ++ best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]); ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++; ++#endif ++ goto zend_mm_finished_searching_for_block; ++ } ++ } ++ ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss++; ++#endif ++ ++ best_fit = zend_mm_search_large_block(heap, true_size); ++ ++ if (!best_fit && heap->real_size >= heap->limit - heap->block_size) { ++ zend_mm_free_block_canary *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); ++ size_t best_size = -1; ++ ++ while (p != ZEND_MM_REST_BUCKET(heap)) { ++ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { ++ best_fit = p; ++ goto zend_mm_finished_searching_for_block; ++ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && ++ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { ++ best_size = ZEND_MM_FREE_BLOCK_SIZE(p); ++ best_fit = p; ++ } ++ p = SUHOSIN_MANGLE_PTR(p->prev_free_block); ++ } ++ } ++ ++ if (!best_fit) { ++ if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) { ++ /* Make sure we add a memory block which is big enough, ++ segment must have header "size" and trailer "guard" block */ ++ segment_size = true_size + ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE; ++ segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1); ++ keep_rest = 1; ++ } else { ++ segment_size = heap->block_size; ++ } ++ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ ++ if (segment_size < true_size || ++ heap->real_size + segment_size > heap->limit) { ++ /* Memory limit overflow */ ++#if ZEND_MM_CACHE ++ zend_mm_free_cache(heap); ++#endif ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if ZEND_DEBUG ++ zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %lu bytes)", heap->limit, __zend_filename, __zend_lineno, size); ++#else ++ zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %lu bytes)", heap->limit, size); ++#endif ++ } ++ ++ segment = (zend_mm_segment *) ZEND_MM_STORAGE_ALLOC(segment_size); ++ ++ if (!segment) { ++ /* Storage manager cannot allocate memory */ ++#if ZEND_MM_CACHE ++ zend_mm_free_cache(heap); ++#endif ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++out_of_memory: ++#if ZEND_DEBUG ++ zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %lu bytes)", heap->real_size, __zend_filename, __zend_lineno, size); ++#else ++ zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %lu bytes)", heap->real_size, size); ++#endif ++ return NULL; ++ } ++ ++ heap->real_size += segment_size; ++ if (heap->real_size > heap->real_peak) { ++ heap->real_peak = heap->real_size; ++ } ++ ++ segment->size = segment_size; ++ segment->next_segment = heap->segments_list; ++ heap->segments_list = segment; ++ ++ best_fit = (zend_mm_free_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ ZEND_MM_MARK_FIRST_BLOCK(best_fit); ++ ++ block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE; ++ ++ ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(best_fit, block_size)); ++ ++ } else { ++zend_mm_finished_searching_for_block: ++ /* remove from free list */ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_FREED); ++ ZEND_MM_CHECK_COOKIE(best_fit); ++ ZEND_MM_CHECK_BLOCK_LINKAGE(best_fit); ++ zend_mm_remove_from_free_list(heap, best_fit); ++ ++ block_size = ZEND_MM_FREE_BLOCK_SIZE(best_fit); ++ } ++ ++ remaining_size = block_size - true_size; ++ ++ if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { ++ true_size = block_size; ++ ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size); ++ } else { ++ zend_mm_free_block_canary *new_free_block; ++ ++ /* prepare new free block */ ++ ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size); ++ new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(best_fit, true_size); ++ ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); ++ ++ /* add the new free block to the free list */ ++ if (EXPECTED(!keep_rest)) { ++ zend_mm_add_to_free_list(heap, new_free_block); ++ } else { ++ zend_mm_add_to_rest_list(heap, new_free_block); ++ } ++ } ++ ++ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1); ++ ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block_canary*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif ++ ++ heap->size += true_size; ++ if (heap->peak < heap->size) { ++ heap->peak = heap->size; ++ } ++ ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++ return ZEND_MM_DATA_OF(best_fit); ++} ++ ++ ++void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_block_canary *mm_block; ++ zend_mm_block_canary *next_block; ++ size_t size; ++ ++ if (!ZEND_MM_VALID_PTR(p)) { ++ return; ++ } ++ ++ mm_block = ZEND_MM_HEADER_OF(p); ++ size = ZEND_MM_BLOCK_SIZE(mm_block); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()"); ++#endif ++ ZEND_MM_CHECK_PROTECTION(mm_block); ++ ++#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION ++ memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size); ++#endif ++#if SUHOSIN_PATCH ++ if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) { ++ memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size); ++ } ++#endif ++#if ZEND_MM_CACHE ++ if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) { ++ size_t index = ZEND_MM_BUCKET_INDEX(size); ++ zend_mm_free_block_canary **cache = &heap->cache[index]; ++ ++ ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache; ++ *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block); ++ heap->cached += size; ++ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); ++#if ZEND_MM_CACHE_STAT ++ if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { ++ heap->cache_stat[index].max_count = heap->cache_stat[index].count; ++ } ++#endif ++ return; ++ } ++#endif ++ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ ++ heap->size -= size; ++ ++ next_block = ZEND_MM_BLOCK_AT(mm_block, size); ++ if (ZEND_MM_IS_FREE_BLOCK(next_block)) { ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ size += ZEND_MM_FREE_BLOCK_SIZE(next_block); ++ } ++ if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) { ++ mm_block = ZEND_MM_PREV_BLOCK(mm_block); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block); ++ size += ZEND_MM_FREE_BLOCK_SIZE(mm_block); ++ } ++ if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ++ ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(mm_block, size))) { ++ zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE)); ++ } else { ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size); ++ zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block); ++ } ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++} ++ ++void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_block_canary *mm_block = ZEND_MM_HEADER_OF(p); ++ zend_mm_block_canary *next_block; ++ size_t true_size; ++ size_t orig_size; ++ void *ptr; ++ ++ if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) { ++ return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ } ++ mm_block = ZEND_MM_HEADER_OF(p); ++ true_size = ZEND_MM_TRUE_SIZE(size); ++ orig_size = ZEND_MM_BLOCK_SIZE(mm_block); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()"); ++#endif ++ ZEND_MM_CHECK_PROTECTION(mm_block); ++ ++ if (UNEXPECTED(true_size < size)) { ++ goto out_of_memory; ++ } ++ ++ if (true_size <= orig_size) { ++ size_t remaining_size = orig_size - true_size; ++ ++ if (remaining_size >= ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { ++ zend_mm_free_block_canary *new_free_block; ++ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size); ++ if (ZEND_MM_IS_FREE_BLOCK(next_block)) { ++ remaining_size += ZEND_MM_FREE_BLOCK_SIZE(next_block); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ } ++ ++ /* prepare new free block */ ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); ++ new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); ++ ++ ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); ++ ++ /* add the new free block to the free list */ ++ zend_mm_add_to_free_list(heap, new_free_block); ++ heap->size += (true_size - orig_size); ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++ } ++ ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block_canary*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif ++ return p; ++ } ++ ++#if ZEND_MM_CACHE ++ if (ZEND_MM_SMALL_SIZE(true_size)) { ++ size_t index = ZEND_MM_BUCKET_INDEX(true_size); ++ ++ if (heap->cache[index] != NULL) { ++ zend_mm_free_block_canary *best_fit; ++ zend_mm_free_block_canary **cache; ++ ++#if ZEND_MM_CACHE_STAT ++ heap->cache_stat[index].count--; ++ heap->cache_stat[index].hit++; ++#endif ++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); ++ heap->cache[index] = best_fit->prev_free_block; ++ ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); ++ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(best_fit); ++ ((zend_mm_block_canary*)best_fit)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(best_fit); ++#endif ++ ++ ptr = ZEND_MM_DATA_OF(best_fit); ++ ++#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION ++ memcpy(ptr, p, mm_block->debug.size); ++#else ++ memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); ++#endif ++ ++ heap->cached -= true_size - orig_size; ++ ++ index = ZEND_MM_BUCKET_INDEX(orig_size); ++ cache = &heap->cache[index]; ++ ++ ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache; ++ *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block); ++ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); ++#if ZEND_MM_CACHE_STAT ++ if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { ++ heap->cache_stat[index].max_count = heap->cache_stat[index].count; ++ } ++#endif ++ return ptr; ++ } ++ } ++#endif ++ ++ next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size); ++ ++ if (ZEND_MM_IS_FREE_BLOCK(next_block)) { ++ ZEND_MM_CHECK_COOKIE(next_block); ++ ZEND_MM_CHECK_BLOCK_LINKAGE(next_block); ++ if (orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block) >= true_size) { ++ size_t block_size = orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block); ++ size_t remaining_size = block_size - true_size; ++ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ ++ if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { ++ true_size = block_size; ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); ++ } else { ++ zend_mm_free_block_canary *new_free_block; ++ ++ /* prepare new free block */ ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); ++ new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); ++ ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); ++ ++ /* add the new free block to the free list */ ++ if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ++ ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(new_free_block, remaining_size))) { ++ zend_mm_add_to_rest_list(heap, new_free_block); ++ } else { ++ zend_mm_add_to_free_list(heap, new_free_block); ++ } ++ } ++ ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); ++ heap->size = heap->size + true_size - orig_size; ++ if (heap->peak < heap->size) { ++ heap->peak = heap->size; ++ } ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block_canary*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif ++ return p; ++ } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ++ ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) { ++ HANDLE_BLOCK_INTERRUPTIONS(); ++ zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ goto realloc_segment; ++ } ++ } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ZEND_MM_IS_GUARD_BLOCK(next_block)) { ++ zend_mm_segment *segment; ++ zend_mm_segment *segment_copy; ++ size_t segment_size; ++ size_t block_size; ++ size_t remaining_size; ++ ++ HANDLE_BLOCK_INTERRUPTIONS(); ++realloc_segment: ++ /* segment size, size of block and size of guard block */ ++ if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) { ++ segment_size = true_size+ZEND_MM_ALIGNED_SEGMENT_SIZE+ZEND_MM_ALIGNED_HEADER_SIZE; ++ segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1); ++ } else { ++ segment_size = heap->block_size; ++ } ++ ++ segment_copy = (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ if (segment_size < true_size || ++ heap->real_size + segment_size - segment_copy->size > heap->limit) { ++ if (ZEND_MM_IS_FREE_BLOCK(next_block)) { ++ zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) next_block); ++ } ++#if ZEND_MM_CACHE ++ zend_mm_free_cache(heap); ++#endif ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if ZEND_DEBUG ++ zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %ld bytes)", heap->limit, __zend_filename, __zend_lineno, size); ++#else ++ zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %ld bytes)", heap->limit, size); ++#endif ++ return NULL; ++ } ++ ++ segment = ZEND_MM_STORAGE_REALLOC(segment_copy, segment_size); ++ if (!segment) { ++#if ZEND_MM_CACHE ++ zend_mm_free_cache(heap); ++#endif ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++out_of_memory: ++#if ZEND_DEBUG ++ zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %ld bytes)", heap->real_size, __zend_filename, __zend_lineno, size); ++#else ++ zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %ld bytes)", heap->real_size, size); ++#endif ++ return NULL; ++ } ++ heap->real_size += segment_size - segment->size; ++ if (heap->real_size > heap->real_peak) { ++ heap->real_peak = heap->real_size; ++ } ++ ++ segment->size = segment_size; ++ ++ if (segment != segment_copy) { ++ zend_mm_segment **seg = &heap->segments_list; ++ while (*seg != segment_copy) { ++ seg = &(*seg)->next_segment; ++ } ++ *seg = segment; ++ mm_block = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); ++ ZEND_MM_MARK_FIRST_BLOCK(mm_block); ++ } ++ ++ block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE; ++ remaining_size = block_size - true_size; ++ ++ /* setup guard block */ ++ ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(mm_block, block_size)); ++ ++ if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { ++ true_size = block_size; ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); ++ } else { ++ zend_mm_free_block_canary *new_free_block; ++ ++ /* prepare new free block */ ++ ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); ++ new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); ++ ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); ++ ++ /* add the new free block to the free list */ ++ zend_mm_add_to_rest_list(heap, new_free_block); ++ } ++ ++ ZEND_MM_SET_DEBUG_INFO(mm_block, size, 1, 1); ++ ++ heap->size = heap->size + true_size - orig_size; ++ if (heap->peak < heap->size) { ++ heap->peak = heap->size; ++ } ++ ++ HANDLE_UNBLOCK_INTERRUPTIONS(); ++#if SUHOSIN_PATCH ++ SUHOSIN_MM_SET_CANARIES(mm_block); ++ ((zend_mm_block_canary*)mm_block)->info.size = size; ++ SUHOSIN_MM_SET_END_CANARY(mm_block); ++#endif ++ return ZEND_MM_DATA_OF(mm_block); ++ } ++ ++ ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION ++ memcpy(ptr, p, mm_block->debug.size); ++#else ++ memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); ++#endif ++ _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ++ return ptr; ++} ++ ++ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ++{ ++ zend_mm_block_canary *mm_block; ++ ++ if (!ZEND_MM_VALID_PTR(p)) { ++ return 0; ++ } ++ mm_block = ZEND_MM_HEADER_OF(p); ++ ZEND_MM_CHECK_PROTECTION(mm_block); ++#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION ++ return mm_block->debug.size; ++#else ++ return ZEND_MM_BLOCK_SIZE(mm_block); ++#endif ++} ++ ++#if defined(__GNUC__) && defined(i386) ++ ++static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) ++{ ++ size_t res = nmemb; ++ unsigned long overflow = 0; ++ ++ __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1" ++ : "=&a"(res), "=&d" (overflow) ++ : "%0"(res), ++ "rm"(size), ++ "rm"(offset)); ++ ++ if (UNEXPECTED(overflow)) { ++ zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); ++ return 0; ++ } ++ return res; ++} ++ ++#elif defined(__GNUC__) && defined(__x86_64__) ++ ++static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) ++{ ++ size_t res = nmemb; ++ unsigned long overflow = 0; ++ ++ __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" ++ : "=&a"(res), "=&d" (overflow) ++ : "%0"(res), ++ "rm"(size), ++ "rm"(offset)); ++ ++ if (UNEXPECTED(overflow)) { ++ zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); ++ return 0; ++ } ++ return res; ++} ++ ++#elif SIZEOF_SIZE_T == 4 && defined(HAVE_ZEND_LONG64) ++ ++static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) ++{ ++ zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset; ++ ++ if (UNEXPECTED(res > (zend_ulong64)0xFFFFFFFFL)) { ++ zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); ++ return 0; ++ } ++ return (size_t) res; ++} ++ ++#else ++ ++static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) ++{ ++ size_t res = nmemb * size + offset; ++ double _d = (double)nmemb * (double)size + (double)offset; ++ double _delta = (double)res - _d; ++ ++ if (UNEXPECTED((_d + _delta ) != _d)) { ++ zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); ++ return 0; ++ } ++ return res; ++} ++#endif ++ ++/* ++ * Local variables: ++ * tab-width: 4 ++ * c-basic-offset: 4 ++ * indent-tabs-mode: t ++ * End: ++ */ ++ +--- /dev/null ++++ b/Zend/zend_canary.c +@@ -0,0 +1,66 @@ ++/* ++ +----------------------------------------------------------------------+ ++ | Suhosin-Patch for PHP | ++ +----------------------------------------------------------------------+ ++ | Copyright (c) 2004-2009 Stefan Esser | ++ +----------------------------------------------------------------------+ ++ | This source file is subject to version 2.02 of the PHP license, | ++ | that is bundled with this package in the file LICENSE, and is | ++ | available at through the world-wide-web at | ++ | http://www.php.net/license/2_02.txt. | ++ | If you did not receive a copy of the PHP license and are unable to | ++ | obtain it through the world-wide-web, please send a note to | ++ | license@php.net so we can mail you a copy immediately. | ++ +----------------------------------------------------------------------+ ++ | Author: Stefan Esser | ++ +----------------------------------------------------------------------+ ++ */ ++/* $Id: zend_canary.c,v 1.1 2004/11/26 12:45:41 ionic Exp $ */ ++ ++#include "zend.h" ++ ++#include ++#include ++ ++ ++#if SUHOSIN_PATCH ++ ++static size_t last_canary = 0x73625123; ++ ++/* will be replaced later with more compatible method */ ++ZEND_API void zend_canary(void *buf, int len) ++{ ++ time_t t; ++ size_t canary; ++ int fd; ++ ++#ifndef PHP_WIN32 ++ fd = open("/dev/urandom", 0); ++ if (fd != -1) { ++ int r = read(fd, buf, len); ++ close(fd); ++ if (r == len) { ++ return; ++ } ++ } ++#endif ++ /* not good but we never want to do this */ ++ time(&t); ++ canary = *(unsigned int *)&t + getpid() << 16 + last_canary; ++ last_canary ^= (canary << 5) | (canary >> (32-5)); ++ /* When we ensure full win32 compatibility in next version ++ we will replace this with the random number code from zend_alloc.c */ ++ memcpy(buf, &canary, len); ++} ++ ++#endif ++ ++ ++/* ++ * Local variables: ++ * tab-width: 4 ++ * c-basic-offset: 4 ++ * End: ++ * vim600: sw=4 ts=4 fdm=marker ++ * vim<600: sw=4 ts=4 ++ */ +--- a/Zend/zend_compile.c ++++ b/Zend/zend_compile.c +@@ -73,6 +73,11 @@ static void zend_destroy_property_info_i + } + /* }}} */ + ++#if SUHOSIN_PATCH ++void *suhosin_zend_destroy_property_info_internal = zend_destroy_property_info_internal; ++void *suhosin_zend_destroy_property_info = zend_destroy_property_info; ++#endif ++ + static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */ + { + char char_pos_buf[32]; +--- a/Zend/zend_compile.h ++++ b/Zend/zend_compile.h +@@ -606,6 +606,11 @@ ZEND_API zend_bool zend_is_auto_global(c + ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC); + ZEND_API size_t zend_dirname(char *path, size_t len); + ++#if SUHOSIN_PATCH ++extern void *suhosin_zend_destroy_property_info_internal; ++extern void *suhosin_zend_destroy_property_info; ++#endif ++ + int zendlex(znode *zendlval TSRMLS_DC); + + /* BEGIN: OPCODES */ +--- a/Zend/zend_constants.c ++++ b/Zend/zend_constants.c +@@ -115,6 +115,76 @@ void zend_register_standard_constants(TS + + REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_PROVIDE_OBJECT", DEBUG_BACKTRACE_PROVIDE_OBJECT, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_IGNORE_ARGS", DEBUG_BACKTRACE_IGNORE_ARGS, CONST_PERSISTENT | CONST_CS); ++#if SUHOSIN_PATCH ++ REGISTER_MAIN_LONG_CONSTANT("S_MEMORY", S_MEMORY, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_VARS", S_VARS, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_FILES", S_FILES, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_INCLUDE", S_INCLUDE, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_SQL", S_SQL, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_EXECUTOR", S_EXECUTOR, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_MAIL", S_MAIL, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_SESSION", S_SESSION, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_MISC", S_MISC, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_INTERNAL", S_INTERNAL, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_LONG_CONSTANT("S_ALL", S_ALL, CONST_PERSISTENT | CONST_CS); ++ ++ /* error levels */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_DEBUG", LOG_DEBUG, CONST_CS | CONST_PERSISTENT); ++ /* facility: type of program logging the message */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_KERN", LOG_KERN, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_USER", LOG_USER, CONST_CS | CONST_PERSISTENT); /* generic user level */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_MAIL", LOG_MAIL, CONST_CS | CONST_PERSISTENT); /* log to email */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_DAEMON", LOG_DAEMON, CONST_CS | CONST_PERSISTENT); /* other system daemons */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_AUTH", LOG_AUTH, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_SYSLOG", LOG_SYSLOG, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LPR", LOG_LPR, CONST_CS | CONST_PERSISTENT); ++#ifdef LOG_NEWS ++ /* No LOG_NEWS on HP-UX */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_NEWS", LOG_NEWS, CONST_CS | CONST_PERSISTENT); /* usenet new */ ++#endif ++#ifdef LOG_UUCP ++ /* No LOG_UUCP on HP-UX */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_UUCP", LOG_UUCP, CONST_CS | CONST_PERSISTENT); ++#endif ++#ifdef LOG_CRON ++ /* apparently some systems don't have this one */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_CRON", LOG_CRON, CONST_CS | CONST_PERSISTENT); ++#endif ++#ifdef LOG_AUTHPRIV ++ /* AIX doesn't have LOG_AUTHPRIV */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT); ++#endif ++#ifndef PHP_WIN32 ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL3", LOG_LOCAL3, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL4", LOG_LOCAL4, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL5", LOG_LOCAL5, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL6", LOG_LOCAL6, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL7", LOG_LOCAL7, CONST_CS | CONST_PERSISTENT); ++#endif ++ /* options */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_PID", LOG_PID, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT); ++ REGISTER_MAIN_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT); ++#ifdef LOG_NOWAIT ++ REGISTER_MAIN_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT); ++#endif ++#ifdef LOG_PERROR ++ /* AIX doesn't have LOG_PERROR */ ++ REGISTER_MAIN_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/ ++#endif ++#endif ++ + /* true/false constants */ + { + zend_constant c; +--- a/Zend/zend_errors.h ++++ b/Zend/zend_errors.h +@@ -41,6 +41,20 @@ + #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED) + #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) + ++#if SUHOSIN_PATCH ++#define S_MEMORY (1<<0L) ++#define S_MISC (1<<1L) ++#define S_VARS (1<<2L) ++#define S_FILES (1<<3L) ++#define S_INCLUDE (1<<4L) ++#define S_SQL (1<<5L) ++#define S_EXECUTOR (1<<6L) ++#define S_MAIL (1<<7L) ++#define S_SESSION (1<<8L) ++#define S_INTERNAL (1<<29L) ++#define S_ALL (S_MEMORY | S_VARS | S_INCLUDE | S_FILES | S_MAIL | S_SESSION | S_MISC | S_SQL | S_EXECUTOR) ++#endif ++ + #endif /* ZEND_ERRORS_H */ + + /* +--- a/Zend/zend_hash.c ++++ b/Zend/zend_hash.c +@@ -20,6 +20,7 @@ + /* $Id: zend_hash.c 306939 2011-01-01 02:19:59Z felipe $ */ + + #include "zend.h" ++#include "zend_compile.h" + + #define CONNECT_TO_BUCKET_DLLIST(element, list_head) \ + (element)->pNext = (list_head); \ +@@ -136,6 +137,199 @@ ZEND_API ulong zend_hash_func(const char + } + + ++#if SUHOSIN_PATCH ++#ifdef ZTS ++static MUTEX_T zend_hash_dprot_mx_reader; ++static MUTEX_T zend_hash_dprot_mx_writer; ++static unsigned int zend_hash_dprot_reader; ++#endif ++static unsigned int zend_hash_dprot_counter; ++static unsigned int zend_hash_dprot_curmax; ++static dtor_func_t *zend_hash_dprot_table = NULL; ++ ++static void zend_hash_dprot_begin_read() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_hash_dprot_mx_reader); ++ if ((++(zend_hash_dprot_reader)) == 1) { ++ tsrm_mutex_lock(zend_hash_dprot_mx_writer); ++ } ++ tsrm_mutex_unlock(zend_hash_dprot_mx_reader); ++#endif ++} ++ ++static void zend_hash_dprot_end_read() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_hash_dprot_mx_reader); ++ if ((--(zend_hash_dprot_reader)) == 0) { ++ tsrm_mutex_unlock(zend_hash_dprot_mx_writer); ++ } ++ tsrm_mutex_unlock(zend_hash_dprot_mx_reader); ++#endif ++} ++ ++static void zend_hash_dprot_begin_write() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_hash_dprot_mx_writer); ++#endif ++} ++ ++static void zend_hash_dprot_end_write() ++{ ++#ifdef ZTS ++ tsrm_mutex_unlock(zend_hash_dprot_mx_writer); ++#endif ++} ++ ++/*ZEND_API void zend_hash_dprot_dtor() ++{ ++#ifdef ZTS ++ tsrm_mutex_free(zend_hash_dprot_mx_reader); ++ tsrm_mutex_free(zend_hash_dprot_mx_writer); ++#endif ++ free(zend_hash_dprot_table); ++}*/ ++ ++static void zend_hash_add_destructor(dtor_func_t pDestructor) ++{ ++ int left, right, mid; ++ zend_bool found = 0; ++ unsigned long value; ++ ++ if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR ++ || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) { ++ return; ++ } ++ ++ if (zend_hash_dprot_table == NULL) { ++#ifdef ZTS ++ zend_hash_dprot_mx_reader = tsrm_mutex_alloc(); ++ zend_hash_dprot_mx_writer = tsrm_mutex_alloc(); ++ zend_hash_dprot_reader = 0; ++#endif ++ zend_hash_dprot_counter = 0; ++ zend_hash_dprot_curmax = 256; ++ zend_hash_dprot_table = (dtor_func_t *) malloc(256 * sizeof(dtor_func_t)); ++ } ++ ++ zend_hash_dprot_begin_write(); ++ ++ if (zend_hash_dprot_counter == 0) { ++ zend_hash_dprot_counter++; ++ zend_hash_dprot_table[0] = pDestructor; ++ } else { ++ value = (unsigned long) pDestructor; ++ left = 0; ++ right = zend_hash_dprot_counter-1; ++ mid = 0; ++ ++ while (left < right) { ++ mid = (right - left) >> 1; ++ mid += left; ++ if ((unsigned long)zend_hash_dprot_table[mid] == value) { ++ found = 1; ++ break; ++ } ++ if (value < (unsigned long)zend_hash_dprot_table[mid]) { ++ right = mid-1; ++ } else { ++ left = mid+1; ++ } ++ } ++ if ((unsigned long)zend_hash_dprot_table[left] == value) { ++ found = 1; ++ } ++ ++ if (!found) { ++ ++ if (zend_hash_dprot_counter >= zend_hash_dprot_curmax) { ++ zend_hash_dprot_curmax += 256; ++ zend_hash_dprot_table = (dtor_func_t *) realloc(zend_hash_dprot_table, zend_hash_dprot_curmax * sizeof(dtor_func_t)); ++ } ++ ++ if ((unsigned long)zend_hash_dprot_table[left] < value) { ++ memmove(zend_hash_dprot_table+left+2, zend_hash_dprot_table+left+1, (zend_hash_dprot_counter-left-1)*sizeof(dtor_func_t)); ++ zend_hash_dprot_table[left+1] = pDestructor; ++ } else { ++ memmove(zend_hash_dprot_table+left+1, zend_hash_dprot_table+left, (zend_hash_dprot_counter-left)*sizeof(dtor_func_t)); ++ zend_hash_dprot_table[left] = pDestructor; ++ } ++ ++ zend_hash_dprot_counter++; ++ } ++ } ++ ++ zend_hash_dprot_end_write(); ++} ++ ++static void zend_hash_check_destructor(dtor_func_t pDestructor) ++{ ++ unsigned long value; ++ ++ if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR ++#ifdef ZEND_ENGINE_2 ++ || pDestructor == suhosin_zend_destroy_property_info_internal || pDestructor == suhosin_zend_destroy_property_info ++#endif ++ || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) { ++ return; ++ } ++ ++ zend_hash_dprot_begin_read(); ++ ++ if (zend_hash_dprot_counter > 0) { ++ int left, right, mid; ++ zend_bool found = 0; ++ ++ value = (unsigned long) pDestructor; ++ left = 0; ++ right = zend_hash_dprot_counter-1; ++ ++ while (left < right) { ++ mid = (right - left) >> 1; ++ mid += left; ++ if ((unsigned long)zend_hash_dprot_table[mid] == value) { ++ found = 1; ++ break; ++ } ++ if (value < (unsigned long)zend_hash_dprot_table[mid]) { ++ right = mid-1; ++ } else { ++ left = mid+1; ++ } ++ } ++ if ((unsigned long)zend_hash_dprot_table[left] == value) { ++ found = 1; ++ } ++ ++ if (!found) { ++ zend_hash_dprot_end_read(); ++ ++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor"); ++ if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) { ++ _exit(1); ++ } ++ return; ++ } ++ ++ } else { ++ zend_hash_dprot_end_read(); ++ ++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor"); ++ if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) { ++ _exit(1); ++ } ++ return; ++ } ++ ++ zend_hash_dprot_end_read(); ++} ++ ++#else ++#define zend_hash_add_destructor(pDestructor) do {} while(0) ++#define zend_hash_check_destructor(pDestructor) do {} while(0) ++#endif + + ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC) + { +@@ -156,6 +350,7 @@ ZEND_API int _zend_hash_init(HashTable * + + ht->nTableMask = ht->nTableSize - 1; + ht->pDestructor = pDestructor; ++ zend_hash_add_destructor(pDestructor); + ht->arBuckets = NULL; + ht->pListHead = NULL; + ht->pListTail = NULL; +@@ -233,6 +428,7 @@ ZEND_API int _zend_hash_add_or_update(Ha + return FAILURE; + } + #endif ++ zend_hash_check_destructor(ht->pDestructor); + if (ht->pDestructor) { + ht->pDestructor(p->pData); + } +@@ -298,6 +494,7 @@ ZEND_API int _zend_hash_quick_add_or_upd + return FAILURE; + } + #endif ++ zend_hash_check_destructor(ht->pDestructor); + if (ht->pDestructor) { + ht->pDestructor(p->pData); + } +@@ -373,6 +570,7 @@ ZEND_API int _zend_hash_index_update_or_ + return FAILURE; + } + #endif ++ zend_hash_check_destructor(ht->pDestructor); + if (ht->pDestructor) { + ht->pDestructor(p->pData); + } +@@ -496,6 +694,7 @@ ZEND_API int zend_hash_del_key_or_index( + if (ht->pInternalPointer == p) { + ht->pInternalPointer = p->pListNext; + } ++ zend_hash_check_destructor(ht->pDestructor); + if (ht->pDestructor) { + ht->pDestructor(p->pData); + } +@@ -522,6 +721,7 @@ ZEND_API void zend_hash_destroy(HashTabl + SET_INCONSISTENT(HT_IS_DESTROYING); + + p = ht->pListHead; ++ zend_hash_check_destructor(ht->pDestructor); + while (p != NULL) { + q = p; + p = p->pListNext; +@@ -548,6 +748,7 @@ ZEND_API void zend_hash_clean(HashTable + SET_INCONSISTENT(HT_CLEANING); + + p = ht->pListHead; ++ zend_hash_check_destructor(ht->pDestructor); + while (p != NULL) { + q = p; + p = p->pListNext; +@@ -610,6 +811,7 @@ static Bucket *zend_hash_apply_deleter(H + ht->nNumOfElements--; + HANDLE_UNBLOCK_INTERRUPTIONS(); + ++ zend_hash_check_destructor(ht->pDestructor); + if (ht->pDestructor) { + ht->pDestructor(p->pData); + } +--- a/Zend/zend_llist.c ++++ b/Zend/zend_llist.c +@@ -23,6 +23,194 @@ + #include "zend_llist.h" + #include "zend_qsort.h" + ++#if SUHOSIN_PATCH ++#ifdef ZTS ++static MUTEX_T zend_llist_dprot_mx_reader; ++static MUTEX_T zend_llist_dprot_mx_writer; ++static unsigned int zend_llist_dprot_reader; ++#endif ++static unsigned int zend_llist_dprot_counter; ++static unsigned int zend_llist_dprot_curmax; ++static llist_dtor_func_t *zend_llist_dprot_table = NULL; ++ ++static void zend_llist_dprot_begin_read() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_llist_dprot_mx_reader); ++ if ((++(zend_llist_dprot_reader)) == 1) { ++ tsrm_mutex_lock(zend_llist_dprot_mx_writer); ++ } ++ tsrm_mutex_unlock(zend_llist_dprot_mx_reader); ++#endif ++} ++ ++static void zend_llist_dprot_end_read() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_llist_dprot_mx_reader); ++ if ((--(zend_llist_dprot_reader)) == 0) { ++ tsrm_mutex_unlock(zend_llist_dprot_mx_writer); ++ } ++ tsrm_mutex_unlock(zend_llist_dprot_mx_reader); ++#endif ++} ++ ++static void zend_llist_dprot_begin_write() ++{ ++#ifdef ZTS ++ tsrm_mutex_lock(zend_llist_dprot_mx_writer); ++#endif ++} ++ ++static void zend_llist_dprot_end_write() ++{ ++#ifdef ZTS ++ tsrm_mutex_unlock(zend_llist_dprot_mx_writer); ++#endif ++} ++ ++/*ZEND_API void zend_llist_dprot_dtor() ++{ ++#ifdef ZTS ++ tsrm_mutex_free(zend_llist_dprot_mx_reader); ++ tsrm_mutex_free(zend_llist_dprot_mx_writer); ++#endif ++ free(zend_llist_dprot_table); ++}*/ ++ ++static void zend_llist_add_destructor(llist_dtor_func_t pDestructor) ++{ ++ int left, right, mid; ++ zend_bool found = 0; ++ unsigned long value; ++ ++ if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) { ++ return; ++ } ++ ++ if (zend_llist_dprot_table == NULL) { ++#ifdef ZTS ++ zend_llist_dprot_mx_reader = tsrm_mutex_alloc(); ++ zend_llist_dprot_mx_writer = tsrm_mutex_alloc(); ++ zend_llist_dprot_reader = 0; ++#endif ++ zend_llist_dprot_counter = 0; ++ zend_llist_dprot_curmax = 256; ++ zend_llist_dprot_table = (llist_dtor_func_t *) malloc(256 * sizeof(llist_dtor_func_t)); ++ } ++ ++ zend_llist_dprot_begin_write(); ++ ++ if (zend_llist_dprot_counter == 0) { ++ zend_llist_dprot_counter++; ++ zend_llist_dprot_table[0] = pDestructor; ++ } else { ++ value = (unsigned long) pDestructor; ++ left = 0; ++ right = zend_llist_dprot_counter-1; ++ mid = 0; ++ ++ while (left < right) { ++ mid = (right - left) >> 1; ++ mid += left; ++ if ((unsigned long)zend_llist_dprot_table[mid] == value) { ++ found = 1; ++ break; ++ } ++ if (value < (unsigned long)zend_llist_dprot_table[mid]) { ++ right = mid-1; ++ } else { ++ left = mid+1; ++ } ++ } ++ if ((unsigned long)zend_llist_dprot_table[left] == value) { ++ found = 1; ++ } ++ ++ if (!found) { ++ ++ if (zend_llist_dprot_counter >= zend_llist_dprot_curmax) { ++ zend_llist_dprot_curmax += 256; ++ zend_llist_dprot_table = (llist_dtor_func_t *) realloc(zend_llist_dprot_table, zend_llist_dprot_curmax * sizeof(llist_dtor_func_t)); ++ } ++ ++ if ((unsigned long)zend_llist_dprot_table[left] < value) { ++ memmove(zend_llist_dprot_table+left+2, zend_llist_dprot_table+left+1, (zend_llist_dprot_counter-left-1)*sizeof(llist_dtor_func_t)); ++ zend_llist_dprot_table[left+1] = pDestructor; ++ } else { ++ memmove(zend_llist_dprot_table+left+1, zend_llist_dprot_table+left, (zend_llist_dprot_counter-left)*sizeof(llist_dtor_func_t)); ++ zend_llist_dprot_table[left] = pDestructor; ++ } ++ ++ zend_llist_dprot_counter++; ++ } ++ } ++ ++ zend_llist_dprot_end_write(); ++} ++ ++static void zend_llist_check_destructor(llist_dtor_func_t pDestructor) ++{ ++ unsigned long value; ++ ++ if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) { ++ return; ++ } ++ ++ zend_llist_dprot_begin_read(); ++ ++ if (zend_llist_dprot_counter > 0) { ++ int left, right, mid; ++ zend_bool found = 0; ++ ++ value = (unsigned long) pDestructor; ++ left = 0; ++ right = zend_llist_dprot_counter-1; ++ ++ while (left < right) { ++ mid = (right - left) >> 1; ++ mid += left; ++ if ((unsigned long)zend_llist_dprot_table[mid] == value) { ++ found = 1; ++ break; ++ } ++ if (value < (unsigned long)zend_llist_dprot_table[mid]) { ++ right = mid-1; ++ } else { ++ left = mid+1; ++ } ++ } ++ if ((unsigned long)zend_llist_dprot_table[left] == value) { ++ found = 1; ++ } ++ ++ if (!found) { ++ zend_llist_dprot_end_read(); ++ ++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor"); ++ if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) { ++ _exit(1); ++ } ++ return; ++ } ++ ++ } else { ++ zend_llist_dprot_end_read(); ++ ++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor"); ++ if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) { ++ _exit(1); ++ } ++ return; ++ } ++ ++ zend_llist_dprot_end_read(); ++} ++#else ++#define zend_llist_add_destructor(pDestructor) do {} while(0) ++#define zend_llist_check_destructor(pDestructor) do {} while(0) ++#endif ++ + ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent) + { + l->head = NULL; +@@ -30,6 +218,7 @@ ZEND_API void zend_llist_init(zend_llist + l->count = 0; + l->size = size; + l->dtor = dtor; ++ zend_llist_add_destructor(dtor); + l->persistent = persistent; + } + +@@ -81,6 +270,7 @@ ZEND_API void zend_llist_prepend_element + } else {\ + (l)->tail = (current)->prev;\ + }\ ++ zend_llist_check_destructor((l)->dtor); \ + if ((l)->dtor) {\ + (l)->dtor((current)->data);\ + }\ +@@ -108,6 +298,7 @@ ZEND_API void zend_llist_destroy(zend_ll + { + zend_llist_element *current=l->head, *next; + ++ zend_llist_check_destructor(l->dtor); + while (current) { + next = current->next; + if (l->dtor) { +@@ -133,6 +324,7 @@ ZEND_API void *zend_llist_remove_tail(ze + zend_llist_element *old_tail; + void *data; + ++ zend_llist_check_destructor((l)->dtor); + if ((old_tail = l->tail)) { + if (old_tail->prev) { + old_tail->prev->next = NULL; +--- a/Zend/zend_operators.c ++++ b/Zend/zend_operators.c +@@ -153,9 +153,14 @@ ZEND_API void convert_scalar_to_number(z + case IS_STRING: + { + char *strval; ++ int strl; + + strval = Z_STRVAL_P(op); +- if ((Z_TYPE_P(op)=is_numeric_string(strval, Z_STRLEN_P(op), &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) { ++ strl = Z_STRLEN_P(op); ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif ++ if ((Z_TYPE_P(op)=is_numeric_string(strval, strl, &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) { + ZVAL_LONG(op, 0); + } + STR_FREE(strval); +@@ -187,7 +192,8 @@ ZEND_API void convert_scalar_to_number(z + } else { \ + switch (Z_TYPE_P(op)) { \ + case IS_STRING: \ +- { \ ++ { \ ++ Z_STRLEN(holder) = 0; \ + if ((Z_TYPE(holder)=is_numeric_string(Z_STRVAL_P(op), Z_STRLEN_P(op), &Z_LVAL(holder), &Z_DVAL(holder), 1)) == 0) { \ + ZVAL_LONG(&(holder), 0); \ + } \ +@@ -229,6 +235,7 @@ ZEND_API void convert_scalar_to_number(z + Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \ + break; \ + case IS_STRING: \ ++ Z_STRLEN(holder) = 0; \ + Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \ + break; \ + case IS_ARRAY: \ +@@ -271,6 +278,7 @@ ZEND_API void convert_scalar_to_number(z + Z_LVAL(holder) = (Z_DVAL_P(op) ? 1 : 0); \ + break; \ + case IS_STRING: \ ++ Z_STRLEN(holder) = 0; \ + if (Z_STRLEN_P(op) == 0 \ + || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { \ + Z_LVAL(holder) = 0; \ +@@ -356,6 +364,9 @@ ZEND_API void convert_to_long_base(zval + { + char *strval = Z_STRVAL_P(op); + ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif + Z_LVAL_P(op) = strtol(strval, NULL, base); + STR_FREE(strval); + } +@@ -416,6 +427,9 @@ ZEND_API void convert_to_double(zval *op + { + char *strval = Z_STRVAL_P(op); + ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif + Z_DVAL_P(op) = zend_strtod(strval, NULL); + STR_FREE(strval); + } +@@ -502,8 +516,14 @@ ZEND_API void convert_to_boolean(zval *o + + if (Z_STRLEN_P(op) == 0 + || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif + Z_LVAL_P(op) = 0; + } else { ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif + Z_LVAL_P(op) = 1; + } + STR_FREE(strval); +@@ -617,6 +637,9 @@ static void convert_scalar_to_array(zval + *entry = *op; + INIT_PZVAL(entry); + ++#if SUHOSIN_PATCH ++ Z_STRLEN_P(op) = 0; ++#endif + switch (type) { + case IS_ARRAY: + ALLOC_HASHTABLE(Z_ARRVAL_P(op)); +--- a/Zend/zend_variables.c ++++ b/Zend/zend_variables.c +@@ -34,6 +34,9 @@ ZEND_API void _zval_dtor_func(zval *zval + case IS_CONSTANT: + CHECK_ZVAL_STRING_REL(zvalue); + STR_FREE_REL(zvalue->value.str.val); ++#if SUHOSIN_PATCH ++ zvalue->value.str.len = 0; ++#endif + break; + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { +@@ -78,6 +81,9 @@ ZEND_API void _zval_internal_dtor(zval * + case IS_CONSTANT: + CHECK_ZVAL_STRING_REL(zvalue); + free(zvalue->value.str.val); ++#if SUHOSIN_PATCH ++ zvalue->value.str.len = 0; ++#endif + break; + case IS_ARRAY: + case IS_CONSTANT_ARRAY: +--- a/configure.in ++++ b/configure.in +@@ -289,6 +289,7 @@ sinclude(Zend/Zend.m4) + sinclude(TSRM/threads.m4) + sinclude(TSRM/tsrm.m4) + ++sinclude(main/suhosin_patch.m4) + + dnl divert(2) + +@@ -1399,7 +1400,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c + php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ + strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ + network.c php_open_temporary_file.c php_logos.c \ +- output.c getopt.c) ++ output.c getopt.c suhosin_patch.c ) + + PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ + plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \ +@@ -1427,7 +1428,7 @@ PHP_ADD_SOURCES(Zend, \ + zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ + zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ + zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ +- zend_closures.c zend_float.c) ++ zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ) + + if test -r "$abs_srcdir/Zend/zend_objects.c"; then + PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c) +--- a/ext/standard/dl.c ++++ b/ext/standard/dl.c +@@ -249,6 +249,23 @@ PHPAPI int php_load_extension(char *file + return FAILURE; + } + } ++ ++#if SUHOSIN_PATCH ++ if (strncmp("suhosin", module_entry->name, sizeof("suhosin")-1) == 0) { ++ void *log_func; ++ /* sucessfully loaded suhosin extension, now check for logging function replacement */ ++ log_func = (void *) DL_FETCH_SYMBOL(handle, "suhosin_log"); ++ if (log_func == NULL) { ++ log_func = (void *) DL_FETCH_SYMBOL(handle, "_suhosin_log"); ++ } ++ if (log_func != NULL) { ++ zend_suhosin_log = log_func; ++ } else { ++ zend_suhosin_log(S_MISC, "could not replace logging function"); ++ } ++ } ++#endif ++ + return SUCCESS; + } + /* }}} */ +--- a/ext/standard/info.c ++++ b/ext/standard/info.c +@@ -878,6 +878,33 @@ PHPAPI void php_print_info(int flag TSRM + + php_info_print_table_end(); + ++ /* Suhosin Patch */ ++ php_info_print_box_start(0); ++ if (expose_php && !sapi_module.phpinfo_as_text) { ++ PUTS("\"Suhosin\n"); ++ } ++ PUTS("This server is protected with the Suhosin Patch "); ++ if (sapi_module.phpinfo_as_text) { ++ PUTS(SUHOSIN_PATCH_VERSION); ++ } else { ++ zend_html_puts(SUHOSIN_PATCH_VERSION, strlen(SUHOSIN_PATCH_VERSION) TSRMLS_CC); ++ } ++ PUTS(!sapi_module.phpinfo_as_text?"
":"\n"); ++ if (sapi_module.phpinfo_as_text) { ++ PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n"); ++ PUTS("Copyright (c) 2007-2009 SektionEins GmbH\n"); ++ } else { ++ PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n"); ++ PUTS("Copyright (c) 2007-2009 SektionEins GmbH\n"); ++ } ++ php_info_print_box_end(); ++ + /* Zend Engine */ + php_info_print_box_start(0); + if (expose_php && !sapi_module.phpinfo_as_text) { +--- a/ext/standard/syslog.c ++++ b/ext/standard/syslog.c +@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D); + */ + PHP_MINIT_FUNCTION(syslog) + { ++#if !SUHOSIN_PATCH + /* error levels */ + REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ + REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ +@@ -97,6 +98,7 @@ PHP_MINIT_FUNCTION(syslog) + /* AIX doesn't have LOG_PERROR */ + REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/ + #endif ++#endif + BG(syslog_device)=NULL; + + return SUCCESS; +--- a/main/fopen_wrappers.c ++++ b/main/fopen_wrappers.c +@@ -85,13 +85,8 @@ or a tightening during activation/runtim + PHPAPI ZEND_INI_MH(OnUpdateBaseDir) + { + char **p, *pathbuf, *ptr, *end; +-#ifndef ZTS +- char *base = (char *) mh_arg2; +-#else +- char *base = (char *) ts_resource(*((int *) mh_arg2)); +-#endif + +- p = (char **) (base + (size_t) mh_arg1); ++ p = &PG(open_basedir); + + if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) { + /* We're in a PHP_INI_SYSTEM context, no restrictions */ +--- a/main/main.c ++++ b/main/main.c +@@ -90,6 +90,9 @@ + + #include "SAPI.h" + #include "rfc1867.h" ++#if SUHOSIN_PATCH ++#include "suhosin_globals.h" ++#endif + + #if !HAVE_UNISTD_H || (!defined(_SC_PAGESIZE) && !defined(_SC_PAGE_SIZE)) + # if HAVE_SYS_MMAN_H +@@ -492,7 +495,7 @@ PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals) + PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout) +- STD_PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir, open_basedir, php_core_globals, core_globals) ++ PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir) + STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR, PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals) + + STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals) +@@ -1794,6 +1797,10 @@ void dummy_invalid_parameter_handler( + } + #endif + ++#if SUHOSIN_PATCH ++PHPAPI void suhosin_startup(); ++#endif ++ + /* {{{ php_module_startup + */ + int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules) +@@ -1838,6 +1845,10 @@ int php_module_startup(sapi_module_struc + tsrm_ls = ts_resource(0); + #endif + ++#if SUHOSIN_PATCH ++ suhosin_startup(); ++#endif ++ + module_shutdown = 0; + module_startup = 1; + sapi_initialize_empty_request(TSRMLS_C); +@@ -1957,7 +1968,11 @@ int php_module_startup(sapi_module_struc + REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS); +- REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); ++#if SUHOSIN_PATCH ++ REGISTER_MAIN_LONG_CONSTANT("SUHOSIN_PATCH", 1, CONST_PERSISTENT | CONST_CS); ++ REGISTER_MAIN_STRINGL_CONSTANT("SUHOSIN_PATCH_VERSION", SUHOSIN_PATCH_VERSION, sizeof(SUHOSIN_PATCH_VERSION)-1, CONST_PERSISTENT | CONST_CS); ++#endif ++ REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS); + #ifdef ZEND_MULTIBYTE +--- a/main/php.h ++++ b/main/php.h +@@ -457,6 +457,10 @@ END_EXTERN_C() + #endif + #endif /* !XtOffsetOf */ + ++#if SUHOSIN_PATCH ++#include "suhosin_patch.h" ++#endif ++ + #endif + + /* +--- a/main/php_logos.c ++++ b/main/php_logos.c +@@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char + return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); + } + ++#if SUHOSIN_PATCH ++#include "suhosin_logo.h" ++#endif ++ + int php_init_info_logos(void) + { + if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) +@@ -58,7 +62,9 @@ int php_init_info_logos(void) + php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); + php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); + php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); +- ++#if SUHOSIN_PATCH ++ php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo)); ++#endif + return SUCCESS; + } + +--- a/main/snprintf.c ++++ b/main/snprintf.c +@@ -780,6 +780,10 @@ static int format_converter(register buf + */ + switch (*fmt) { + case 'Z': ++#if SUHOSIN_PATCH ++ zend_suhosin_log(S_MISC, "'Z' specifier within format string"); ++ goto skip_output; ++#else + zvp = (zval*) va_arg(ap, zval*); + zend_make_printable_zval(zvp, &zcopy, &free_zcopy); + if (free_zcopy) { +@@ -790,6 +794,7 @@ static int format_converter(register buf + if (adjust_precision && precision < s_len) { + s_len = precision; + } ++#endif + break; + case 'u': + switch(modifier) { +@@ -1091,7 +1096,11 @@ static int format_converter(register buf + + + case 'n': ++#if SUHOSIN_PATCH ++ zend_suhosin_log(S_MISC, "'n' specifier within format string"); ++#else + *(va_arg(ap, int *)) = cc; ++#endif + goto skip_output; + + /* +--- a/main/spprintf.c ++++ b/main/spprintf.c +@@ -388,6 +388,10 @@ static void xbuf_format_converter(smart_ + */ + switch (*fmt) { + case 'Z': ++#if SUHOSIN_PATCH ++ zend_suhosin_log(S_MISC, "'Z' specifier within format string"); ++ goto skip_output; ++#else + zvp = (zval*) va_arg(ap, zval*); + zend_make_printable_zval(zvp, &zcopy, &free_zcopy); + if (free_zcopy) { +@@ -398,6 +402,7 @@ static void xbuf_format_converter(smart_ + if (adjust_precision && precision < s_len) { + s_len = precision; + } ++#endif + break; + case 'u': + switch(modifier) { +@@ -698,7 +703,11 @@ static void xbuf_format_converter(smart_ + + + case 'n': ++#if SUHOSIN_PATCH ++ zend_suhosin_log(S_MISC, "'n' specifier within format string"); ++#else + *(va_arg(ap, int *)) = xbuf->len; ++#endif + goto skip_output; + + /* +--- /dev/null ++++ b/main/suhosin_globals.h +@@ -0,0 +1,61 @@ ++/* ++ +----------------------------------------------------------------------+ ++ | Suhosin-Patch for PHP | ++ +----------------------------------------------------------------------+ ++ | Copyright (c) 2004-2009 Stefan Esser | ++ +----------------------------------------------------------------------+ ++ | This source file is subject to version 2.02 of the PHP license, | ++ | that is bundled with this package in the file LICENSE, and is | ++ | available at through the world-wide-web at | ++ | http://www.php.net/license/2_02.txt. | ++ | If you did not receive a copy of the PHP license and are unable to | ++ | obtain it through the world-wide-web, please send a note to | ++ | license@php.net so we can mail you a copy immediately. | ++ +----------------------------------------------------------------------+ ++ | Author: Stefan Esser | ++ +----------------------------------------------------------------------+ ++ */ ++ ++#ifndef SUHOSIN_GLOBALS_H ++#define SUHOSIN_GLOBALS_H ++ ++typedef struct _suhosin_patch_globals suhosin_patch_globals_struct; ++ ++#ifdef ZTS ++# define SPG(v) TSRMG(suhosin_patch_globals_id, suhosin_patch_globals_struct *, v) ++extern int suhosin_patch_globals_id; ++#else ++# define SPG(v) (suhosin_patch_globals.v) ++extern struct _suhosin_patch_globals suhosin_patch_globals; ++#endif ++ ++ ++struct _suhosin_patch_globals { ++ /* logging */ ++ int log_syslog; ++ int log_syslog_facility; ++ int log_syslog_priority; ++ int log_sapi; ++ int log_script; ++ int log_phpscript; ++ char *log_scriptname; ++ char *log_phpscriptname; ++ zend_bool log_phpscript_is_safe; ++ zend_bool log_use_x_forwarded_for; ++ ++ /* memory manager canary protection */ ++ unsigned int canary_1; ++ unsigned int canary_2; ++ unsigned int canary_3; ++ unsigned int dummy; ++}; ++ ++ ++#endif /* SUHOSIN_GLOBALS_H */ ++ ++/* ++ * Local variables: ++ * tab-width: 4 ++ * c-basic-offset: 4 ++ * End: ++ */ +--- /dev/null ++++ b/main/suhosin_logo.h +@@ -0,0 +1,178 @@ ++static unsigned char suhosin_logo[] = ++ "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48" ++ "\x00\x48\x00\x00\xff\xe1\x00\x16\x45\x78\x69\x66\x00\x00\x4d\x4d" ++ "\x00\x2a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\xff\xdb\x00\x43" ++ "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" ++ "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" ++ "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" ++ "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" ++ "\x01\xff\xc0\x00\x0b\x08\x00\x27\x00\x71\x01\x01\x22\x00\xff\xc4" ++ "\x00\x1e\x00\x00\x02\x02\x02\x03\x01\x01\x00\x00\x00\x00\x00\x00" ++ "\x00\x00\x00\x00\x09\x06\x08\x05\x07\x02\x03\x0a\x01\x04\xff\xc4" ++ "\x00\x32\x10\x00\x01\x04\x03\x00\x02\x00\x05\x01\x05\x09\x01\x00" ++ "\x00\x00\x00\x05\x02\x03\x04\x06\x01\x07\x08\x00\x09\x11\x12\x13" ++ "\x14\x21\x15\x0a\x16\x31\x56\x96\x17\x18\x19\x23\x32\x41\x58\x98" ++ "\xd4\xd6\xff\xda\x00\x08\x01\x01\x00\x00\x3f\x00\xf4\xc1\xe1\xe5" ++ "\x69\xe9\x3e\xb9\xd1\x7c\x8a\x2e\x9d\x66\xe8\x3b\x29\x4d\x7f\x46" ++ "\xba\x58\x55\x54\x8d\xb1\x5f\xaa\xd9\x8d\x51\x2b\xb6\x27\x5a\x69" ++ "\xd1\x43\xaf\x16\x1a\xf0\xb2\xb1\xe9\x6d\x9f\xc2\xa4\x36\x18\xb5" ++ "\x85\x10\x41\xbe\xfc\x09\xac\x49\x29\x11\xd4\x32\x97\xec\x08\x13" ++ "\xc1\x2d\x20\xc3\x59\xeb\x26\x05\xd8\x6b\x76\x31\x43\x8f\x57\xcf" ++ "\x84\x9f\x14\xa8\x53\x81\x0b\xc3\x64\x80\xa3\x02\x0a\x41\x75\xf8" ++ "\x44\x85\x93\x81\x22\x3c\xd8\x13\xe1\xbe\xf4\x59\x91\x1f\x6a\x44" ++ "\x77\x5c\x69\xc4\x2f\x39\x5f\x0f\x2a\x8d\xeb\xba\xf8\xc3\x56\x6c" ++ "\x3b\x36\xa7\xda\xbd\x4d\xa1\xb5\x4e\xc6\xa7\xa4\x3a\xec\x15\x2d" ++ "\xa5\xb3\xea\x5a\xdc\xac\x46\xac\x01\x60\xd8\x43\xc8\x8e\x8b\xb1" ++ "\x40\x4c\x95\x8b\x34\x41\x28\x52\x91\x28\x43\xd3\xa3\xb6\xa7\x55" ++ "\x15\xe7\x5a\x96\xcb\xf1\xda\xe5\x55\xee\xfe\x1e\xbd\xd9\x41\xd3" ++ "\x28\xfd\x97\xca\x57\x2b\x85\x9c\xa4\x30\x95\xaa\xa5\x57\xa2\x35" ++ "\x15\x86\xcb\x61\x34\x41\xe4\xc7\x80\x20\x18\x21\x17\x09\x85\x0b" ++ "\x14\x9d\x21\x68\x62\x1c\x08\x11\x64\x4b\x92\xf2\xd2\xd3\x2d\x2d" ++ "\x6a\xc2\x73\x6b\x3c\x3c\x8b\x9e\xbc\x52\xaa\xa4\xab\x81\x6c\xf6" ++ "\xfa\xbd\x70\xc5\xc6\x7b\xc2\xaa\x22\x4f\x58\x04\x87\x25\x6a\x27" ++ "\x1d\xa4\x3d\x20\x75\x72\x01\x09\x71\xe5\x1c\x9e\xc3\x2e\x36\xf3" ++ "\xd0\xc6\x35\x2a\x43\x4d\x2d\x0e\x2d\xb4\xa1\x49\xce\x65\x1e\x52" ++ "\x9e\xa1\xf6\x09\xcc\xdc\x63\x66\xa8\x01\xe9\x3b\x0d\xd7\x5a\x85" ++ "\xbb\xc5\x65\xc0\x7b\x2e\x46\xa9\xd9\x56\x1d\x4c\x92\x72\x26\x4e" ++ "\x86\xd5\x68\xae\xc4\xaa\x55\xce\xd7\x83\x59\xb3\x81\xee\xce\x74" ++ "\x39\x39\x31\x9f\x8a\x25\xe8\xa5\xa5\xe5\x81\xf2\x11\x23\xcb\xa1" ++ "\x1e\x43\x12\xe3\xb1\x2a\x2b\xcd\xc8\x8d\x25\x96\xa4\x47\x7d\x95" ++ "\xa5\xc6\x9f\x61\xe4\x25\xc6\x5e\x69\xc4\xe7\x29\x5b\x6e\xb6\xa4" ++ "\xad\x0b\x4e\x72\x95\x25\x58\x56\x33\x9c\x67\xce\xef\x0f\x17\xbf" ++ "\x4c\x7b\x2d\xe6\xfe\x76\x35\x27\x5a\x07\x97\x67\xe8\xae\x8d\x71" ++ "\x0f\xb2\x13\x99\xb9\xbc\x14\xad\xb3\xb7\xe6\x11\x6f\xe0\xda\x58" ++ "\xb1\x08\xac\xa6\x6c\x2d\x7f\x05\xb7\x56\xd2\xe6\xcf\xbb\x4d\x0c" ++ "\xe3\x50\xb2\xec\x91\xf0\x4a\xb8\xd6\x22\xb8\xa7\xf6\x67\xaf\xcf" ++ "\x63\x7e\xd7\xe7\x42\xd8\xbd\xc3\x71\xa1\xf2\x7e\x9b\xa8\x97\x83" ++ "\x6e\xd1\xdc\x4b\x06\x11\x2d\xae\x26\x61\x98\x72\x10\xf4\x42\x5d" ++ "\x20\x4a\xa3\x73\xd7\xf2\xcd\x3c\x48\x32\xe4\x03\x9f\x80\x37\x08" ++ "\x36\x11\xd0\xcb\x97\x6c\x08\xed\x6d\x33\x24\xa2\x1b\xb4\x77\xdf" ++ "\x61\x5d\x5f\xc1\x43\xc2\x82\xeb\x0f\x5d\x84\x08\x68\xaa\xa4\x01" ++ "\xe1\x19\xdf\xbc\x31\x65\xfe\xd1\xf5\x7d\x7a\xb2\x2a\x33\x50\x21" ++ "\x2a\x56\x9d\xb1\x81\xab\xdb\x35\x78\x30\x83\xd9\x89\x1d\x31\xac" ++ "\x96\x14\x07\x61\xbc\x20\x68\x42\x85\x33\x19\xac\xbe\xdb\x34\x56" ++ "\xf1\xd5\xfd\x29\xa9\x28\xdb\xcb\x4c\x5a\x23\xdc\xf5\x96\xc5\x10" ++ "\xa3\x35\x5b\x14\x68\xd3\x61\x62\x64\x76\x26\xcb\x17\x3e\x34\x98" ++ "\x04\xa3\xc4\x20\x38\x90\x92\xe3\xc8\x07\x2c\x36\x74\x66\x26\x0e" ++ "\x29\x02\x64\x29\x2d\x21\xe6\x16\x9c\x6b\xce\xa3\x89\xd9\x4f\xd3" ++ "\xc4\xbd\xc5\x87\x79\x9c\x65\xf6\x39\x45\x60\xe8\xce\x9e\xab\x6d" ++ "\x13\x15\x22\xe1\x5e\x4b\x38\x42\xc4\x1e\xd5\x76\xe0\xc5\xeb\x85" ++ "\x07\x2d\x0f\xb8\xb6\xa6\xd6\x6d\x71\x0d\xa2\x43\x4c\x25\xea\xfa" ++ "\xa1\xae\x4c\xe4\x7d\xbd\x76\xa9\xfb\x06\xc2\x83\x42\xeb\xad\xe7" ++ "\xe9\x5f\x68\x6f\xba\xfb\x2f\x07\xce\xb8\x13\xc1\x9b\xeb\xb0\x76" ++ "\x45\x57\x28\x7b\xea\xbe\x0f\xf4\x30\x7b\xa0\xed\xe4\x22\x93\x21" ++ "\xfc\xbc\xe0\xb9\x75\xc1\x4f\xfc\xef\xb6\xfa\xa1\xfc\x64\xa1\x4a" ++ "\x82\xc7\x33\xad\x75\xed\x82\xbd\x3d\xdb\xf7\xa8\xbe\x5e\xbb\x36" ++ "\x62\x04\x9a\x2e\xc5\xd9\x9e\x9c\x3a\x0b\x98\x0b\x57\xac\xf1\x24" ++ "\x62\x58\x83\x15\x5b\xa6\xf2\xda\x34\x70\x03\xce\x0f\x93\x1b\x12" ++ "\xc7\xce\x54\x87\x33\x15\xd6\x53\x25\x1f\x2a\x90\x87\x12\xe3\x78" ++ "\xef\x55\x77\x4d\x4a\xd8\x7e\xef\xd2\xfd\xd1\xaf\x3a\xaf\x55\xdb" ++ "\x6a\x2d\x3d\x42\xac\x51\x79\xee\x91\xab\xe1\x05\x2d\x3c\x80\xa2" ++ "\x43\xad\x22\x2e\xd5\x33\x13\xa4\x9e\x00\xe0\x04\x10\x84\xc8\xf2" ++ "\x19\x30\x92\x1f\xaa\xc3\x28\xc9\x76\x30\x3f\xe9\x10\x61\x5e\x79" ++ "\xd5\xf7\xdf\xd0\x54\xdb\xae\xb6\xae\xfa\xe8\xa3\x57\xe0\x6c\x2d" ++ "\xf7\xbd\x49\xd6\x6e\x76\x79\xcc\x54\x0c\x5f\xff\x00\xbb\x06\x98" ++ "\xa6\x9e\x89\x61\xb4\x6f\xc3\xe3\x6a\xc2\x4f\x59\x03\xc9\x80\x2c" ++ "\x59\x24\x44\x70\x38\xd5\x96\x6a\x9e\x8b\x81\x64\xe5\xbc\xa0\x3c" ++ "\x33\xaf\x17\x9d\xff\x00\x71\x1a\xd1\x3a\x80\x66\xb3\xd9\x31\x77" ++ "\x0d\x12\xbd\xae\x29\xb5\x6a\xd6\xcf\x8d\x68\x87\x75\xcd\xe8\x65" ++ "\x5a\xbe\x3c\x04\x7b\x34\xdb\x54\x19\xa4\x63\x9c\x2a\x5d\x23\xbe" ++ "\xf4\xb1\x1c\x4d\x90\xec\x92\x2f\x49\x71\xf7\x14\xf2\x97\x9f\x15" ++ "\x57\xed\x13\x21\x2a\xf5\x33\xd1\x2a\x52\x52\xac\xb7\x62\xd1\xcb" ++ "\x46\x73\x8c\x67\x28\x56\x77\x86\xbf\x6f\x2a\x4e\x73\xfe\x95\x65" ++ "\x0b\x5a\x3e\x38\xfc\xfc\xaa\x56\x3f\x86\x73\xe3\xb9\x4a\x52\x84" ++ "\xa5\x08\x4e\x12\x94\x27\x09\x4a\x53\x8c\x61\x29\x4a\x71\xf0\x4a" ++ "\x53\x8c\x7e\x31\x8c\x63\x18\xc6\x31\x8f\xc6\x31\xf8\xc7\x9f\x7c" ++ "\xd5\xbb\xae\x5e\xe2\x1f\xab\x6e\x24\x34\x00\x8a\x25\x83\x70\x40" ++ "\x1c\xcc\xda\x45\x7f\x66\x4e\x30\x2e\x94\x7e\x74\x49\xf0\xe4\x4e" ++ "\x06\x5c\xa8\x2f\x89\x21\x2e\x98\x0e\xd9\x21\xc2\x0b\x21\x0f\xc4" ++ "\x16\x6e\x48\xd9\xe4\xe3\x4a\x19\x1e\x64\x67\x54\xff\x00\x3a\x6d" ++ "\x4f\x62\xb5\x00\x4a\xaa\x51\xfd\x2d\xe8\x0e\x6c\xaf\xc6\x7d\x6d" ++ "\xc8\x88\xc7\x67\xea\x8a\x58\x02\x73\xe3\x65\x4d\xc9\x24\xc0\x3d" ++ "\x57\xa3\x2e\x53\x16\x99\x4f\xe5\xe7\x19\x97\x3e\x3b\xcf\xc9\x4b" ++ "\x99\x7f\x33\x25\xa5\xdf\xba\x77\x2b\xd3\x3e\xc2\x7b\x8b\x94\x07" ++ "\xe9\x52\x5b\x43\x87\x34\x14\x86\x37\xcf\x41\x6b\x8e\x6a\xa5\x22" ++ "\xab\xdb\x96\xa2\xcf\x46\xd8\x9b\x45\x93\xef\xd6\xdf\x3e\x99\x9c" ++ "\x7e\x29\x10\x6b\x6c\xa2\xb8\x43\x05\x09\x44\x70\x8c\xb8\xaa\x54" ++ "\x7c\x30\x36\x5e\x1c\x5e\x5b\x9f\x6c\x0d\x81\xee\xa0\x93\x8d\x67" ++ "\x55\xf3\x87\xaf\xaa\x6b\x58\xf9\xbe\xb2\x36\x07\x42\x6e\xbd\x96" ++ "\xe3\x9f\x1f\x8f\xc9\xf4\x9d\xae\x6a\x7d\x4c\x96\xbe\x5f\xc7\xcd" ++ "\xf3\xb2\xf7\xcd\xf0\xcf\xc3\xe4\xf8\xfe\x37\x4f\x1c\x4d\xf6\x40" ++ "\xf1\x6b\x7c\x4e\xe0\xa6\x71\xad\x56\xa7\x1c\x5c\x15\x6b\xfc\xf3" ++ "\x01\x5d\xac\xf1\x75\x9a\x72\x6b\xaa\x28\xc5\x88\x6d\xfb\x33\x85" ++ "\xe0\x4e\x61\xab\xeb\x31\x2c\x71\x08\x73\x11\x3b\xfc\xb5\xc0\x96" ++ "\xcc\x87\x24\x44\xb5\x9b\x9e\xb3\x71\xba\xe9\xed\xb1\x4e\xd7\x76" ++ "\x6c\xd2\xb6\x05\xb7\x5a\xde\xeb\x34\x5b\x96\x16\xfb\x59\xa9\x5c" ++ "\x4f\x55\xca\x8a\xac\x59\xb0\xe4\x54\x39\x25\xbc\x81\x37\x2a\x09" ++ "\x5f\x9e\x3b\x6b\x7d\x1f\x69\xf3\x34\x85\x39\x84\xa7\x28\x0b\xd3" ++ "\xfd\xfb\x4b\x7a\xea\xe7\xd2\x3c\xd3\xda\x15\x68\xbc\x73\xd3\x22" ++ "\x6f\xd7\x72\x5b\x2b\x66\xee\xa8\x0d\x54\xe8\x5b\xf9\x92\x96\x92" ++ "\x93\xea\x97\x4a\xc7\x43\x10\x46\x35\xc5\xc0\x60\x8a\xe4\xc1\xb5" ++ "\x36\xc6\xae\xed\xf7\x70\xa5\x86\x99\x3d\x91\xf8\xfd\x4e\x53\xeb" ++ "\xbb\xbd\x6d\xec\x8f\xd7\x89\x3d\x31\x7f\xd7\x78\xba\x50\xbb\x74" ++ "\x9d\xf6\xac\x4e\xb9\x03\x9c\x79\xd5\xe1\xbd\x17\x68\xd9\x13\x0b" ++ "\x45\x75\x88\x00\x1d\x1f\xae\x73\x6a\x1d\x5c\x6e\x44\x9f\xa6\xfa" ++ "\x4e\xd8\x25\x8b\xc0\xbc\xb2\x99\xe3\x17\x24\xb3\x23\xe2\x48\x8b" ++ "\xfa\x22\xe7\x7e\x8f\xe6\x3f\x5f\x55\x0d\x75\xd3\x51\x0b\xd7\xed" ++ "\xd3\x6f\x97\x3b\x85\x42\x80\x7e\x5f\xdc\x1b\xd6\xba\xee\xc4\x80" ++ "\xce\x06\xa9\x15\x8c\x97\x5f\x40\x69\xb2\x4d\xc5\xb2\x5c\x1e\x01" ++ "\x87\x7e\xe0\x36\x6d\x78\x80\x4e\x3c\x02\xec\x90\x1d\x11\x81\x74" ++ "\xa5\x8b\xa4\xa0\x56\x06\xd5\x79\x72\x85\x57\x3b\xb2\x2e\xae\x90" ++ "\x18\x8d\x91\xb2\x0e\x44\x19\xaa\xb4\xcc\x08\xed\x46\xfa\xd7\x2b" ++ "\x78\x58\x72\x5d\xbb\x5e\x49\xe7\xee\xf3\x8a\x9d\x22\xa4\x19\xc8" ++ "\xe7\x08\xc3\x90\x9b\x35\x9a\xa4\x25\x8c\x4b\x9b\xa7\xf8\xbf\x81" ++ "\xf5\xdf\x22\x66\xf1\x7e\x9f\x66\x3d\xbb\xfa\x73\x73\x4d\xfd\x67" ++ "\x7b\xf4\xce\xc3\x62\x2e\x6f\xbb\x0c\xa2\xdc\x69\xfc\x8a\x17\x0e" ++ "\x3a\x9e\x83\x46\xd7\xe3\x5e\x65\x86\xc0\x51\x00\xbb\x91\xe3\xe1" ++ "\xc1\x16\xc4\xe9\x65\x5c\x14\x3e\x44\x6a\x6b\xd1\x1e\xb0\x36\xdd" ++ "\x0b\x7d\x8a\xeb\xaf\x58\x5b\x64\x3f\x38\xed\x52\x76\xe8\x46\xf7" ++ "\x86\x84\xb3\x93\xb1\x0b\xe5\xfd\xfd\x0d\xe9\x6d\xe4\xf1\x1b\x1d" ++ "\x56\xb4\x34\xe4\x6a\xf5\xa4\x9c\x2c\xc9\x64\x94\xc1\xf5\x79\x6d" ++ "\x12\x96\xf3\x47\xc5\x48\xa8\xdb\xd8\x95\x64\x29\xcf\xf6\x88\xf1" ++ "\x95\x7a\x98\xe8\xbc\x27\x19\xce\x73\x61\xd1\xb8\xc6\x31\x8c\xe7" ++ "\x39\xce\x77\x9e\xbc\xc6\x31\x8c\x63\xf3\x9c\xe7\x39\xc6\x31\x8f" ++ "\xf7\xce\x7e\x1e\x3b\x7f\x0f\x0f\x0f\x13\x57\xb9\x0a\xe1\x0b\x64" ++ "\x5f\x58\x40\xc6\xc7\x7a\x4b\xf2\x3d\xbc\x71\xf4\xa7\xd2\xca\x14" ++ "\xe2\x98\x1a\x30\x1e\xe0\x26\x5a\x6a\xf0\x9c\x67\x38\x66\x00\xb8" ++ "\x72\xe6\xbe\xac\xfe\x12\xd3\x0b\x56\x73\x8c\x63\xc7\x2b\xe1\xe2" ++ "\xe8\xdd\x7b\xff\x00\xd8\xe5\x23\x6c\xce\xa8\x69\xcf\x5e\x3a\xef" ++ "\x77\xea\xe5\xab\x0e\x82\xdb\xd9\xed\x7a\x9e\xb8\x6d\x51\x32\xdb" ++ "\x79\xc3\x36\x9a\x2d\xa3\x50\x39\x65\x0a\x63\x0e\xe5\xd4\x39\x12" ++ "\xbf\x8b\x98\xa4\xa1\x2d\xad\xb3\xcf\x65\x6a\x43\x78\xb3\x3b\x07" ++ "\xd8\xd5\xea\xae\x76\xad\x6f\xf5\xff\x00\xca\x93\xab\x96\xb0\x64" ++ "\xeb\xd6\x4a\xd5\x87\xba\xec\x24\x60\x97\x06\x76\x03\xe3\x4c\x07" ++ "\x29\x11\x8e\x34\x25\x02\x64\x29\xf0\x25\x48\x85\x3a\x33\x8b\x7a" ++ "\x3c\x86\x1e\x75\xa5\x61\xc6\x97\x9f\x8d\x25\xf5\xc9\xcd\xde\xc9" ++ "\x7d\x77\xf2\xc8\x7e\x70\xaf\x73\x5f\x2d\xec\xa2\x51\x2d\x96\xfb" ++ "\x89\xad\x80\x57\xb2\x36\x1d\x7d\x83\x45\xac\xf3\xdb\xcc\x6c\x31" ++ "\x4f\xcf\x30\x58\xd0\x12\x28\x90\x50\x42\x86\xfb\x48\x16\x3c\xc5" ++ "\x9c\xf8\xe7\xcc\x29\x88\xb3\x4a\x4b\x4e\x6c\xbc\xdb\xc7\xbb\xe9" ++ "\xb6\xa0\x8b\x11\xa1\x7d\x73\xd7\xe9\xbf\x7e\xc2\x6c\x10\x8d\xee" ++ "\x9d\xef\x63\x3a\xe0\xf5\xbe\x8c\x3e\xa1\xc7\xc5\xd1\x00\x44\x1e" ++ "\xf3\x51\xf2\xe2\xb0\xe3\xb5\x13\x7f\x32\xf1\x8c\xa6\x22\xfe\x1f" ++ "\x49\x4d\xbb\xcf\x3a\x5d\xed\x4c\xd2\xfc\x85\xed\x23\xd6\xc7\x50" ++ "\xb6\x5b\x3a\x16\x83\xb8\x6f\xfd\x32\x3f\xaa\x36\x34\xbb\xf5\x96" ++ "\xa9\xab\xcf\x9f\x8f\xac\xc3\xca\xd5\x8b\xd8\x48\x9e\x79\xaa\x30" ++ "\x87\xca\x58\x4d\x59\x96\xb9\x4f\xc5\x1b\x1c\xd2\xda\x5b\xe6\x57" ++ "\x29\xa1\x28\x7a\x2b\x5b\xff\x00\x12\x2f\x5e\x3f\xf3\xbb\x8e\x7f" ++ "\xec\xc6\x98\xff\x00\xed\x3c\xa6\xdd\xa9\xdc\x7e\xa0\xf7\xd6\x99" ++ "\x31\xa2\xf7\xaf\x6b\xe9\x82\x74\x4b\x3d\x8f\x5e\x58\x0b\x33\xab" ++ "\xef\xc3\xaf\x84\x64\xb9\xae\xb6\x25\x5f\x62\x8f\x1c\xe3\xf4\x51" ++ "\xb7\x96\xe3\x0e\x30\x42\xa9\x18\x39\xbf\x9e\x2a\x1f\x74\x19\x02" ++ "\x2d\x43\x93\x06\x63\xb1\xa7\x47\x6a\xfa\x9b\x6c\xeb\xbd\xe9\xae" ++ "\x6a\x7b\x6f\x53\x5a\x60\x5d\xb5\xcd\xe8\x67\xeb\x35\x3b\x48\xc6" ++ "\xa6\xb3\x04\xc8\xdf\xb8\x7e\x26\x64\xb0\xc9\x18\xb0\xa7\x33\xf2" ++ "\x4a\x8b\x22\x3b\x8d\x4b\x89\x1d\xf6\x9d\x65\xc4\x38\xd2\x54\x9c" ++ "\xe3\xcd\x89\xe1\xe1\xe6\x3e\x70\x81\x45\x1d\x18\xf9\x31\x83\xc8" ++ "\xbe\x14\x82\x4b\x87\x7a\x74\x28\xd2\xdd\x12\x55\x30\xe6\x0e\x49" ++ "\x31\x8e\x48\x69\xc5\xc0\x20\x91\xe4\x48\x41\x4c\xd8\xb9\x6a\x4e" ++ "\x21\xce\x99\x1b\x0e\xfd\x09\x4f\xa1\x79\x0f\x0f\x0f\x0f\x0f\x0f" ++ "\x0f\x3f\x3c\xb8\x71\x27\xc7\x72\x24\xe8\xb1\xa6\xc5\x7b\x18\xc3" ++ "\xb1\xa5\xb0\xd4\x98\xee\xe3\x19\xc6\x71\x87\x19\x79\x2b\x6d\x78" ++ "\xc6\x71\x8c\xe3\x0a\x4e\x71\x8c\xe3\x19\xfe\x38\xf2\x3b\xfb\x8b" ++ "\x48\xfe\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe1\xfb\x8b\x48\xfe" ++ "\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe4\x95\x86\x18\x8a\xcb\x31" ++ "\xa3\x32\xd4\x78\xf1\xdb\x43\x2c\x47\x61\xb4\x32\xcb\x2c\xb4\x9c" ++ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1" ++ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9" ++ ; +--- /dev/null ++++ b/main/suhosin_patch.c +@@ -0,0 +1,470 @@ ++/* ++ +----------------------------------------------------------------------+ ++ | Suhosin Patch for PHP | ++ +----------------------------------------------------------------------+ ++ | Copyright (c) 2004-2010 Stefan Esser | ++ +----------------------------------------------------------------------+ ++ | This source file is subject to version 2.02 of the PHP license, | ++ | that is bundled with this package in the file LICENSE, and is | ++ | available at through the world-wide-web at | ++ | http://www.php.net/license/2_02.txt. | ++ | If you did not receive a copy of the PHP license and are unable to | ++ | obtain it through the world-wide-web, please send a note to | ++ | license@php.net so we can mail you a copy immediately. | ++ +----------------------------------------------------------------------+ ++ | Author: Stefan Esser | ++ +----------------------------------------------------------------------+ ++ */ ++/* $Id: suhosin_patch.c,v 1.2 2004/11/21 09:38:52 ionic Exp $ */ ++ ++#include "php.h" ++ ++#include ++#include ++#include ++ ++#if HAVE_UNISTD_H ++#include ++#endif ++#include "SAPI.h" ++#include "php_globals.h" ++ ++#if SUHOSIN_PATCH ++ ++#ifdef HAVE_SYS_SOCKET_H ++#include ++#endif ++ ++#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) ++#undef AF_UNIX ++#endif ++ ++#if defined(AF_UNIX) ++#include ++#endif ++ ++#define SYSLOG_PATH "/dev/log" ++ ++#ifdef PHP_WIN32 ++static HANDLE log_source = 0; ++#endif ++ ++#include "snprintf.h" ++ ++#include "suhosin_patch.h" ++ ++#ifdef ZTS ++#include "suhosin_globals.h" ++int suhosin_patch_globals_id; ++#else ++struct _suhosin_patch_globals suhosin_patch_globals; ++#endif ++ ++static char *suhosin_config = NULL; ++ ++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; ++ ++static void php_security_log(int loglevel, char *fmt, ...); ++ ++static void suhosin_patch_globals_ctor(suhosin_patch_globals_struct *suhosin_patch_globals TSRMLS_DC) ++{ ++ memset(suhosin_patch_globals, 0, sizeof(*suhosin_patch_globals)); ++} ++ ++ZEND_API char suhosin_get_config(int element) ++{ ++ return ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element]; ++} ++ ++static void suhosin_set_config(int element, char value) ++{ ++ ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element] = value; ++} ++ ++static void suhosin_read_configuration_from_environment() ++{ ++ char *tmp; ++ ++ /* check if canary protection should be activated or not */ ++ tmp = getenv("SUHOSIN_MM_USE_CANARY_PROTECTION"); ++ /* default to activated */ ++ suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, 1); ++ if (tmp) { ++ int flag = zend_atoi(tmp, 0); ++ suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, flag); ++ } ++ ++ /* check if free memory should be overwritten with 0xFF or not */ ++ tmp = getenv("SUHOSIN_MM_DESTROY_FREE_MEMORY"); ++ /* default to deactivated */ ++ suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, 0); ++ if (tmp) { ++ int flag = zend_atoi(tmp, 0); ++ suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, flag); ++ } ++ ++ /* check if canary violations should be ignored */ ++ tmp = getenv("SUHOSIN_MM_IGNORE_CANARY_VIOLATION"); ++ /* default to NOT ignore */ ++ suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, 0); ++ if (tmp) { ++ int flag = zend_atoi(tmp, 0); ++ suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, flag); ++ } ++ ++ /* check if invalid hashtable destructors should be ignored */ ++ tmp = getenv("SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR"); ++ /* default to NOT ignore */ ++ suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, 0); ++ if (tmp) { ++ int flag = zend_atoi(tmp, 0); ++ suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, flag); ++ } ++ ++ /* check if invalid linkedlist destructors should be ignored */ ++ tmp = getenv("SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR"); ++ /* default to NOT ignore */ ++ suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, 0); ++ if (tmp) { ++ int flag = zend_atoi(tmp, 0); ++ suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, flag); ++ } ++ ++ suhosin_set_config(SUHOSIN_CONFIG_SET, 1); ++} ++ ++static void suhosin_write_protect_configuration() ++{ ++ /* check return value of mprotect() to ensure memory is read only now */ ++ if (mprotect(SUHOSIN_MANGLE_PTR(suhosin_config), sysconf(_SC_PAGESIZE), PROT_READ) != 0) { ++ perror("suhosin"); ++ _exit(1); ++ } ++} ++ ++PHPAPI void suhosin_startup() ++{ ++#ifdef ZTS ++ ts_allocate_id(&suhosin_patch_globals_id, sizeof(suhosin_patch_globals_struct), (ts_allocate_ctor) suhosin_patch_globals_ctor, NULL); ++#else ++ suhosin_patch_globals_ctor(&suhosin_patch_globals TSRMLS_CC); ++#endif ++ zend_suhosin_log = php_security_log; ++ ++ /* get the pointer guardian and ensure low 3 bits are 1 */ ++ if (SUHOSIN_POINTER_GUARD == 0) { ++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); ++ SUHOSIN_POINTER_GUARD |= 7; ++ } ++ ++ if (!suhosin_config) { ++#ifndef MAP_ANONYMOUS ++#define MAP_ANONYMOUS MAP_ANON ++#endif ++ suhosin_config = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); ++ if (suhosin_config == MAP_FAILED) { ++ perror("suhosin"); ++ _exit(1); ++ } ++ suhosin_config = SUHOSIN_MANGLE_PTR(suhosin_config); ++ } ++ if (!SUHOSIN_CONFIG(SUHOSIN_CONFIG_SET)) { ++ suhosin_read_configuration_from_environment(); ++ suhosin_write_protect_configuration(); ++ } ++} ++ ++static char *loglevel2string(int loglevel) ++{ ++ switch (loglevel) { ++ case S_FILES: ++ return "FILES"; ++ case S_INCLUDE: ++ return "INCLUDE"; ++ case S_MEMORY: ++ return "MEMORY"; ++ case S_MISC: ++ return "MISC"; ++ case S_SESSION: ++ return "SESSION"; ++ case S_SQL: ++ return "SQL"; ++ case S_EXECUTOR: ++ return "EXECUTOR"; ++ case S_VARS: ++ return "VARS"; ++ default: ++ return "UNKNOWN"; ++ } ++} ++ ++static void php_security_log(int loglevel, char *fmt, ...) ++{ ++ int s, r, i=0; ++#if defined(AF_UNIX) ++ struct sockaddr_un saun; ++#endif ++#ifdef PHP_WIN32 ++ LPTSTR strs[2]; ++ unsigned short etype; ++ DWORD evid; ++#endif ++ char buf[4096+64]; ++ char error[4096+100]; ++ char *ip_address; ++ char *fname; ++ char *alertstring; ++ int lineno; ++ va_list ap; ++ TSRMLS_FETCH(); ++ ++ /*SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SPG(log_syslog), SPG(log_sapi), SPG(log_script));*/ ++ ++ if (SPG(log_use_x_forwarded_for)) { ++ ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC); ++ if (ip_address == NULL) { ++ ip_address = "X-FORWARDED-FOR not set"; ++ } ++ } else { ++ ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC); ++ if (ip_address == NULL) { ++ ip_address = "REMOTE_ADDR not set"; ++ } ++ } ++ ++ ++ va_start(ap, fmt); ++ ap_php_vsnprintf(error, sizeof(error), fmt, ap); ++ va_end(ap); ++ while (error[i]) { ++ if (error[i] < 32) error[i] = '.'; ++ i++; ++ } ++ ++/* if (SPG(simulation)) { ++ alertstring = "ALERT-SIMULATION"; ++ } else { */ ++ alertstring = "ALERT"; ++/* }*/ ++ ++ if (zend_is_executing(TSRMLS_C)) { ++ if (EG(current_execute_data)) { ++ lineno = EG(current_execute_data)->opline->lineno; ++ fname = EG(current_execute_data)->op_array->filename; ++ } else { ++ lineno = zend_get_executed_lineno(TSRMLS_C); ++ fname = zend_get_executed_filename(TSRMLS_C); ++ } ++ ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno); ++ } else { ++ fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC); ++ if (fname==NULL) { ++ fname = "unknown"; ++ } ++ ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname); ++ } ++ ++ /* Syslog-Logging disabled? */ ++ if (((SPG(log_syslog)|S_INTERNAL) & loglevel)==0) { ++ goto log_sapi; ++ } ++ ++#if defined(AF_UNIX) ++ ap_php_snprintf(error, sizeof(error), "<%u>suhosin[%u]: %s\n", (unsigned int)(SPG(log_syslog_facility)|SPG(log_syslog_priority)),getpid(),buf); ++ ++ s = socket(AF_UNIX, SOCK_DGRAM, 0); ++ if (s == -1) { ++ goto log_sapi; ++ } ++ ++ memset(&saun, 0, sizeof(saun)); ++ saun.sun_family = AF_UNIX; ++ strcpy(saun.sun_path, SYSLOG_PATH); ++ /*saun.sun_len = sizeof(saun);*/ ++ ++ r = connect(s, (struct sockaddr *)&saun, sizeof(saun)); ++ if (r) { ++ close(s); ++ s = socket(AF_UNIX, SOCK_STREAM, 0); ++ if (s == -1) { ++ goto log_sapi; ++ } ++ ++ memset(&saun, 0, sizeof(saun)); ++ saun.sun_family = AF_UNIX; ++ strcpy(saun.sun_path, SYSLOG_PATH); ++ /*saun.sun_len = sizeof(saun);*/ ++ ++ r = connect(s, (struct sockaddr *)&saun, sizeof(saun)); ++ if (r) { ++ close(s); ++ goto log_sapi; ++ } ++ } ++ send(s, error, strlen(error), 0); ++ ++ close(s); ++#endif ++#ifdef PHP_WIN32 ++ ap_php_snprintf(error, sizeof(error), "suhosin[%u]: %s", getpid(),buf); ++ ++ switch (SPG(log_syslog_priority)) { /* translate UNIX type into NT type */ ++ case 1: /*LOG_ALERT:*/ ++ etype = EVENTLOG_ERROR_TYPE; ++ break; ++ case 6: /*LOG_INFO:*/ ++ etype = EVENTLOG_INFORMATION_TYPE; ++ break; ++ default: ++ etype = EVENTLOG_WARNING_TYPE; ++ } ++ evid = loglevel; ++ strs[0] = error; ++ /* report the event */ ++ if (log_source == NULL) { ++ log_source = RegisterEventSource(NULL, "Suhosin-Patch-" SUHOSIN_PATCH_VERSION); ++ } ++ ReportEvent(log_source, etype, (unsigned short) SPG(log_syslog_priority), evid, NULL, 1, 0, strs, NULL); ++ ++#endif ++log_sapi: ++ /* SAPI Logging activated? */ ++ /*SDEBUG("(suhosin_log) log_syslog: %u - log_sapi: %u - log_script: %u - log_phpscript: %u", SPG(log_syslog), SPG(log_sapi), SPG(log_script), SPG(log_phpscript));*/ ++ if (((SPG(log_sapi)|S_INTERNAL) & loglevel)!=0) { ++ sapi_module.log_message(buf); ++ } ++ ++/*log_script:*/ ++ /* script logging activaed? */ ++ if (((SPG(log_script) & loglevel)!=0) && SPG(log_scriptname)!=NULL) { ++ char cmd[8192], *cmdpos, *bufpos; ++ FILE *in; ++ int space; ++ ++ ap_php_snprintf(cmd, sizeof(cmd), "%s %s \'", SPG(log_scriptname), loglevel2string(loglevel)); ++ space = sizeof(cmd) - strlen(cmd); ++ cmdpos = cmd + strlen(cmd); ++ bufpos = buf; ++ if (space <= 1) return; ++ while (space > 2 && *bufpos) { ++ if (*bufpos == '\'') { ++ if (space<=5) break; ++ *cmdpos++ = '\''; ++ *cmdpos++ = '\\'; ++ *cmdpos++ = '\''; ++ *cmdpos++ = '\''; ++ bufpos++; ++ space-=4; ++ } else { ++ *cmdpos++ = *bufpos++; ++ space--; ++ } ++ } ++ *cmdpos++ = '\''; ++ *cmdpos = 0; ++ ++ if ((in=VCWD_POPEN(cmd, "r"))==NULL) { ++ php_security_log(S_INTERNAL, "Unable to execute logging shell script: %s", SPG(log_scriptname)); ++ return; ++ } ++ /* read and forget the result */ ++ while (1) { ++ int readbytes = fread(cmd, 1, sizeof(cmd), in); ++ if (readbytes<=0) { ++ break; ++ } ++ } ++ pclose(in); ++ } ++/*log_phpscript:*/ ++ if ((SPG(log_phpscript) & loglevel)!=0 && EG(in_execution) && SPG(log_phpscriptname) && SPG(log_phpscriptname)[0]) { ++ zend_file_handle file_handle; ++ zend_op_array *new_op_array; ++ zval *result = NULL; ++ ++ /*long orig_execution_depth = SPG(execution_depth);*/ ++ zend_bool orig_safe_mode = PG(safe_mode); ++ char *orig_basedir = PG(open_basedir); ++ ++ char *phpscript = SPG(log_phpscriptname); ++/*SDEBUG("scriptname %s", SPG(log_phpscriptname));`*/ ++#ifdef ZEND_ENGINE_2 ++ if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) { ++#else ++ if (zend_open(phpscript, &file_handle) == SUCCESS && ZEND_IS_VALID_FILE_HANDLE(&file_handle)) { ++ file_handle.filename = phpscript; ++ file_handle.free_filename = 0; ++#endif ++ if (!file_handle.opened_path) { ++ file_handle.opened_path = estrndup(phpscript, strlen(phpscript)); ++ } ++ new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC); ++ zend_destroy_file_handle(&file_handle TSRMLS_CC); ++ if (new_op_array) { ++ HashTable *active_symbol_table = EG(active_symbol_table); ++ zval *zerror, *zerror_class; ++ ++ if (active_symbol_table == NULL) { ++ active_symbol_table = &EG(symbol_table); ++ } ++ EG(return_value_ptr_ptr) = &result; ++ EG(active_op_array) = new_op_array; ++ ++ MAKE_STD_ZVAL(zerror); ++ MAKE_STD_ZVAL(zerror_class); ++ ZVAL_STRING(zerror, buf, 1); ++ ZVAL_LONG(zerror_class, loglevel); ++ ++ zend_hash_update(active_symbol_table, "SUHOSIN_ERROR", sizeof("SUHOSIN_ERROR"), (void **)&zerror, sizeof(zval *), NULL); ++ zend_hash_update(active_symbol_table, "SUHOSIN_ERRORCLASS", sizeof("SUHOSIN_ERRORCLASS"), (void **)&zerror_class, sizeof(zval *), NULL); ++ ++ /*SPG(execution_depth) = 0;*/ ++ if (SPG(log_phpscript_is_safe)) { ++ PG(safe_mode) = 0; ++ PG(open_basedir) = NULL; ++ } ++ ++ zend_execute(new_op_array TSRMLS_CC); ++ ++ /*SPG(execution_depth) = orig_execution_depth;*/ ++ PG(safe_mode) = orig_safe_mode; ++ PG(open_basedir) = orig_basedir; ++ ++#ifdef ZEND_ENGINE_2 ++ destroy_op_array(new_op_array TSRMLS_CC); ++#else ++ destroy_op_array(new_op_array); ++#endif ++ efree(new_op_array); ++#ifdef ZEND_ENGINE_2 ++ if (!EG(exception)) ++#endif ++ { ++ if (EG(return_value_ptr_ptr)) { ++ zval_ptr_dtor(EG(return_value_ptr_ptr)); ++ EG(return_value_ptr_ptr) = NULL; ++ } ++ } ++ } else { ++ php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname)); ++ return; ++ } ++ } else { ++ php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname)); ++ return; ++ } ++ } ++ ++} ++ ++ ++#endif ++ ++/* ++ * Local variables: ++ * tab-width: 4 ++ * c-basic-offset: 4 ++ * End: ++ * vim600: sw=4 ts=4 fdm=marker ++ * vim<600: sw=4 ts=4 ++ */ +--- /dev/null ++++ b/main/suhosin_patch.h +@@ -0,0 +1,59 @@ ++/* ++ +----------------------------------------------------------------------+ ++ | Suhosin Patch for PHP | ++ +----------------------------------------------------------------------+ ++ | Copyright (c) 2004-2010 Stefan Esser | ++ +----------------------------------------------------------------------+ ++ | This source file is subject to version 2.02 of the PHP license, | ++ | that is bundled with this package in the file LICENSE, and is | ++ | available at through the world-wide-web at | ++ | http://www.php.net/license/2_02.txt. | ++ | If you did not receive a copy of the PHP license and are unable to | ++ | obtain it through the world-wide-web, please send a note to | ++ | license@php.net so we can mail you a copy immediately. | ++ +----------------------------------------------------------------------+ ++ | Author: Stefan Esser | ++ +----------------------------------------------------------------------+ ++ */ ++ ++#ifndef SUHOSIN_PATCH_H ++#define SUHOSIN_PATCH_H ++ ++#if SUHOSIN_PATCH ++ ++#include "zend.h" ++ ++#define SUHOSIN_PATCH_VERSION "0.9.10" ++ ++#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18" ++ ++#define SUHOSIN_CONFIG(idx) (suhosin_get_config(idx)) ++ ++#define SUHOSIN_MM_USE_CANARY_PROTECTION 0 ++#define SUHOSIN_MM_DESTROY_FREE_MEMORY 1 ++#define SUHOSIN_MM_IGNORE_CANARY_VIOLATION 2 ++#define SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR 3 ++#define SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR 4 ++ ++#define SUHOSIN_CONFIG_SET 100 ++ ++#include ++#include ++#include ++ ++#if defined(DARWIN) ++#include ++#endif ++ ++#define SUHOSIN_MANGLE_PTR(ptr) (ptr==NULL?NULL:((void *)((zend_intptr_t)(ptr)^SUHOSIN_POINTER_GUARD))) ++ ++#endif ++ ++#endif /* SUHOSIN_PATCH_H */ ++ ++/* ++ * Local variables: ++ * tab-width: 4 ++ * c-basic-offset: 4 ++ * End: ++ */ +--- /dev/null ++++ b/main/suhosin_patch.m4 +@@ -0,0 +1,8 @@ ++dnl ++dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $ ++dnl ++dnl This file contains Suhosin Patch for PHP specific autoconf functions. ++dnl ++ ++AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch]) ++ +--- a/sapi/apache/mod_php5.c ++++ b/sapi/apache/mod_php5.c +@@ -969,7 +969,11 @@ static void php_init_handler(server_rec + { + TSRMLS_FETCH(); + if (PG(expose_php)) { ++#if SUHOSIN_PATCH ++ ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch"); ++#else + ap_add_version_component("PHP/" PHP_VERSION); ++#endif + } + } + #endif +--- a/sapi/apache2filter/sapi_apache2.c ++++ b/sapi/apache2filter/sapi_apache2.c +@@ -583,7 +583,11 @@ static void php_apache_add_version(apr_p + { + TSRMLS_FETCH(); + if (PG(expose_php)) { ++#if SUHOSIN_PATCH ++ ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch"); ++#else + ap_add_version_component(p, "PHP/" PHP_VERSION); ++#endif + } + } + +--- a/sapi/apache2handler/sapi_apache2.c ++++ b/sapi/apache2handler/sapi_apache2.c +@@ -407,7 +407,11 @@ static void php_apache_add_version(apr_p + { + TSRMLS_FETCH(); + if (PG(expose_php)) { ++#if SUHOSIN_PATCH ++ ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch"); ++#else + ap_add_version_component(p, "PHP/" PHP_VERSION); ++#endif + } + } + +--- a/sapi/apache_hooks/mod_php5.c ++++ b/sapi/apache_hooks/mod_php5.c +@@ -1256,7 +1256,11 @@ static void php_init_handler(server_rec + { + TSRMLS_FETCH(); + if (PG(expose_php)) { ++#if SUHOSIN_PATCH ++ ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch"); ++#else + ap_add_version_component("PHP/" PHP_VERSION); ++#endif + } + } + #endif +--- a/sapi/cgi/cgi_main.c ++++ b/sapi/cgi/cgi_main.c +@@ -1929,10 +1929,18 @@ consult the installation file that came + SG(headers_sent) = 1; + SG(request_info).no_headers = 1; + } ++#if SUHOSIN_PATCH + #if ZEND_DEBUG +- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#endif ++#else ++ #if ZEND_DEBUG ++ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ #else ++ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ #endif + #endif + php_request_shutdown((void *) 0); + fcgi_shutdown(); +--- a/sapi/cli/php_cli.c ++++ b/sapi/cli/php_cli.c +@@ -832,7 +832,11 @@ int main(int argc, char *argv[]) + } + + request_started = 1; +- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", ++ php_printf("PHP %s " ++#if SUHOSIN_PATCH ++ "with Suhosin-Patch " ++#endif ++ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s", + PHP_VERSION, sapi_module.name, __DATE__, __TIME__, + #if ZEND_DEBUG && defined(HAVE_GCOV) + "(DEBUG GCOV)", +--- a/sapi/litespeed/lsapi_main.c ++++ b/sapi/litespeed/lsapi_main.c +@@ -710,10 +710,18 @@ static int cli_main( int argc, char * ar + break; + case 'v': + if (php_request_startup(TSRMLS_C) != FAILURE) { ++#if SUHOSIN_PATCH + #if ZEND_DEBUG +- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#endif ++#else ++#if ZEND_DEBUG ++ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#else ++ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#endif + #endif + #ifdef PHP_OUTPUT_NEWAPI + php_output_end_all(TSRMLS_C); +--- a/sapi/milter/php_milter.c ++++ b/sapi/milter/php_milter.c +@@ -1111,7 +1111,11 @@ int main(int argc, char *argv[]) + } + SG(headers_sent) = 1; + SG(request_info).no_headers = 1; ++#if SUHOSIN_PATCH ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#else + php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++#endif + php_end_ob_buffers(1 TSRMLS_CC); + exit(1); + break; +--- a/win32/build/config.w32 ++++ b/win32/build/config.w32 +@@ -328,7 +328,7 @@ ADD_SOURCES("Zend", "zend_language_parse + zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ + zend_object_handlers.c zend_objects_API.c \ + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ +- zend_float.c"); ++ zend_float.c zend_canary.c zend_alloc_canary.c"); + + if (VCVERS == 1200) { + AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); +@@ -385,6 +385,7 @@ if (PHP_ZEND_MULTIBYTE == "yes") { + + AC_DEFINE('HAVE_USLEEP', 1); + AC_DEFINE('HAVE_STRCOLL', 1); ++AC_DEFINE('SUHOSIN_PATCH', 1); + + /* For snapshot builders, where can we find the additional + * files that make up the snapshot template? */ +--- a/win32/build/config.w32.h.in ++++ b/win32/build/config.w32.h.in +@@ -152,6 +152,9 @@ + /* Win32 supports strcoll */ + #define HAVE_STRCOLL 1 + ++/* Suhosin Patch support */ ++#define SUHOSIN_PATCH 1 ++ + /* Win32 supports socketpair by the emulation in win32/sockets.c */ + #define HAVE_SOCKETPAIR 1 + #define HAVE_SOCKLEN_T 1 --- php5-5.3.6.orig/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch +++ php5-5.3.6/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch @@ -0,0 +1,17 @@ +--- a/ext/mssql/php_mssql.c ++++ b/ext/mssql/php_mssql.c +@@ -1099,6 +1099,14 @@ static void php_mssql_get_column_content + return; + } + ++ if (res_length == 0) { ++ ZVAL_NULL(result); ++ return; ++ } else if (res_length < 0) { ++ ZVAL_FALSE(result); ++ return; ++ } ++ + res_buf = (unsigned char *) emalloc(res_length+1); + bin = ((DBBINARY *)dbdata(mssql_ptr->link, offset)); + res_buf[res_length] = '\0'; --- php5-5.3.6.orig/debian/patches/fix_broken_upstream_tests.patch +++ php5-5.3.6/debian/patches/fix_broken_upstream_tests.patch @@ -0,0 +1,25 @@ +Description: Add missing settings to fix upstream tests +Origin: vendor +Forwarded: http://bugs.php.net/50796 +Last-Update: 2010-01-18 + +--- a/ext/soap/tests/server009.phpt ++++ b/ext/soap/tests/server009.phpt +@@ -10,6 +10,7 @@ SOAP Server 9: setclass and setpersisten + --INI-- + session.auto_start=1 + session.save_handler=files ++session.save_path=temp_session_store + --FILE-- + + --FILE-- + --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-3267.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-3267.patch @@ -0,0 +1,25 @@ +Subject: Fixed crash in error_log() (strlen(NULL)) +Origin: http://svn.php.net/viewvc?view=revision&revision=312417 + +r312417 | felipe | 2011-06-23 14:48:15 -0700 (Thu, 23 Jun 2011) | 1 line +- Fixed crash in error_log() (strlen(NULL)) reported by: shm, Maksymilian Arciemowicz + +CVE-2011-3267 + +--- + ext/standard/basic_functions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/ext/standard/basic_functions.c +=================================================================== +--- a/ext/standard/basic_functions.c ++++ b/ext/standard/basic_functions.c +@@ -4676,7 +4676,7 @@ PHP_FUNCTION(error_log) + opt_err = erropt; + } + +- if (opt_err == 3) { ++ if (opt_err == 3 && opt) { + if (strlen(opt) != opt_len) { + RETURN_FALSE; + } --- php5-5.3.6.orig/debian/patches/fix_broken_sha2_test.patch +++ php5-5.3.6/debian/patches/fix_broken_sha2_test.patch @@ -0,0 +1,39 @@ +--- a/ext/standard/config.m4 ++++ b/ext/standard/config.m4 +@@ -184,12 +184,12 @@ AC_TRY_RUN([ + + main() { + #if HAVE_CRYPT +- char salt[30], answer[80]; +- +- salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; ++ char salt[21], answer[21+86]; ++ ++ 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 +@@ -213,12 +213,13 @@ AC_TRY_RUN([ + + 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 --- php5-5.3.6.orig/debian/patches/112-proc_open.patch +++ php5-5.3.6/debian/patches/112-proc_open.patch @@ -0,0 +1,11 @@ +--- a/ext/standard/proc_open.c ++++ b/ext/standard/proc_open.c +@@ -62,7 +62,7 @@ + * */ + #ifdef PHP_CAN_SUPPORT_PROC_OPEN + +-#if 0 && HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H ++#if HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H + # include + # include + # define PHP_CAN_DO_PTS 1 --- php5-5.3.6.orig/debian/patches/disable_SSLv2_for_openssl_1_0_0.patch +++ php5-5.3.6/debian/patches/disable_SSLv2_for_openssl_1_0_0.patch @@ -0,0 +1,52 @@ +--- a/ext/openssl/xp_ssl.c ++++ b/ext/openssl/xp_ssl.c +@@ -328,10 +328,12 @@ static inline int php_openssl_setup_cryp + sslsock->is_client = 1; + method = SSLv23_client_method(); + break; ++#ifndef OPENSSL_NO_SSL2 + case STREAM_CRYPTO_METHOD_SSLv2_CLIENT: + sslsock->is_client = 1; + method = SSLv2_client_method(); + break; ++#endif + case STREAM_CRYPTO_METHOD_SSLv3_CLIENT: + sslsock->is_client = 1; + method = SSLv3_client_method(); +@@ -348,10 +350,12 @@ static inline int php_openssl_setup_cryp + sslsock->is_client = 0; + method = SSLv3_server_method(); + break; ++#ifndef OPENSSL_NO_SSL2 + case STREAM_CRYPTO_METHOD_SSLv2_SERVER: + sslsock->is_client = 0; + method = SSLv2_server_method(); + break; ++#endif + case STREAM_CRYPTO_METHOD_TLS_SERVER: + sslsock->is_client = 0; + method = TLSv1_server_method(); +@@ -629,9 +633,11 @@ static inline int php_openssl_tcp_sockop + case STREAM_CRYPTO_METHOD_SSLv23_CLIENT: + sock->method = STREAM_CRYPTO_METHOD_SSLv23_SERVER; + break; ++#ifndef OPENSSL_NO_SSL2 + case STREAM_CRYPTO_METHOD_SSLv2_CLIENT: + sock->method = STREAM_CRYPTO_METHOD_SSLv2_SERVER; + break; ++#endif + case STREAM_CRYPTO_METHOD_SSLv3_CLIENT: + sock->method = STREAM_CRYPTO_METHOD_SSLv3_SERVER; + break; +@@ -911,9 +917,11 @@ php_stream *php_openssl_ssl_socket_facto + if (strncmp(proto, "ssl", protolen) == 0) { + sslsock->enable_on_connect = 1; + sslsock->method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT; ++#ifndef OPENSSL_NO_SSL2 + } else if (strncmp(proto, "sslv2", protolen) == 0) { + sslsock->enable_on_connect = 1; + sslsock->method = STREAM_CRYPTO_METHOD_SSLv2_CLIENT; ++#endif + } else if (strncmp(proto, "sslv3", protolen) == 0) { + sslsock->enable_on_connect = 1; + sslsock->method = STREAM_CRYPTO_METHOD_SSLv3_CLIENT; --- php5-5.3.6.orig/debian/patches/backport-upstream-lp592442.patch +++ php5-5.3.6/debian/patches/backport-upstream-lp592442.patch @@ -0,0 +1,21 @@ +--- a/ext/openssl/xp_ssl.c ++++ b/ext/openssl/xp_ssl.c +@@ -385,6 +385,18 @@ static inline int php_openssl_setup_cryp + } + #endif + ++#if OPENSSL_VERSION_NUMBER >= 0x0090806fL ++ { ++ zval **val; ++ ++ if (stream->context && SUCCESS == php_stream_context_get_option( ++ stream->context, "ssl", "no_ticket", &val) && ++ zval_is_true(*val)) { ++ SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET); ++ } ++ } ++#endif ++ + sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream TSRMLS_CC); + if (sslsock->ssl_handle == NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create an SSL handle"); --- php5-5.3.6.orig/debian/patches/php5-CVE-2011-1148.patch +++ php5-5.3.6/debian/patches/php5-CVE-2011-1148.patch @@ -0,0 +1,199 @@ +Subject: fix bug #54238 (use-after-free in substr_replace()) +Origin: http://svn.php.net/viewvc?view=revision&revision=310194 + +CVE-2011-1148 + +Patch differs from upstream commit in that added entry in NEWS file has +been removed to reduce patch conflicts. + +Index: ext/standard/string.c +=================================================================== +--- ext/standard/string.c (revision 310193) ++++ ext/standard/string.c (revision 310194) +@@ -2352,20 +2352,35 @@ + + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(str), &pos_str); + while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(str), (void **) &tmp_str, &pos_str) == SUCCESS) { +- convert_to_string_ex(tmp_str); ++ zval *orig_str; ++ zval dummy; ++ if(Z_TYPE_PP(tmp_str) != IS_STRING) { ++ dummy = **tmp_str; ++ orig_str = &dummy; ++ zval_copy_ctor(orig_str); ++ convert_to_string(orig_str); ++ } else { ++ orig_str = *tmp_str; ++ } + + if (Z_TYPE_PP(from) == IS_ARRAY) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(from), (void **) &tmp_from, &pos_from)) { +- convert_to_long_ex(tmp_from); ++ if(Z_TYPE_PP(tmp_from) != IS_LONG) { ++ zval dummy = **tmp_from; ++ zval_copy_ctor(&dummy); ++ convert_to_long(&dummy); ++ f = Z_LVAL(dummy); ++ } else { ++ f = Z_LVAL_PP(tmp_from); ++ } + +- f = Z_LVAL_PP(tmp_from); + if (f < 0) { +- f = Z_STRLEN_PP(tmp_str) + f; ++ f = Z_STRLEN_P(orig_str) + f; + if (f < 0) { + f = 0; + } +- } else if (f > Z_STRLEN_PP(tmp_str)) { +- f = Z_STRLEN_PP(tmp_str); ++ } else if (f > Z_STRLEN_P(orig_str)) { ++ f = Z_STRLEN_P(orig_str); + } + zend_hash_move_forward_ex(Z_ARRVAL_PP(from), &pos_from); + } else { +@@ -2374,72 +2389,94 @@ + } else { + f = Z_LVAL_PP(from); + if (f < 0) { +- f = Z_STRLEN_PP(tmp_str) + f; ++ f = Z_STRLEN_P(orig_str) + f; + if (f < 0) { + f = 0; + } +- } else if (f > Z_STRLEN_PP(tmp_str)) { +- f = Z_STRLEN_PP(tmp_str); ++ } else if (f > Z_STRLEN_P(orig_str)) { ++ f = Z_STRLEN_P(orig_str); + } + } + + if (argc > 3 && Z_TYPE_PP(len) == IS_ARRAY) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(len), (void **) &tmp_len, &pos_len)) { +- convert_to_long_ex(tmp_len); ++ if(Z_TYPE_PP(tmp_len) != IS_LONG) { ++ zval dummy = **tmp_len; ++ zval_copy_ctor(&dummy); ++ convert_to_long(&dummy); ++ l = Z_LVAL(dummy); ++ } else { ++ l = Z_LVAL_PP(tmp_len); ++ } + + l = Z_LVAL_PP(tmp_len); + zend_hash_move_forward_ex(Z_ARRVAL_PP(len), &pos_len); + } else { +- l = Z_STRLEN_PP(tmp_str); ++ l = Z_STRLEN_P(orig_str); + } + } else if (argc > 3) { + l = Z_LVAL_PP(len); + } else { +- l = Z_STRLEN_PP(tmp_str); ++ l = Z_STRLEN_P(orig_str); + } + + if (l < 0) { +- l = (Z_STRLEN_PP(tmp_str) - f) + l; ++ l = (Z_STRLEN_P(orig_str) - f) + l; + if (l < 0) { + l = 0; + } + } + +- if ((f + l) > Z_STRLEN_PP(tmp_str)) { +- l = Z_STRLEN_PP(tmp_str) - f; ++ if ((f + l) > Z_STRLEN_P(orig_str)) { ++ l = Z_STRLEN_P(orig_str) - f; + } + +- result_len = Z_STRLEN_PP(tmp_str) - l; ++ result_len = Z_STRLEN_P(orig_str) - l; + + if (Z_TYPE_PP(repl) == IS_ARRAY) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(repl), (void **) &tmp_repl, &pos_repl)) { +- convert_to_string_ex(tmp_repl); +- result_len += Z_STRLEN_PP(tmp_repl); ++ zval *repl_str; ++ zval zrepl; ++ if(Z_TYPE_PP(tmp_repl) != IS_STRING) { ++ zrepl = **tmp_repl; ++ repl_str = &zrepl; ++ zval_copy_ctor(repl_str); ++ convert_to_string(repl_str); ++ } else { ++ repl_str = *tmp_repl; ++ } ++ ++ result_len += Z_STRLEN_P(repl_str); + zend_hash_move_forward_ex(Z_ARRVAL_PP(repl), &pos_repl); + result = emalloc(result_len + 1); + +- memcpy(result, Z_STRVAL_PP(tmp_str), f); +- memcpy((result + f), Z_STRVAL_PP(tmp_repl), Z_STRLEN_PP(tmp_repl)); +- memcpy((result + f + Z_STRLEN_PP(tmp_repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l); ++ memcpy(result, Z_STRVAL_P(orig_str), f); ++ memcpy((result + f), Z_STRVAL_P(repl_str), Z_STRLEN_P(repl_str)); ++ memcpy((result + f + Z_STRLEN_P(repl_str)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l); ++ if(Z_TYPE_PP(tmp_repl) != IS_STRING) { ++ zval_dtor(repl_str); ++ } + } else { + result = emalloc(result_len + 1); + +- memcpy(result, Z_STRVAL_PP(tmp_str), f); +- memcpy((result + f), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l); ++ memcpy(result, Z_STRVAL_P(orig_str), f); ++ memcpy((result + f), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l); + } + } else { + result_len += Z_STRLEN_PP(repl); + + result = emalloc(result_len + 1); + +- memcpy(result, Z_STRVAL_PP(tmp_str), f); ++ memcpy(result, Z_STRVAL_P(orig_str), f); + memcpy((result + f), Z_STRVAL_PP(repl), Z_STRLEN_PP(repl)); +- memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l); ++ memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l); + } + + result[result_len] = '\0'; + add_next_index_stringl(return_value, result, result_len, 0); +- ++ if(Z_TYPE_PP(tmp_str) != IS_STRING) { ++ zval_dtor(orig_str); ++ } + zend_hash_move_forward_ex(Z_ARRVAL_PP(str), &pos_str); + } /*while*/ + } /* if */ +Index: ext/standard/tests/strings/bug54238.phpt +=================================================================== +--- ext/standard/tests/strings/bug54238.phpt (revision 0) ++++ ext/standard/tests/strings/bug54238.phpt (revision 310194) +@@ -0,0 +1,25 @@ ++--TEST-- ++Bug #54238 (use-after-free in substr_replace()) ++--INI-- ++error_reporting=E_ALL&~E_NOTICE ++--FILE-- ++ ++--EXPECT-- ++array(1) { ++ [0]=> ++ string(9) "AArrayray" ++} ++array(1) { ++ [0]=> ++ array(2) { ++ [0]=> ++ string(1) "A" ++ [1]=> ++ string(1) "A" ++ } ++} --- php5-5.3.6.orig/debian/patches/006-debian_quirks.patch +++ php5-5.3.6/debian/patches/006-debian_quirks.patch @@ -0,0 +1,223 @@ +Description: Changes to make php use versioned paths and other minor + cleanup changes. +Origin: vendor +Forwarded: not-needed +Last-Update: 2010-01-18 + +--- a/configure.in ++++ b/configure.in +@@ -1005,7 +1005,7 @@ if test "$PHP_CLI" = "no"; then + fi + + PHP_ARG_WITH(pear, [whether to install PEAR], +-[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] ++[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php5] + --without-pear Do not install PEAR], DEFAULT, yes) + + if test "$PHP_PEAR" != "no"; then +@@ -1035,7 +1035,7 @@ dnl + if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then + case $PHP_LAYOUT in + GNU) PEAR_INSTALLDIR=$datadir/pear;; +- *) PEAR_INSTALLDIR=$libdir/php;; ++ *) PEAR_INSTALLDIR=$libdir/php5;; + esac + fi + +@@ -1090,12 +1090,12 @@ test "$program_suffix" = "NONE" && progr + + case $libdir in + '${exec_prefix}/lib') +- libdir=$libdir/php ++ libdir=$libdir/php5 + ;; + esac + case $datadir in + '${prefix}/share') +- datadir=$datadir/php ++ datadir=$datadir/php5 + ;; + esac + +@@ -1161,7 +1161,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd + EXPANDED_DATADIR=$datadir + EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:/usr/share/pear + + exec_prefix=$old_exec_prefix + libdir=$old_libdir +--- a/ext/ext_skel ++++ b/ext/ext_skel +@@ -70,7 +70,7 @@ if test -d "$extname" ; then + fi + + if test -z "$skel_dir"; then +- skel_dir="skeleton" ++ skel_dir="/usr/lib/php5/skeleton" + fi + + ## convert skel_dir to full path +--- a/php.ini-development ++++ b/php.ini-development +@@ -781,7 +781,7 @@ default_mimetype = "text/html" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++;include_path = ".:/usr/share/php" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +--- a/php.ini-production ++++ b/php.ini-production +@@ -781,7 +781,7 @@ default_mimetype = "text/html" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++;include_path = ".:/usr/share/php" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -937,54 +937,6 @@ default_socket_timeout = 60 + ; + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. +-; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; +--- a/sapi/caudium/config.m4 ++++ b/sapi/caudium/config.m4 +@@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then + AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/]) + 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,' ` ++ PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Master file' | sed -e 's/.*: //' -e 's/master.pike/modules/'` ++ PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/modules,,' -e 's,modules,include,' ` + if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then + AC_MSG_ERROR(Failed to figure out Pike module and include directories) + fi +@@ -84,7 +84,9 @@ if test "$PHP_CAUDIUM" != "no"; then + PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` + AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) + PHP_SELECT_SAPI(caudium, shared, caudium.c) +- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" ++ dnl FIXME: This is the ugliest hack in the world! ++ dnl INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/ && \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/php5.so" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/ && \$(INSTALL) -m 0755 .$SAPI_SHARED \$(INSTALL_ROOT)$PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" + RESULT=" *** Pike binary used: $PIKE + *** Pike include dir(s) used: $PIKE_INCLUDE_DIR + *** Pike version: $PIKE_VERSION" +--- a/sapi/cli/php.1.in ++++ b/sapi/cli/php.1.in +@@ -336,13 +336,14 @@ Shows configuration for extension + Show configuration file names + .SH FILES + .TP 15 +-.B php\-cli.ini ++.B /etc/php5/cli/php.ini + The configuration file for the CLI version of PHP. + .TP +-.B php.ini +-The standard configuration file will only be used when +-.B php\-cli.ini +-cannot be found. ++.B /etc/php5/cgi/php.ini ++The configuration file for the CGI version of PHP. ++.TP ++.B /etc/php5/apache2/php.ini ++The configuration file for the version of PHP that apache2 uses. + .SH EXAMPLES + .TP 5 + \fIphp \-r 'echo "Hello World\\n";'\fP +--- a/scripts/Makefile.frag ++++ b/scripts/Makefile.frag +@@ -3,8 +3,8 @@ + # Build environment install + # + +-phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpincludedir = $(includedir)/php5 ++phpbuilddir = $(prefix)/lib/php5/build + + BUILD_FILES = \ + scripts/phpize.m4 \ +--- a/scripts/php-config.in ++++ b/scripts/php-config.in +@@ -5,8 +5,8 @@ prefix="@prefix@" + exec_prefix="@exec_prefix@" + version="@PHP_VERSION@" + vernum="@PHP_VERSION_ID@" +-include_dir="@includedir@/php" +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ++include_dir="@includedir@/php5" ++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib $(getconf LFS_CFLAGS)" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" + extension_dir='@EXTENSION_DIR@' +--- a/scripts/phpize.in ++++ b/scripts/phpize.in +@@ -3,8 +3,8 @@ + # Variable declaration + prefix='@prefix@' + exec_prefix="`eval echo @exec_prefix@`" +-phpdir="`eval echo @libdir@`/build" +-includedir="`eval echo @includedir@`/php" ++phpdir="$prefix/lib/php5/build" ++includedir="$prefix/include/php5" + builddir="`pwd`" + SED="@SED@" + --- php5-5.3.6.orig/debian/patches/001-libtool_fixes.patch +++ php5-5.3.6/debian/patches/001-libtool_fixes.patch @@ -0,0 +1,24 @@ +--- a/TSRM/configure.in ++++ b/TSRM/configure.in +@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS + TSRM_THREADS_CHECKS + + AM_PROG_LIBTOOL +-if test "$enable_debug" != "yes"; then +- AM_SET_LIBTOOL_VARIABLE([--silent]) +-fi + + dnl TSRM_PTHREAD + +--- a/configure.in ++++ b/configure.in +@@ -1343,9 +1343,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], + ]) + AC_PROG_LIBTOOL + +-if test "$enable_debug" != "yes"; then +- PHP_SET_LIBTOOL_VARIABLE([--silent]) +-fi + + dnl libtool 1.4.3 needs this. + PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps]) --- php5-5.3.6.orig/debian/patches/gentoo/009_ob-memory-leaks.patch +++ php5-5.3.6/debian/patches/gentoo/009_ob-memory-leaks.patch @@ -0,0 +1,35 @@ +009_ob-memory-leaks.patch +PHP_5_2 +http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.8&r2=1.167.2.3.2.9&diff_format=u +Fixed memory leak in ob_get_clean/ob_get_flush. + +--- a/main/output.c ++++ b/main/output.c +@@ -809,11 +809,13 @@ PHP_FUNCTION(ob_clean) + + if (!OG(ob_nesting_level)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete"); ++ zval_dtor(return_value); + RETURN_FALSE; + } + + if (!OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s", OG(active_ob_buffer).handler_name); ++ zval_dtor(return_value); + RETURN_FALSE; + } + +@@ -832,11 +834,13 @@ PHP_FUNCTION(ob_end_flush) + + if (!OG(ob_nesting_level)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush"); ++ zval_dtor(return_value); + RETURN_FALSE; + } + + if (OG(ob_nesting_level) && !OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s", OG(active_ob_buffer).handler_name); ++ zval_dtor(return_value); + RETURN_FALSE; + } + --- php5-5.3.6.orig/debian/source/format +++ php5-5.3.6/debian/source/format @@ -0,0 +1 @@ +1.0