| Index: third_party/yasm/patched-yasm/configure
|
| ===================================================================
|
| --- third_party/yasm/patched-yasm/configure (revision 71129)
|
| +++ third_party/yasm/patched-yasm/configure (working copy)
|
| @@ -1,62 +1,85 @@
|
| #! /bin/sh
|
| # Guess values for system-dependent variables and create Makefiles.
|
| -# Generated by GNU Autoconf 2.61 for yasm 0.8.0.
|
| +# Generated by GNU Autoconf 2.65 for yasm 1.1.0.
|
| #
|
| # Report bugs to <bug-yasm@tortall.net>.
|
| #
|
| +#
|
| # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
| +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
| +# Inc.
|
| +#
|
| +#
|
| # This configure script is free software; the Free Software Foundation
|
| # gives unlimited permission to copy, distribute and modify it.
|
| -## --------------------- ##
|
| -## M4sh Initialization. ##
|
| -## --------------------- ##
|
| +## -------------------- ##
|
| +## 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
|
| +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
|
| + # 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 ;;
|
| + case `(set -o) 2>/dev/null` in #(
|
| + *posix*) :
|
| + set -o posix ;; #(
|
| + *) :
|
| + ;;
|
| esac
|
| -
|
| fi
|
|
|
|
|
| -
|
| -
|
| -# PATH needs CR
|
| -# 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
|
| -
|
| -# The user is always right.
|
| -if test "${PATH_SEPARATOR+set}" != set; then
|
| - echo "#! /bin/sh" >conf$$.sh
|
| - echo "exit 0" >>conf$$.sh
|
| - chmod +x conf$$.sh
|
| - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
| - PATH_SEPARATOR=';'
|
| +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
|
| - PATH_SEPARATOR=:
|
| + 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
|
| - rm -f conf$$.sh
|
| + export as_echo_body
|
| + as_echo='sh -c $as_echo_body as_echo'
|
| fi
|
|
|
| -# Support unset when possible.
|
| -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| - as_unset=unset
|
| -else
|
| - as_unset=false
|
| +# 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
|
|
|
|
|
| @@ -65,20 +88,18 @@
|
| # 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.)
|
| -as_nl='
|
| -'
|
| IFS=" "" $as_nl"
|
|
|
| # Find who we are. Look in the path if we contain no directory separator.
|
| -case $0 in
|
| +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
|
| + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| ;;
|
| @@ -89,354 +110,322 @@
|
| as_myself=$0
|
| fi
|
| if test ! -f "$as_myself"; then
|
| - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| - { (exit 1); exit 1; }
|
| + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| + exit 1
|
| fi
|
|
|
| -# Work around bugs in pre-3.0 UWIN ksh.
|
| -for as_var in ENV MAIL MAILPATH
|
| -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| +# 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.
|
| -for as_var in \
|
| - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
| - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
| - LC_TELEPHONE LC_TIME
|
| -do
|
| - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
| - eval $as_var=C; export $as_var
|
| - else
|
| - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| - fi
|
| -done
|
| +LC_ALL=C
|
| +export LC_ALL
|
| +LANGUAGE=C
|
| +export LANGUAGE
|
|
|
| -# Required to use basename.
|
| -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
|
| -
|
| -
|
| -# Name of the executable.
|
| -as_me=`$as_basename -- "$0" ||
|
| -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
| - X"$0" : 'X\(//\)$' \| \
|
| - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X/"$0" |
|
| - sed '/^.*\/\([^/][^/]*\)\/*$/{
|
| - s//\1/
|
| - q
|
| - }
|
| - /^X\/\(\/\/\)$/{
|
| - s//\1/
|
| - q
|
| - }
|
| - /^X\/\(\/\).*/{
|
| - s//\1/
|
| - q
|
| - }
|
| - s/.*/./; q'`
|
| -
|
| # CDPATH.
|
| -$as_unset CDPATH
|
| +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
| -
|
| if test "x$CONFIG_SHELL" = x; then
|
| - if (eval ":") 2>/dev/null; then
|
| - as_have_required=yes
|
| + 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
|
| - as_have_required=no
|
| + 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; }
|
|
|
| - if test $as_have_required = yes && (eval ":
|
| -(as_func_return () {
|
| - (exit \$1)
|
| -}
|
| -as_func_success () {
|
| - as_func_return 0
|
| -}
|
| -as_func_failure () {
|
| - as_func_return 1
|
| -}
|
| -as_func_ret_success () {
|
| - return 0
|
| -}
|
| -as_func_ret_failure () {
|
| - return 1
|
| -}
|
| -
|
| exitcode=0
|
| -if as_func_success; then
|
| - :
|
| -else
|
| - exitcode=1
|
| - echo as_func_success failed.
|
| -fi
|
| +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 :
|
|
|
| -if as_func_failure; then
|
| - exitcode=1
|
| - echo as_func_failure succeeded.
|
| -fi
|
| -
|
| -if as_func_ret_success; then
|
| - :
|
| else
|
| - exitcode=1
|
| - echo as_func_ret_success failed.
|
| + exitcode=1; echo positional parameters were not saved.
|
| fi
|
| -
|
| -if as_func_ret_failure; then
|
| - exitcode=1
|
| - echo as_func_ret_failure succeeded.
|
| -fi
|
| -
|
| -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
| - :
|
| +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"
|
| + if (eval "$as_required") 2>/dev/null; then :
|
| + as_have_required=yes
|
| else
|
| - exitcode=1
|
| - echo positional parameters were not saved.
|
| + as_have_required=no
|
| fi
|
| + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
|
|
| -test \$exitcode = 0) || { (exit 1); exit 1; }
|
| -
|
| -(
|
| - as_lineno_1=\$LINENO
|
| - as_lineno_2=\$LINENO
|
| - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
| - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
| -") 2> /dev/null; then
|
| - :
|
| else
|
| - as_candidate_shells=
|
| - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| + 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=.
|
| - case $as_dir in
|
| + as_found=:
|
| + case $as_dir in #(
|
| /*)
|
| for as_base in sh bash ksh sh5; do
|
| - as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
| + # 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
|
|
|
|
|
| - for as_shell in $as_candidate_shells $SHELL; do
|
| - # Try only shells that exist, to save several forks.
|
| - if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
| - { ("$as_shell") 2> /dev/null <<\_ASEOF
|
| -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
|
| -
|
| + if test "x$CONFIG_SHELL" != x; then :
|
| + # We cannot yet assume a decent shell, so we have to provide a
|
| + # neutralization value for shells without unset; and this also
|
| + # works around shells that cannot unset nonexistent variables.
|
| + BASH_ENV=/dev/null
|
| + ENV=/dev/null
|
| + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
| + export CONFIG_SHELL
|
| + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
| fi
|
|
|
| -
|
| -:
|
| -_ASEOF
|
| -}; then
|
| - CONFIG_SHELL=$as_shell
|
| - as_have_required=yes
|
| - if { "$as_shell" 2> /dev/null <<\_ASEOF
|
| -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
|
| -
|
| + 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 and
|
| +$0: bug-yasm@tortall.net about your system, including any
|
| +$0: error possibly output before this message. Then install
|
| +$0: a modern shell, or manually run the script under such a
|
| +$0: shell if you do have one."
|
| + fi
|
| + exit 1
|
| fi
|
| -
|
| -
|
| -:
|
| -(as_func_return () {
|
| - (exit $1)
|
| -}
|
| -as_func_success () {
|
| - as_func_return 0
|
| -}
|
| -as_func_failure () {
|
| - as_func_return 1
|
| -}
|
| -as_func_ret_success () {
|
| - return 0
|
| -}
|
| -as_func_ret_failure () {
|
| - return 1
|
| -}
|
| -
|
| -exitcode=0
|
| -if as_func_success; then
|
| - :
|
| -else
|
| - exitcode=1
|
| - echo as_func_success failed.
|
| fi
|
| -
|
| -if as_func_failure; then
|
| - exitcode=1
|
| - echo as_func_failure succeeded.
|
| 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
|
|
|
| -if as_func_ret_success; then
|
| - :
|
| -else
|
| - exitcode=1
|
| - echo as_func_ret_success failed.
|
| -fi
|
| +## --------------------- ##
|
| +## M4sh Shell Functions. ##
|
| +## --------------------- ##
|
| +# as_fn_unset VAR
|
| +# ---------------
|
| +# Portably unset VAR.
|
| +as_fn_unset ()
|
| +{
|
| + { eval $1=; unset $1;}
|
| +}
|
| +as_unset=as_fn_unset
|
|
|
| -if as_func_ret_failure; then
|
| - exitcode=1
|
| - echo as_func_ret_failure succeeded.
|
| -fi
|
| +# as_fn_set_status STATUS
|
| +# -----------------------
|
| +# Set $? to STATUS, without forking.
|
| +as_fn_set_status ()
|
| +{
|
| + return $1
|
| +} # as_fn_set_status
|
|
|
| -if ( set x; as_func_ret_success y && test x = "$1" ); then
|
| - :
|
| -else
|
| - exitcode=1
|
| - echo positional parameters were not saved.
|
| -fi
|
| +# 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
|
|
|
| -test $exitcode = 0) || { (exit 1); exit 1; }
|
| +# as_fn_mkdir_p
|
| +# -------------
|
| +# Create "$as_dir" as a directory, including parents if necessary.
|
| +as_fn_mkdir_p ()
|
| +{
|
|
|
| -(
|
| - as_lineno_1=$LINENO
|
| - as_lineno_2=$LINENO
|
| - test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
| + 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"
|
|
|
| -_ASEOF
|
| -}; then
|
| - break
|
| -fi
|
|
|
| -fi
|
| +} # 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
|
|
|
| - done
|
| +# 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
|
|
|
| - if test "x$CONFIG_SHELL" != x; then
|
| - for as_var in BASH_ENV ENV
|
| - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| - done
|
| - export CONFIG_SHELL
|
| - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
| -fi
|
|
|
| +# as_fn_error ERROR [LINENO LOG_FD]
|
| +# ---------------------------------
|
| +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
| +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
| +# script with status $?, using 1 if that was 0.
|
| +as_fn_error ()
|
| +{
|
| + as_status=$?; test $as_status -eq 0 && as_status=1
|
| + if test "$3"; then
|
| + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
| + fi
|
| + $as_echo "$as_me: error: $1" >&2
|
| + as_fn_exit $as_status
|
| +} # as_fn_error
|
|
|
| - if test $as_have_required = no; then
|
| - echo This script requires a shell more modern than all the
|
| - echo shells that I found on your system. Please install a
|
| - echo modern shell, or manually run the script under such a
|
| - echo shell if you do have one.
|
| - { (exit 1); exit 1; }
|
| -fi
|
| -
|
| -
|
| -fi
|
| -
|
| -fi
|
| -
|
| -
|
| -
|
| -(eval "as_func_return () {
|
| - (exit \$1)
|
| -}
|
| -as_func_success () {
|
| - as_func_return 0
|
| -}
|
| -as_func_failure () {
|
| - as_func_return 1
|
| -}
|
| -as_func_ret_success () {
|
| - return 0
|
| -}
|
| -as_func_ret_failure () {
|
| - return 1
|
| -}
|
| -
|
| -exitcode=0
|
| -if as_func_success; then
|
| - :
|
| +if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| + test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| + as_expr=expr
|
| else
|
| - exitcode=1
|
| - echo as_func_success failed.
|
| + as_expr=false
|
| fi
|
|
|
| -if as_func_failure; then
|
| - exitcode=1
|
| - echo as_func_failure succeeded.
|
| -fi
|
| -
|
| -if as_func_ret_success; then
|
| - :
|
| +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
| + as_basename=basename
|
| else
|
| - exitcode=1
|
| - echo as_func_ret_success failed.
|
| + as_basename=false
|
| fi
|
|
|
| -if as_func_ret_failure; then
|
| - exitcode=1
|
| - echo as_func_ret_failure succeeded.
|
| -fi
|
| -
|
| -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
| - :
|
| +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| + as_dirname=dirname
|
| else
|
| - exitcode=1
|
| - echo positional parameters were not saved.
|
| + as_dirname=false
|
| fi
|
|
|
| -test \$exitcode = 0") || {
|
| - echo No shell found that supports shell functions.
|
| - echo Please tell autoconf@gnu.org about your system,
|
| - echo including any error possibly output before this
|
| - echo message
|
| -}
|
| +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_2=$LINENO
|
| - test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
| -
|
| - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
| - # uniformly replaced by the line number. The first 'sed' inserts a
|
| - # line-number line after each line using $LINENO; the second 'sed'
|
| - # does the real work. The second script uses 'N' to pair each
|
| - # line-number line with the line containing $LINENO, and appends
|
| - # trailing '-' during substitution so that $LINENO is not a special
|
| - # case at line end.
|
| - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
| - # scripts with optimization help from Paolo Bonzini. Blame Lee
|
| - # E. McMahon (1931-1989) for sed's syntax. :-)
|
| + 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/=
|
| @@ -453,8 +442,7 @@
|
| s/-\n.*//
|
| ' >$as_me.lineno &&
|
| chmod +x "$as_me.lineno" ||
|
| - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
| - { (exit 1); exit 1; }; }
|
| + { $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
|
| @@ -464,49 +452,40 @@
|
| exit
|
| }
|
|
|
| -
|
| -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| - as_dirname=dirname
|
| -else
|
| - as_dirname=false
|
| -fi
|
| -
|
| ECHO_C= ECHO_N= ECHO_T=
|
| -case `echo -n x` in
|
| +case `echo -n x` in #(((((
|
| -n*)
|
| - case `echo 'x\c'` in
|
| + case `echo 'xy\c'` in
|
| *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
| - *) ECHO_C='\c';;
|
| + xy) ECHO_C='\c';;
|
| + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
| + ECHO_T=' ';;
|
| esac;;
|
| *)
|
| ECHO_N='-n';;
|
| esac
|
|
|
| -if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| - test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| - as_expr=expr
|
| -else
|
| - as_expr=false
|
| -fi
|
| -
|
| 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
|
| + mkdir conf$$.dir 2>/dev/null
|
| fi
|
| -echo >conf$$.file
|
| -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 ||
|
| +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'
|
| -elif ln conf$$.file conf$$ 2>/dev/null; then
|
| - as_ln_s=ln
|
| + fi
|
| else
|
| as_ln_s='cp -p'
|
| fi
|
| @@ -514,7 +493,7 @@
|
| rmdir conf$$.dir 2>/dev/null
|
|
|
| if mkdir -p . 2>/dev/null; then
|
| - as_mkdir_p=:
|
| + as_mkdir_p='mkdir -p "$as_dir"'
|
| else
|
| test -d ./-p && rmdir ./-p
|
| as_mkdir_p=false
|
| @@ -531,12 +510,12 @@
|
| as_test_x='
|
| eval sh -c '\''
|
| if test -d "$1"; then
|
| - test -d "$1/.";
|
| + test -d "$1/.";
|
| else
|
| - case $1 in
|
| - -*)set "./$1";;
|
| + case $1 in #(
|
| + -*)set "./$1";;
|
| esac;
|
| - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
| + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| ???[sx]*):;;*)false;;esac;fi
|
| '\'' sh
|
| '
|
| @@ -550,9 +529,9 @@
|
| as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
|
|
|
| +test -n "$DJDIR" || exec 7<&0 </dev/null
|
| +exec 6>&1
|
|
|
| -exec 7<&0 </dev/null 6>&1
|
| -
|
| # Name of the host.
|
| # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
| # so uname gets run too.
|
| @@ -569,14 +548,14 @@
|
| subdirs=
|
| MFLAGS=
|
| MAKEFLAGS=
|
| -SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
| # Identity of this package.
|
| PACKAGE_NAME='yasm'
|
| PACKAGE_TARNAME='yasm'
|
| -PACKAGE_VERSION='0.8.0'
|
| -PACKAGE_STRING='yasm 0.8.0'
|
| +PACKAGE_VERSION='1.1.0'
|
| +PACKAGE_STRING='yasm 1.1.0'
|
| PACKAGE_BUGREPORT='bug-yasm@tortall.net'
|
| +PACKAGE_URL=''
|
|
|
| # Factoring default headers for most tests.
|
| ac_includes_default="\
|
| @@ -615,138 +594,162 @@
|
| #endif"
|
|
|
| gt_needs=
|
| -ac_subst_vars='SHELL
|
| -PATH_SEPARATOR
|
| -PACKAGE_NAME
|
| -PACKAGE_TARNAME
|
| -PACKAGE_VERSION
|
| -PACKAGE_STRING
|
| -PACKAGE_BUGREPORT
|
| -exec_prefix
|
| -prefix
|
| -program_transform_name
|
| -bindir
|
| -sbindir
|
| -libexecdir
|
| -datarootdir
|
| -datadir
|
| -sysconfdir
|
| -sharedstatedir
|
| -localstatedir
|
| -includedir
|
| -oldincludedir
|
| -docdir
|
| -infodir
|
| -htmldir
|
| -dvidir
|
| -pdfdir
|
| -psdir
|
| -libdir
|
| -localedir
|
| -mandir
|
| -DEFS
|
| -ECHO_C
|
| -ECHO_N
|
| -ECHO_T
|
| -LIBS
|
| -build_alias
|
| -host_alias
|
| -target_alias
|
| -INSTALL_PROGRAM
|
| -INSTALL_SCRIPT
|
| -INSTALL_DATA
|
| -am__isrc
|
| -CYGPATH_W
|
| -PACKAGE
|
| -VERSION
|
| -ACLOCAL
|
| -AUTOCONF
|
| -AUTOMAKE
|
| -AUTOHEADER
|
| -MAKEINFO
|
| -install_sh
|
| -STRIP
|
| -INSTALL_STRIP_PROGRAM
|
| -mkdir_p
|
| -AWK
|
| -SET_MAKE
|
| -am__leading_dot
|
| -AMTAR
|
| -am__tar
|
| -am__untar
|
| -MAINTAINER_MODE_TRUE
|
| -MAINTAINER_MODE_FALSE
|
| -MAINT
|
| -CC
|
| -CFLAGS
|
| -LDFLAGS
|
| -CPPFLAGS
|
| -ac_ct_CC
|
| -EXEEXT
|
| -OBJEXT
|
| -DEPDIR
|
| -am__include
|
| -am__quote
|
| -AMDEP_TRUE
|
| -AMDEP_FALSE
|
| -AMDEPBACKSLASH
|
| -CCDEPMODE
|
| -am__fastdepCC_TRUE
|
| -am__fastdepCC_FALSE
|
| -CPP
|
| -LN_S
|
| -RANLIB
|
| -XMLTO
|
| -BUILD_MAN_TRUE
|
| -BUILD_MAN_FALSE
|
| -GREP
|
| -EGREP
|
| -USE_NLS
|
| -MSGFMT
|
| -GMSGFMT
|
| -MSGFMT_015
|
| -GMSGFMT_015
|
| -XGETTEXT
|
| -XGETTEXT_015
|
| -MSGMERGE
|
| -build
|
| -build_cpu
|
| -build_vendor
|
| -build_os
|
| -host
|
| -host_cpu
|
| -host_vendor
|
| -host_os
|
| -INTL_MACOSX_LIBS
|
| -LIBICONV
|
| -LTLIBICONV
|
| -INTLLIBS
|
| -LIBINTL
|
| -LTLIBINTL
|
| -POSUB
|
| -ARCH
|
| -GCC
|
| -MORE_CFLAGS
|
| -CC_FOR_BUILD
|
| -CCLD_FOR_BUILD
|
| -HOST_CC
|
| -PYTHON
|
| -PYTHON_VERSION
|
| -PYTHON_PREFIX
|
| -PYTHON_EXEC_PREFIX
|
| -PYTHON_PLATFORM
|
| -pythondir
|
| -pkgpythondir
|
| -pyexecdir
|
| -pkgpyexecdir
|
| -PYTHON_INCLUDES
|
| -HAVE_PYTHON_TRUE
|
| -HAVE_PYTHON_FALSE
|
| -HAVE_PYTHON_BINDINGS_TRUE
|
| -HAVE_PYTHON_BINDINGS_FALSE
|
| +ac_subst_vars='am__EXEEXT_FALSE
|
| +am__EXEEXT_TRUE
|
| +LTLIBOBJS
|
| LIBOBJS
|
| -LTLIBOBJS'
|
| +HAVE_PYTHON_BINDINGS_FALSE
|
| +HAVE_PYTHON_BINDINGS_TRUE
|
| +HAVE_PYTHON_FALSE
|
| +HAVE_PYTHON_TRUE
|
| +PYTHON_INCLUDES
|
| +pkgpyexecdir
|
| +pyexecdir
|
| +pkgpythondir
|
| +pythondir
|
| +PYTHON_PLATFORM
|
| +PYTHON_EXEC_PREFIX
|
| +PYTHON_PREFIX
|
| +PYTHON_VERSION
|
| +PYTHON
|
| +CPP_FOR_HOST
|
| +CCLD_FOR_BUILD
|
| +CC_FOR_BUILD
|
| +MORE_CFLAGS
|
| +GCC
|
| +ARCH
|
| +POSUB
|
| +LTLIBINTL
|
| +LIBINTL
|
| +INTLLIBS
|
| +LTLIBICONV
|
| +LIBICONV
|
| +host_os
|
| +host_vendor
|
| +host_cpu
|
| +host
|
| +build_os
|
| +build_vendor
|
| +build_cpu
|
| +build
|
| +XGETTEXT_EXTRA_OPTIONS
|
| +MSGMERGE
|
| +XGETTEXT_015
|
| +XGETTEXT
|
| +GMSGFMT_015
|
| +MSGFMT_015
|
| +GMSGFMT
|
| +MSGFMT
|
| +GETTEXT_MACRO_VERSION
|
| +USE_NLS
|
| +EGREP
|
| +GREP
|
| +BUILD_MAN_FALSE
|
| +BUILD_MAN_TRUE
|
| +XMLTO
|
| +RANLIB
|
| +ac_ct_AR
|
| +AR
|
| +LN_S
|
| +CPP
|
| +am__fastdepCC_FALSE
|
| +am__fastdepCC_TRUE
|
| +CCDEPMODE
|
| +AMDEPBACKSLASH
|
| +AMDEP_FALSE
|
| +AMDEP_TRUE
|
| +am__quote
|
| +am__include
|
| +DEPDIR
|
| +OBJEXT
|
| +EXEEXT
|
| +ac_ct_CC
|
| +CPPFLAGS
|
| +LDFLAGS
|
| +CFLAGS
|
| +CC
|
| +MAINT
|
| +MAINTAINER_MODE_FALSE
|
| +MAINTAINER_MODE_TRUE
|
| +am__untar
|
| +am__tar
|
| +AMTAR
|
| +am__leading_dot
|
| +SET_MAKE
|
| +AWK
|
| +mkdir_p
|
| +MKDIR_P
|
| +INSTALL_STRIP_PROGRAM
|
| +STRIP
|
| +install_sh
|
| +MAKEINFO
|
| +AUTOHEADER
|
| +AUTOMAKE
|
| +AUTOCONF
|
| +ACLOCAL
|
| +VERSION
|
| +PACKAGE
|
| +CYGPATH_W
|
| +am__isrc
|
| +INSTALL_DATA
|
| +INSTALL_SCRIPT
|
| +INSTALL_PROGRAM
|
| +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
|
| +enable_maintainer_mode
|
| +enable_debug
|
| +enable_warnerror
|
| +enable_profiling
|
| +enable_gcov
|
| +enable_python
|
| +enable_python_bindings
|
| +enable_dependency_tracking
|
| +with_dmalloc
|
| +enable_nls
|
| +with_gnu_ld
|
| +enable_rpath
|
| +with_libiconv_prefix
|
| +with_libintl_prefix
|
| +'
|
| ac_precious_vars='build_alias
|
| host_alias
|
| target_alias
|
| @@ -757,12 +760,15 @@
|
| CPPFLAGS
|
| CPP
|
| CC_FOR_BUILD
|
| -CCLD_FOR_BUILD'
|
| +CCLD_FOR_BUILD
|
| +CPP_FOR_HOST'
|
|
|
|
|
| # 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
|
| @@ -861,13 +867,20 @@
|
| datarootdir=$ac_optarg ;;
|
|
|
| -disable-* | --disable-*)
|
| - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
| + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
| # Reject names that are not valid shell variable names.
|
| - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
| - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
| - { (exit 1); exit 1; }; }
|
| - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
| - eval enable_$ac_feature=no ;;
|
| + 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 ;;
|
| @@ -880,13 +893,20 @@
|
| dvidir=$ac_optarg ;;
|
|
|
| -enable-* | --enable-*)
|
| - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
| + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
| # Reject names that are not valid shell variable names.
|
| - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
| - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
| - { (exit 1); exit 1; }; }
|
| - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
| - eval enable_$ac_feature=\$ac_optarg ;;
|
| + 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- \
|
| @@ -1077,22 +1097,36 @@
|
| ac_init_version=: ;;
|
|
|
| -with-* | --with-*)
|
| - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
| + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
| # Reject names that are not valid shell variable names.
|
| - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
| - { echo "$as_me: error: invalid package name: $ac_package" >&2
|
| - { (exit 1); exit 1; }; }
|
| - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
| - eval with_$ac_package=\$ac_optarg ;;
|
| + 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_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
| + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
| # Reject names that are not valid shell variable names.
|
| - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
| - { echo "$as_me: error: invalid package name: $ac_package" >&2
|
| - { (exit 1); exit 1; }; }
|
| - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
| - eval with_$ac_package=no ;;
|
| + 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.
|
| @@ -1112,25 +1146,25 @@
|
| | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
| x_libraries=$ac_optarg ;;
|
|
|
| - -*) { echo "$as_me: error: unrecognized option: $ac_option
|
| -Try \`$0 --help' for more information." >&2
|
| - { (exit 1); exit 1; }; }
|
| + -*) 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.
|
| - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
| - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
| - { (exit 1); exit 1; }; }
|
| + 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.
|
| - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
| + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
| expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
| - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
| + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
| : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
| ;;
|
|
|
| @@ -1139,23 +1173,36 @@
|
|
|
| if test -n "$ac_prev"; then
|
| ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
| - { echo "$as_me: error: missing argument to $ac_option" >&2
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "missing argument to $ac_option"
|
| fi
|
|
|
| -# Be sure to have absolute directory names.
|
| +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
|
| - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
| - { (exit 1); exit 1; }; }
|
| + 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'
|
| @@ -1169,7 +1216,7 @@
|
| if test "x$host_alias" != x; then
|
| if test "x$build_alias" = x; then
|
| cross_compiling=maybe
|
| - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
| + $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
|
| @@ -1185,23 +1232,21 @@
|
| ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
| ac_ls_di=`ls -di .` &&
|
| ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
| - { echo "$as_me: error: Working directory cannot be determined" >&2
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "working directory cannot be determined"
|
| test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
| - { echo "$as_me: error: pwd does not report name of working directory" >&2
|
| - { (exit 1); exit 1; }; }
|
| + 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 -- "$0" ||
|
| -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| - X"$0" : 'X\(//\)[^/]' \| \
|
| - X"$0" : 'X\(//\)$' \| \
|
| - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$0" |
|
| + 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
|
| @@ -1228,13 +1273,11 @@
|
| fi
|
| if test ! -r "$srcdir/$ac_unique_file"; then
|
| test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
| - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
| - { (exit 1); exit 1; }; }
|
| + 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" || { echo "$as_me: error: $ac_msg" >&2
|
| - { (exit 1); exit 1; }; }
|
| + 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
|
| @@ -1260,7 +1303,7 @@
|
| # 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 yasm 0.8.0 to adapt to many kinds of systems.
|
| +\`configure' configures yasm 1.1.0 to adapt to many kinds of systems.
|
|
|
| Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
| @@ -1282,9 +1325,9 @@
|
|
|
| Installation directories:
|
| --prefix=PREFIX install architecture-independent files in PREFIX
|
| - [$ac_default_prefix]
|
| + [$ac_default_prefix]
|
| --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
|
| - [PREFIX]
|
| + [PREFIX]
|
|
|
| By default, \`make install' will install all the files in
|
| \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
|
| @@ -1294,25 +1337,25 @@
|
| 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/yasm]
|
| - --htmldir=DIR html documentation [DOCDIR]
|
| - --dvidir=DIR dvi documentation [DOCDIR]
|
| - --pdfdir=DIR pdf documentation [DOCDIR]
|
| - --psdir=DIR ps documentation [DOCDIR]
|
| + --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/yasm]
|
| + --htmldir=DIR html documentation [DOCDIR]
|
| + --dvidir=DIR dvi documentation [DOCDIR]
|
| + --pdfdir=DIR pdf documentation [DOCDIR]
|
| + --psdir=DIR ps documentation [DOCDIR]
|
| _ACEOF
|
|
|
| cat <<\_ACEOF
|
| @@ -1330,11 +1373,12 @@
|
|
|
| if test -n "$ac_init_help"; then
|
| case $ac_init_help in
|
| - short | recursive ) echo "Configuration of yasm 0.8.0:";;
|
| + short | recursive ) echo "Configuration of yasm 1.1.0:";;
|
| esac
|
| 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]
|
| --enable-maintainer-mode enable make rules and dependencies not useful
|
| @@ -1368,13 +1412,15 @@
|
| LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
| nonstandard directory <lib dir>
|
| LIBS libraries to pass to the linker, e.g. -l<library>
|
| - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
| + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
| you have headers in a nonstandard directory <include dir>
|
| CPP C preprocessor
|
| CC_FOR_BUILD
|
| build system C compiler
|
| CCLD_FOR_BUILD
|
| build system C linker frontend
|
| + CPP_FOR_HOST
|
| + host system 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.
|
| @@ -1387,15 +1433,17 @@
|
| 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" || 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=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
| + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
| # A ".." for each directory in $ac_dir_suffix.
|
| - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
| + 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/ ;;
|
| @@ -1431,7 +1479,7 @@
|
| echo &&
|
| $SHELL "$ac_srcdir/configure" --help=recursive
|
| else
|
| - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
| + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
| fi || ac_status=$?
|
| cd "$ac_pwd" || { ac_status=$?; break; }
|
| done
|
| @@ -1440,22 +1488,611 @@
|
| test -n "$ac_init_help" && exit $ac_status
|
| if $ac_init_version; then
|
| cat <<\_ACEOF
|
| -yasm configure 0.8.0
|
| -generated by GNU Autoconf 2.61
|
| +yasm configure 1.1.0
|
| +generated by GNU Autoconf 2.65
|
|
|
| -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
| +Copyright (C) 2009 Free Software Foundation, Inc.
|
| This configure script is free software; the Free Software Foundation
|
| gives unlimited permission to copy, distribute and modify it.
|
| _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; test "x$as_lineno_stack" = x && { as_lineno=; 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; } >/dev/null && {
|
| + 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| + as_fn_set_status $ac_retval
|
| +
|
| +} # ac_fn_c_try_cpp
|
| +
|
| +# 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| + as_fn_set_status $ac_retval
|
| +
|
| +} # ac_fn_c_try_run
|
| +
|
| +# 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
| +$as_echo_n "checking for $2... " >&6; }
|
| +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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.$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;}
|
| +( cat <<\_ASBOX
|
| +## ----------------------------------- ##
|
| +## Report this to bug-yasm@tortall.net ##
|
| +## ----------------------------------- ##
|
| +_ASBOX
|
| + ) | sed "s/^/$as_me: WARNING: /" >&2
|
| + ;;
|
| +esac
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
| +$as_echo_n "checking for $2... " >&6; }
|
| +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + $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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| +
|
| +} # ac_fn_c_check_header_mongrel
|
| +
|
| +# 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| +
|
| +} # ac_fn_c_check_header_compile
|
| +
|
| +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
|
| +# -------------------------------------------
|
| +# Tests whether TYPE exists after having included INCLUDES, setting cache
|
| +# variable VAR accordingly.
|
| +ac_fn_c_check_type ()
|
| +{
|
| + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
| +$as_echo_n "checking for $2... " >&6; }
|
| +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + $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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| +
|
| +} # ac_fn_c_check_type
|
| +
|
| +# 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 <stdio.h>
|
| +#include <stdlib.h>
|
| +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 <conftest.val; ac_retval=0
|
| +else
|
| + ac_retval=1
|
| +fi
|
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
| + conftest.$ac_objext conftest.beam conftest.$ac_ext
|
| +rm -f conftest.val
|
| +
|
| + fi
|
| + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| + as_fn_set_status $ac_retval
|
| +
|
| +} # ac_fn_c_compute_int
|
| +
|
| +# 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; test "x$as_lineno_stack" = x && { as_lineno=; 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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 <limits.h> declares $2.
|
| + For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
| +#define $2 innocuous_$2
|
| +
|
| +/* System header to define __stub macros and hopefully few prototypes,
|
| + which can conflict with char $2 (); below.
|
| + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
| + <limits.h> exists even on freestanding compilers. */
|
| +
|
| +#ifdef __STDC__
|
| +# include <limits.h>
|
| +#else
|
| +# include <assert.h>
|
| +#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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
| +
|
| +} # ac_fn_c_check_func
|
| 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 yasm $as_me 0.8.0, which was
|
| -generated by GNU Autoconf 2.61. Invocation command line was
|
| +It was created by yasm $as_me 1.1.0, which was
|
| +generated by GNU Autoconf 2.65. Invocation command line was
|
|
|
| $ $0 $@
|
|
|
| @@ -1491,8 +2128,8 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - echo "PATH: $as_dir"
|
| -done
|
| + $as_echo "PATH: $as_dir"
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| } >&5
|
| @@ -1526,12 +2163,12 @@
|
| | -silent | --silent | --silen | --sile | --sil)
|
| continue ;;
|
| *\'*)
|
| - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| esac
|
| case $ac_pass in
|
| - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
| + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
|
| 2)
|
| - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
| + 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
|
| @@ -1547,13 +2184,13 @@
|
| -* ) ac_must_keep_next=true ;;
|
| esac
|
| fi
|
| - ac_configure_args="$ac_configure_args '$ac_arg'"
|
| + as_fn_append ac_configure_args " '$ac_arg'"
|
| ;;
|
| esac
|
| done
|
| done
|
| -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
| -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
| +{ 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
|
| @@ -1578,12 +2215,13 @@
|
| case $ac_val in #(
|
| *${as_nl}*)
|
| case $ac_var in #(
|
| - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
| -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
| + *_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) ;; #(
|
| - *) $as_unset $ac_var ;;
|
| + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
| + *) { eval $ac_var=; unset $ac_var;} ;;
|
| esac ;;
|
| esac
|
| done
|
| @@ -1612,9 +2250,9 @@
|
| do
|
| eval ac_val=\$$ac_var
|
| case $ac_val in
|
| - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
| + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
| esac
|
| - echo "$ac_var='\''$ac_val'\''"
|
| + $as_echo "$ac_var='\''$ac_val'\''"
|
| done | sort
|
| echo
|
|
|
| @@ -1629,9 +2267,9 @@
|
| do
|
| eval ac_val=\$$ac_var
|
| case $ac_val in
|
| - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
| + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
| esac
|
| - echo "$ac_var='\''$ac_val'\''"
|
| + $as_echo "$ac_var='\''$ac_val'\''"
|
| done | sort
|
| echo
|
| fi
|
| @@ -1647,83 +2285,88 @@
|
| echo
|
| fi
|
| test "$ac_signal" != 0 &&
|
| - echo "$as_me: caught signal $ac_signal"
|
| - echo "$as_me: exit $exit_status"
|
| + $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'; { (exit 1); exit 1; }' $ac_signal
|
| + 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 explicitly selected file to automatically selected ones.
|
| +# Prefer an explicitly selected file to automatically selected ones.
|
| +ac_site_file1=NONE
|
| +ac_site_file2=NONE
|
| if test -n "$CONFIG_SITE"; then
|
| - set x "$CONFIG_SITE"
|
| + ac_site_file1=$CONFIG_SITE
|
| elif test "x$prefix" != xNONE; then
|
| - set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
| + ac_site_file1=$prefix/share/config.site
|
| + ac_site_file2=$prefix/etc/config.site
|
| else
|
| - set x "$ac_default_prefix/share/config.site" \
|
| - "$ac_default_prefix/etc/config.site"
|
| + ac_site_file1=$ac_default_prefix/share/config.site
|
| + ac_site_file2=$ac_default_prefix/etc/config.site
|
| fi
|
| -shift
|
| -for ac_site_file
|
| +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
| do
|
| - if test -r "$ac_site_file"; then
|
| - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
| -echo "$as_me: loading site script $ac_site_file" >&6;}
|
| + 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"
|
| 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.
|
| - if test -f "$cache_file"; then
|
| - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
| -echo "$as_me: loading cache $cache_file" >&6;}
|
| + # 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
|
| - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
| -echo "$as_me: creating cache $cache_file" >&6;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
| +$as_echo "$as_me: creating cache $cache_file" >&6;}
|
| >$cache_file
|
| fi
|
|
|
| @@ -1738,69 +2381,57 @@
|
| eval ac_new_val=\$ac_env_${ac_var}_value
|
| case $ac_old_set,$ac_new_set in
|
| set,)
|
| - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
| -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
| + { $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)
|
| - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
| -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
| + { $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
|
| - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
| -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
| - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
|
| -echo "$as_me: former value: $ac_old_val" >&2;}
|
| - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
|
| -echo "$as_me: current value: $ac_new_val" >&2;}
|
| - ac_cache_corrupted=:
|
| + # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| + *\'*) 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.
|
| - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
| + *) as_fn_append ac_configure_args " '$ac_arg'" ;;
|
| esac
|
| fi
|
| done
|
| if $ac_cache_corrupted; then
|
| - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
| -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
| - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
| -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + { $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'
|
| @@ -1811,24 +2442,16 @@
|
| #AC_CONFIG_SRCDIR([src/main.c])
|
| ac_aux_dir=
|
| for ac_dir in config "$srcdir"/config; do
|
| - if test -f "$ac_dir/install-sh"; then
|
| - ac_aux_dir=$ac_dir
|
| - ac_install_sh="$ac_aux_dir/install-sh -c"
|
| - break
|
| - elif test -f "$ac_dir/install.sh"; then
|
| - ac_aux_dir=$ac_dir
|
| - ac_install_sh="$ac_aux_dir/install.sh -c"
|
| - break
|
| - elif test -f "$ac_dir/shtool"; then
|
| - ac_aux_dir=$ac_dir
|
| - ac_install_sh="$ac_aux_dir/shtool install -c"
|
| - break
|
| - fi
|
| + for ac_t in install-sh install.sh shtool; do
|
| + if test -f "$ac_dir/$ac_t"; then
|
| + ac_aux_dir=$ac_dir
|
| + ac_install_sh="$ac_aux_dir/$ac_t -c"
|
| + break 2
|
| + fi
|
| + done
|
| done
|
| if test -z "$ac_aux_dir"; then
|
| - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
|
| -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
|
| fi
|
|
|
| # These three variables are undocumented and unsupported,
|
| @@ -1843,7 +2466,7 @@
|
| ac_config_headers="$ac_config_headers config.h"
|
|
|
|
|
| -am__api_version='1.10'
|
| +am__api_version='1.11'
|
|
|
| # Find a good install program. We prefer a C program (faster),
|
| # so one script is as good as another. But avoid the broken or
|
| @@ -1858,22 +2481,23 @@
|
| # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
| # OS/2's system install, which has a completely different semantic
|
| # ./install, which can be erroneously created by make from ./install.sh.
|
| -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
| -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
| +# Reject install programs that cannot install multiple files.
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
| +$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
| if test -z "$INSTALL"; then
|
| -if test "${ac_cv_path_install+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +if test "${ac_cv_path_install+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| for as_dir in $PATH
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - # Account for people who put trailing slashes in PATH elements.
|
| -case $as_dir/ in
|
| - ./ | .// | /cC/* | \
|
| + # Account for people who put trailing slashes in PATH elements.
|
| +case $as_dir/ in #((
|
| + ./ | .// | /[cC]/* | \
|
| /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
| - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
| + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
| /usr/ucb/* ) ;;
|
| *)
|
| # OSF1 and SCO ODT 3.0 have their own names for install.
|
| @@ -1891,17 +2515,29 @@
|
| # program-specific install script used by HP pwplus--don't use.
|
| :
|
| else
|
| - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
| - break 3
|
| + rm -rf conftest.one conftest.two conftest.dir
|
| + echo one > conftest.one
|
| + echo two > conftest.two
|
| + mkdir conftest.dir
|
| + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
| + test -s conftest.one && test -s conftest.two &&
|
| + test -s conftest.dir/conftest.one &&
|
| + test -s conftest.dir/conftest.two
|
| + then
|
| + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
| + break 3
|
| + fi
|
| fi
|
| fi
|
| done
|
| done
|
| ;;
|
| esac
|
| -done
|
| +
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| +rm -rf conftest.one conftest.two conftest.dir
|
|
|
| fi
|
| if test "${ac_cv_path_install+set}" = set; then
|
| @@ -1914,8 +2550,8 @@
|
| INSTALL=$ac_install_sh
|
| fi
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
| -echo "${ECHO_T}$INSTALL" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
|
| +$as_echo "$INSTALL" >&6; }
|
|
|
| # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
| # It thinks the first close brace ends the variable substitution.
|
| @@ -1925,21 +2561,34 @@
|
|
|
| test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
| -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
| -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
|
| +$as_echo_n "checking whether build environment is sane... " >&6; }
|
| # Just in case
|
| sleep 1
|
| echo timestamp > conftest.file
|
| +# Reject unsafe characters in $srcdir or the absolute working directory
|
| +# name. Accept space and tab only in the latter.
|
| +am_lf='
|
| +'
|
| +case `pwd` in
|
| + *[\\\"\#\$\&\'\`$am_lf]*)
|
| + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
|
| +esac
|
| +case $srcdir in
|
| + *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
| + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
| +esac
|
| +
|
| # Do `set' in a subshell so we don't clobber the current shell's
|
| # arguments. Must try -L first in case configure is actually a
|
| # symlink; some systems play weird games with the mod time of symlinks
|
| # (eg FreeBSD returns the mod time of the symlink's containing
|
| # directory).
|
| if (
|
| - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
| if test "$*" = "X"; then
|
| # -L didn't work.
|
| - set X `ls -t $srcdir/configure conftest.file`
|
| + set X `ls -t "$srcdir/configure" conftest.file`
|
| fi
|
| rm -f conftest.file
|
| if test "$*" != "X $srcdir/configure conftest.file" \
|
| @@ -1949,11 +2598,8 @@
|
| # if, for instance, CONFIG_SHELL is bash and it inherits a
|
| # broken ls alias from the environment. This has actually
|
| # happened. Such a system could not be considered "sane".
|
| - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
|
| -alias in your environment" >&5
|
| -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
|
| -alias in your environment" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
| +alias in your environment" "$LINENO" 5
|
| fi
|
|
|
| test "$2" = conftest.file
|
| @@ -1962,52 +2608,162 @@
|
| # Ok.
|
| :
|
| else
|
| - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
|
| -Check your system clock" >&5
|
| -echo "$as_me: error: newly created file is older than distributed files!
|
| -Check your system clock" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "newly created file is older than distributed files!
|
| +Check your system clock" "$LINENO" 5
|
| fi
|
| -{ echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| test "$program_prefix" != NONE &&
|
| program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
| # Use a double $ so make ignores it.
|
| test "$program_suffix" != NONE &&
|
| program_transform_name="s&\$&$program_suffix&;$program_transform_name"
|
| -# Double any \ or $. echo might interpret backslashes.
|
| +# Double any \ or $.
|
| # By default was `s,x,x', remove it if useless.
|
| -cat <<\_ACEOF >conftest.sed
|
| -s/[\\$]/&&/g;s/;s,x,x,$//
|
| -_ACEOF
|
| -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
|
| -rm -f conftest.sed
|
| +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
|
| +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
|
|
|
| # expand $ac_aux_dir to an absolute path
|
| am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
|
| -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
| +if test x"${MISSING+set}" != xset; then
|
| + case $am_aux_dir in
|
| + *\ * | *\ *)
|
| + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
| + *)
|
| + MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
| + esac
|
| +fi
|
| # Use eval to expand $SHELL
|
| if eval "$MISSING --run true"; then
|
| am_missing_run="$MISSING --run "
|
| else
|
| am_missing_run=
|
| - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
|
| -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
|
| +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
| fi
|
|
|
| -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
|
| -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
|
| +if test x"${install_sh}" != xset; then
|
| + case $am_aux_dir in
|
| + *\ * | *\ *)
|
| + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| + *)
|
| + install_sh="\${SHELL} $am_aux_dir/install-sh"
|
| + esac
|
| +fi
|
| +
|
| +# Installed binaries are usually stripped using `strip' when the user
|
| +# run `make install-strip'. However `strip' might not be the right
|
| +# tool to use in cross-compilation environments, therefore Automake
|
| +# will honor the `STRIP' environment variable to overrule this program.
|
| +if test "$cross_compiling" != no; then
|
| + 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 test "${ac_cv_prog_STRIP+set}" = set; 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
|
| +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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; 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
|
| +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
|
| +
|
| +fi
|
| +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| +
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
| +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
| if test -z "$MKDIR_P"; then
|
| - if test "${ac_cv_path_mkdir+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + if test "${ac_cv_path_mkdir+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_prog in mkdir gmkdir; do
|
| + for ac_prog in mkdir gmkdir; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
| case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
| @@ -2019,11 +2775,12 @@
|
| esac
|
| done
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
|
|
| + test -d ./--version && rmdir ./--version
|
| if test "${ac_cv_path_mkdir+set}" = set; then
|
| MKDIR_P="$ac_cv_path_mkdir -p"
|
| else
|
| @@ -2031,12 +2788,11 @@
|
| # value for MKDIR_P within a source directory, because that will
|
| # break other packages using the cache if that directory is
|
| # removed, or if the value is a relative name.
|
| - test -d ./--version && rmdir ./--version
|
| MKDIR_P="$ac_install_sh -d"
|
| fi
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
|
| -echo "${ECHO_T}$MKDIR_P" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
|
| +$as_echo "$MKDIR_P" >&6; }
|
|
|
| mkdir_p="$MKDIR_P"
|
| case $mkdir_p in
|
| @@ -2048,10 +2804,10 @@
|
| 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 "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_AWK+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_AWK+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$AWK"; then
|
| ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
| @@ -2061,36 +2817,37 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| AWK=$ac_cv_prog_AWK
|
| if test -n "$AWK"; then
|
| - { echo "$as_me:$LINENO: result: $AWK" >&5
|
| -echo "${ECHO_T}$AWK" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
| +$as_echo "$AWK" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| test -n "$AWK" && break
|
| done
|
|
|
| -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
| -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
| -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
| -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
| +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
| +set x ${MAKE-make}
|
| +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
| +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| cat >conftest.make <<\_ACEOF
|
| SHELL = /bin/sh
|
| @@ -2107,12 +2864,12 @@
|
| rm -f conftest.make
|
| fi
|
| if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| SET_MAKE=
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| SET_MAKE="MAKE=${MAKE-make}"
|
| fi
|
|
|
| @@ -2131,9 +2888,7 @@
|
| am__isrc=' -I$(srcdir)'
|
| # test to see if srcdir already configured
|
| if test -f $srcdir/config.status; then
|
| - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
|
| -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
| fi
|
| fi
|
|
|
| @@ -2148,8 +2903,8 @@
|
|
|
|
|
| # Define the identity of the package.
|
| - PACKAGE=yasm
|
| - VERSION=0.8.0
|
| + PACKAGE='yasm'
|
| + VERSION='1.1.0'
|
|
|
|
|
| cat >>confdefs.h <<_ACEOF
|
| @@ -2177,112 +2932,6 @@
|
|
|
| MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
|
|
| -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
| -
|
| -# Installed binaries are usually stripped using `strip' when the user
|
| -# run `make install-strip'. However `strip' might not be the right
|
| -# tool to use in cross-compilation environments, therefore Automake
|
| -# will honor the `STRIP' environment variable to overrule this program.
|
| -if test "$cross_compiling" != no; then
|
| - 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
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_STRIP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| - break 2
|
| - fi
|
| -done
|
| -done
|
| -IFS=$as_save_IFS
|
| -
|
| -fi
|
| -fi
|
| -STRIP=$ac_cv_prog_STRIP
|
| -if test -n "$STRIP"; then
|
| - { echo "$as_me:$LINENO: result: $STRIP" >&5
|
| -echo "${ECHO_T}$STRIP" >&6; }
|
| -else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}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
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| - break 2
|
| - fi
|
| -done
|
| -done
|
| -IFS=$as_save_IFS
|
| -
|
| -fi
|
| -fi
|
| -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
| -if test -n "$ac_ct_STRIP"; then
|
| - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
| -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
| -else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| -fi
|
| -
|
| - if test "x$ac_ct_STRIP" = x; then
|
| - STRIP=":"
|
| - else
|
| - case $cross_compiling:$ac_tool_warned in
|
| -yes:)
|
| -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&5
|
| -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
| -ac_tool_warned=yes ;;
|
| -esac
|
| - STRIP=$ac_ct_STRIP
|
| - fi
|
| -else
|
| - STRIP="$ac_cv_prog_STRIP"
|
| -fi
|
| -
|
| -fi
|
| -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| -
|
| # We need awk for the "check" target. The system "awk" is bad on
|
| # some platforms.
|
| # Always define AMTAR for backward compatibility.
|
| @@ -2295,17 +2944,18 @@
|
|
|
|
|
|
|
| -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
| -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
|
| +
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
| +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
|
| # Check whether --enable-maintainer-mode was given.
|
| -if test "${enable_maintainer_mode+set}" = set; then
|
| +if test "${enable_maintainer_mode+set}" = set; then :
|
| enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
|
| else
|
| USE_MAINTAINER_MODE=no
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
|
| -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
|
| +$as_echo "$USE_MAINTAINER_MODE" >&6; }
|
| if test $USE_MAINTAINER_MODE = yes; then
|
| MAINTAINER_MODE_TRUE=
|
| MAINTAINER_MODE_FALSE='#'
|
| @@ -2319,75 +2969,61 @@
|
|
|
|
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define PACKAGE_INTVER "0.8.0"
|
| -_ACEOF
|
| +$as_echo "#define PACKAGE_INTVER \"1.1.0\"" >>confdefs.h
|
|
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define PACKAGE_BUILD "2194"
|
| -_ACEOF
|
| +$as_echo "#define PACKAGE_BUILD \"2352\"" >>confdefs.h
|
|
|
|
|
| #
|
| # autoconf command-line options
|
| #
|
| # Check whether --enable-debug was given.
|
| -if test "${enable_debug+set}" = set; then
|
| +if test "${enable_debug+set}" = set; then :
|
| enableval=$enable_debug; case "${enableval}" in
|
| yes) debugging="yes" ;;
|
| no) debugging="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
|
| esac
|
| fi
|
|
|
|
|
| # Check whether --enable-warnerror was given.
|
| -if test "${enable_warnerror+set}" = set; then
|
| +if test "${enable_warnerror+set}" = set; then :
|
| enableval=$enable_warnerror; case "${enableval}" in
|
| yes) warnerror="yes" ;;
|
| no) warnerror="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-warnerror" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-warnerror" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;;
|
| esac
|
| fi
|
|
|
|
|
| # Check whether --enable-profiling was given.
|
| -if test "${enable_profiling+set}" = set; then
|
| +if test "${enable_profiling+set}" = set; then :
|
| enableval=$enable_profiling; case "${enableval}" in
|
| yes) profiling="yes" ;;
|
| no) profiling="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profiling" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-profiling" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;;
|
| esac
|
| fi
|
|
|
|
|
| # Check whether --enable-gcov was given.
|
| -if test "${enable_gcov+set}" = set; then
|
| +if test "${enable_gcov+set}" = set; then :
|
| enableval=$enable_gcov; case "${enableval}" in
|
| yes) gcov="yes" ;;
|
| no) gcov="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-gcov" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-gcov" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;;
|
| esac
|
| fi
|
|
|
|
|
| # Check whether --enable-python was given.
|
| -if test "${enable_python+set}" = set; then
|
| +if test "${enable_python+set}" = set; then :
|
| enableval=$enable_python; case "${enableval}" in
|
| yes) enable_python="yes" ;;
|
| no) enable_python="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-python" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-python" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-python" "$LINENO" 5 ;;
|
| esac
|
| else
|
| enable_python="auto"
|
| @@ -2395,13 +3031,11 @@
|
|
|
|
|
| # Check whether --enable-python-bindings was given.
|
| -if test "${enable_python_bindings+set}" = set; then
|
| +if test "${enable_python_bindings+set}" = set; then :
|
| enableval=$enable_python_bindings; case "${enableval}" in
|
| yes) enable_python_bindings="yes" ;;
|
| no) enable_python_bindings="no" ;;
|
| - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-python-bindings" >&5
|
| -echo "$as_me: error: bad value ${enableval} for --enable-python-bindings" >&2;}
|
| - { (exit 1); exit 1; }; } ;;
|
| + *) as_fn_error "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;;
|
| esac
|
| else
|
| enable_python_bindings="no"
|
| @@ -2419,44 +3053,44 @@
|
| am_make=${MAKE-make}
|
| cat > confinc << 'END'
|
| am__doit:
|
| - @echo done
|
| + @echo this is the am__doit target
|
| .PHONY: am__doit
|
| END
|
| # If we don't find an include directive, just comment out the code.
|
| -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
| -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
|
| +$as_echo_n "checking for style of include used by $am_make... " >&6; }
|
| am__include="#"
|
| am__quote=
|
| _am_result=none
|
| # First try GNU make style include.
|
| echo "include confinc" > confmf
|
| -# We grep out `Entering directory' and `Leaving directory'
|
| -# messages which can occur if `w' ends up in MAKEFLAGS.
|
| -# In particular we don't look at `^make:' because GNU make might
|
| -# be invoked under some other name (usually "gmake"), in which
|
| -# case it prints its new name instead of `make'.
|
| -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
|
| - am__include=include
|
| - am__quote=
|
| - _am_result=GNU
|
| -fi
|
| +# Ignore all kinds of additional output from `make'.
|
| +case `$am_make -s -f confmf 2> /dev/null` in #(
|
| +*the\ am__doit\ target*)
|
| + am__include=include
|
| + am__quote=
|
| + _am_result=GNU
|
| + ;;
|
| +esac
|
| # Now try BSD make style include.
|
| if test "$am__include" = "#"; then
|
| echo '.include "confinc"' > confmf
|
| - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
|
| - am__include=.include
|
| - am__quote="\""
|
| - _am_result=BSD
|
| - fi
|
| + case `$am_make -s -f confmf 2> /dev/null` in #(
|
| + *the\ am__doit\ target*)
|
| + am__include=.include
|
| + am__quote="\""
|
| + _am_result=BSD
|
| + ;;
|
| + esac
|
| fi
|
|
|
|
|
| -{ echo "$as_me:$LINENO: result: $_am_result" >&5
|
| -echo "${ECHO_T}$_am_result" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
|
| +$as_echo "$_am_result" >&6; }
|
| rm -f confinc confmf
|
|
|
| # Check whether --enable-dependency-tracking was given.
|
| -if test "${enable_dependency_tracking+set}" = set; then
|
| +if test "${enable_dependency_tracking+set}" = set; then :
|
| enableval=$enable_dependency_tracking;
|
| fi
|
|
|
| @@ -2481,10 +3115,10 @@
|
| if test -n "$ac_tool_prefix"; then
|
| # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
| set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_CC+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$CC"; then
|
| ac_cv_prog_CC="$CC" # Let the user override the test.
|
| @@ -2494,25 +3128,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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}gcc"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| CC=$ac_cv_prog_CC
|
| if test -n "$CC"; then
|
| - { echo "$as_me:$LINENO: result: $CC" >&5
|
| -echo "${ECHO_T}$CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
| +$as_echo "$CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -2521,10 +3155,10 @@
|
| ac_ct_CC=$CC
|
| # Extract the first word of "gcc", so it can be a program name with args.
|
| set dummy gcc; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
| + $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.
|
| @@ -2534,25 +3168,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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="gcc"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
| if test -n "$ac_ct_CC"; then
|
| - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
| -echo "${ECHO_T}$ac_ct_CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
| +$as_echo "$ac_ct_CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
| if test "x$ac_ct_CC" = x; then
|
| @@ -2560,12 +3194,8 @@
|
| else
|
| case $cross_compiling:$ac_tool_warned in
|
| yes:)
|
| -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&5
|
| -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
| +{ $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
|
| @@ -2578,10 +3208,10 @@
|
| if test -n "$ac_tool_prefix"; then
|
| # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
| set dummy ${ac_tool_prefix}cc; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_CC+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$CC"; then
|
| ac_cv_prog_CC="$CC" # Let the user override the test.
|
| @@ -2591,25 +3221,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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}cc"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| CC=$ac_cv_prog_CC
|
| if test -n "$CC"; then
|
| - { echo "$as_me:$LINENO: result: $CC" >&5
|
| -echo "${ECHO_T}$CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
| +$as_echo "$CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -2618,10 +3248,10 @@
|
| 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 "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_CC+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$CC"; then
|
| ac_cv_prog_CC="$CC" # Let the user override the test.
|
| @@ -2632,18 +3262,18 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + for ac_exec_ext in '' $ac_executable_extensions; do
|
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
| ac_prog_rejected=yes
|
| continue
|
| fi
|
| ac_cv_prog_CC="cc"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| if test $ac_prog_rejected = yes; then
|
| @@ -2662,11 +3292,11 @@
|
| fi
|
| CC=$ac_cv_prog_CC
|
| if test -n "$CC"; then
|
| - { echo "$as_me:$LINENO: result: $CC" >&5
|
| -echo "${ECHO_T}$CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
| +$as_echo "$CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -2677,10 +3307,10 @@
|
| 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
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_CC+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$CC"; then
|
| ac_cv_prog_CC="$CC" # Let the user override the test.
|
| @@ -2690,25 +3320,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| CC=$ac_cv_prog_CC
|
| if test -n "$CC"; then
|
| - { echo "$as_me:$LINENO: result: $CC" >&5
|
| -echo "${ECHO_T}$CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
| +$as_echo "$CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -2721,10 +3351,10 @@
|
| 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 "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
| + $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.
|
| @@ -2734,25 +3364,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
| if test -n "$ac_ct_CC"; then
|
| - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
| -echo "${ECHO_T}$ac_ct_CC" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
| +$as_echo "$ac_ct_CC" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -2764,12 +3394,8 @@
|
| else
|
| case $cross_compiling:$ac_tool_warned in
|
| yes:)
|
| -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&5
|
| -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
| +{ $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
|
| @@ -2779,51 +3405,37 @@
|
| fi
|
|
|
|
|
| -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: no acceptable C compiler found in \$PATH
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| +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; }
|
|
|
| # Provide some information about the compiler.
|
| -echo "$as_me:$LINENO: checking for C compiler version" >&5
|
| -ac_compiler=`set X $ac_compile; echo $2`
|
| -{ (ac_try="$ac_compiler --version >&5"
|
| +$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compiler --version >&5") 2>&5
|
| +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=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }
|
| -{ (ac_try="$ac_compiler -v >&5"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compiler -v >&5") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }
|
| -{ (ac_try="$ac_compiler -V >&5"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compiler -V >&5") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $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 >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -2835,42 +3447,38 @@
|
| }
|
| _ACEOF
|
| ac_clean_files_save=$ac_clean_files
|
| -ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
| +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.
|
| -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
| -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
| -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
| -#
|
| -# List of possible output files, starting from the most likely.
|
| -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
| -# only as a last resort. b.out is created by i960 compilers.
|
| -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
| -#
|
| -# The IRIX 6 linker writes into existing files which may not be
|
| -# executable, retaining their permissions. Remove them first so a
|
| -# subsequent execution test works.
|
| +{ $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[^ ]*//'`
|
| +
|
| +# 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 | *.o | *.obj ) ;;
|
| + *.$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
|
|
|
| -if { (ac_try="$ac_link_default"
|
| +if { { ac_try="$ac_link_default"
|
| case "(($ac_try" in
|
| *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| *) ac_try_echo=$ac_try;;
|
| esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| +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=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| + $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,
|
| @@ -2880,14 +3488,14 @@
|
| do
|
| test -f "$ac_file" || continue
|
| case $ac_file in
|
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
| + *.$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;
|
| + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
| then :; else
|
| ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
| fi
|
| @@ -2906,78 +3514,42 @@
|
| else
|
| ac_file=''
|
| fi
|
| -
|
| -{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
| -echo "${ECHO_T}$ac_file" >&6; }
|
| -if test -z "$ac_file"; then
|
| - echo "$as_me: failed program was:" >&5
|
| +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
|
|
|
| -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: C compiler cannot create executables
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "C compiler cannot create executables
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| +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
|
|
|
| -# Check that the compiler produces executables we can run. If not, either
|
| -# the compiler is broken, or we cross compile.
|
| -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
| -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
| -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
| -# If not cross compiling, check that we can run a simple program.
|
| -if test "$cross_compiling" != yes; then
|
| - if { ac_try='./$ac_file'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - cross_compiling=no
|
| - else
|
| - if test "$cross_compiling" = maybe; then
|
| - cross_compiling=yes
|
| - else
|
| - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
| -If you meant to cross compile, use \`--host'.
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot run C compiled programs.
|
| -If you meant to cross compile, use \`--host'.
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| - fi
|
| - fi
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| -
|
| -rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
| +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
| ac_clean_files=$ac_clean_files_save
|
| -# Check that the compiler produces executables we can run. If not, either
|
| -# the compiler is broken, or we cross compile.
|
| -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
| -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
| -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
| -echo "${ECHO_T}$cross_compiling" >&6; }
|
| -
|
| -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
| -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
| -if { (ac_try="$ac_link"
|
| +{ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| +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=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| + $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
|
| @@ -2985,37 +3557,90 @@
|
| 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 | *.o | *.obj ) ;;
|
| + *.$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
|
| - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + { { $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; }
|
|
|
| -rm -f conftest$ac_cv_exeext
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
| -echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
| -
|
| rm -f conftest.$ac_ext
|
| EXEEXT=$ac_cv_exeext
|
| ac_exeext=$EXEEXT
|
| -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
| -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
| -if test "${ac_cv_objext+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +#include <stdio.h>
|
| +int
|
| +main ()
|
| +{
|
| +FILE *f = fopen ("conftest.out", "w");
|
| + return ferror (f) || fclose (f) != 0;
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| _ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_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 test "${ac_cv_objext+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| +else
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -3027,51 +3652,46 @@
|
| }
|
| _ACEOF
|
| rm -f conftest.o conftest.obj
|
| -if { (ac_try="$ac_compile"
|
| +if { { ac_try="$ac_compile"
|
| case "(($ac_try" in
|
| *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| *) ac_try_echo=$ac_try;;
|
| esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| +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=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| + $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 ) ;;
|
| + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
|
| *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
| break;;
|
| esac
|
| done
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| + $as_echo "$as_me: failed program was:" >&5
|
| sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
| -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| +{ { $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
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
| -echo "${ECHO_T}$ac_cv_objext" >&6; }
|
| +{ $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
|
| -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
| -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
| -if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
| +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
| +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -3085,54 +3705,34 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_compiler_gnu=yes
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_compiler_gnu=no
|
| + 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
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
| -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
| -GCC=`test $ac_compiler_gnu = yes && echo yes`
|
| +{ $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
|
| -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
| -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_cc_g+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
| +$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
| +if test "${ac_cv_prog_cc_g+set}" = set; then :
|
| + $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 >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -3143,34 +3743,11 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_prog_cc_g=yes
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - CFLAGS=""
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + CFLAGS=""
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -3181,35 +3758,12 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - :
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
| - ac_c_werror_flag=$ac_save_c_werror_flag
|
| +else
|
| + ac_c_werror_flag=$ac_save_c_werror_flag
|
| CFLAGS="-g"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -3220,42 +3774,18 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_prog_cc_g=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| 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
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
| -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
| +{ $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
|
| @@ -3271,18 +3801,14 @@
|
| CFLAGS=
|
| fi
|
| fi
|
| -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
| -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_cc_c89+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
| +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
| +if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| ac_cv_prog_cc_c89=no
|
| ac_save_CC=$CC
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdarg.h>
|
| #include <stdio.h>
|
| @@ -3339,31 +3865,9 @@
|
| -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
| do
|
| CC="$ac_save_CC $ac_arg"
|
| - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| + if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_prog_cc_c89=$ac_arg
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext
|
| test "x$ac_cv_prog_cc_c89" != "xno" && break
|
| done
|
| @@ -3374,17 +3878,19 @@
|
| # AC_CACHE_VAL
|
| case "x$ac_cv_prog_cc_c89" in
|
| x)
|
| - { echo "$as_me:$LINENO: result: none needed" >&5
|
| -echo "${ECHO_T}none needed" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
| +$as_echo "none needed" >&6; } ;;
|
| xno)
|
| - { echo "$as_me:$LINENO: result: unsupported" >&5
|
| -echo "${ECHO_T}unsupported" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
| +$as_echo "unsupported" >&6; } ;;
|
| *)
|
| CC="$CC $ac_cv_prog_cc_c89"
|
| - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
| -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
| + { $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_ext=c
|
| ac_cpp='$CPP $CPPFLAGS'
|
| @@ -3394,10 +3900,10 @@
|
|
|
| depcc="$CC" am_compiler_list=
|
|
|
| -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
| -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
| -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
| +$as_echo_n "checking dependency style of $depcc... " >&6; }
|
| +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
| # We make a subdir and do the tests there. Otherwise we can end up
|
| @@ -3422,6 +3928,11 @@
|
| if test "$am_compiler_list" = ""; then
|
| am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
| fi
|
| + am__universal=false
|
| + case " $depcc " in #(
|
| + *\ -arch\ *\ -arch\ *) am__universal=true ;;
|
| + esac
|
| +
|
| for depmode in $am_compiler_list; do
|
| # Setup a source with many dependencies, because some compilers
|
| # like to wrap large dependency lists on column 80 (with \), and
|
| @@ -3439,7 +3950,17 @@
|
| done
|
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
| + # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
| + # mode. It turns out that the SunPro C++ compiler does not properly
|
| + # handle `-M -o', and we need to detect this. Also, some Intel
|
| + # versions had trouble with output in subdirs
|
| + am__obj=sub/conftest.${OBJEXT-o}
|
| + am__minus_obj="-o $am__obj"
|
| case $depmode in
|
| + gcc)
|
| + # This depmode causes a compiler race in universal mode.
|
| + test "$am__universal" = false || continue
|
| + ;;
|
| nosideeffect)
|
| # after this tag, mechanisms are not by side-effect, so they'll
|
| # only be used when explicitly requested
|
| @@ -3449,19 +3970,23 @@
|
| break
|
| fi
|
| ;;
|
| + msvisualcpp | msvcmsys)
|
| + # This compiler won't grok `-c -o', but also, the minuso test has
|
| + # not run yet. These depmodes are late enough in the game, and
|
| + # so weak that their functioning should not be impacted.
|
| + am__obj=conftest.${OBJEXT-o}
|
| + am__minus_obj=
|
| + ;;
|
| none) break ;;
|
| esac
|
| - # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
| - # mode. It turns out that the SunPro C++ compiler does not properly
|
| - # handle `-M -o', and we need to detect this.
|
| if depmode=$depmode \
|
| - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
| + source=sub/conftest.c object=$am__obj \
|
| depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
| - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
| + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
| >/dev/null 2>conftest.err &&
|
| grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
| grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
| - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
| + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
| ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
| # icc doesn't choke on unknown options, it will just issue warnings
|
| # or remarks (even with -Werror). So we grep stderr for any message
|
| @@ -3485,8 +4010,8 @@
|
| fi
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
| -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
|
| +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
|
| CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
| if
|
| @@ -3505,15 +4030,15 @@
|
| 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
|
| -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
| -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
|
| +{ $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 test "${ac_cv_prog_CPP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + if test "${ac_cv_prog_CPP+set}" = set; 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"
|
| @@ -3527,11 +4052,7 @@
|
| # <limits.h> 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 >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #ifdef __STDC__
|
| # include <limits.h>
|
| @@ -3540,76 +4061,34 @@
|
| #endif
|
| Syntax error
|
| _ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| - :
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
|
|
| +else
|
| # Broken: fails on valid input.
|
| continue
|
| fi
|
| -
|
| rm -f conftest.err conftest.$ac_ext
|
|
|
| # OK, works on sane cases. Now check whether nonexistent headers
|
| # can be detected and how.
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <ac_nonexistent.h>
|
| _ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
| # Broken: success on invalid input.
|
| continue
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| # Passes both tests.
|
| ac_preproc_ok=:
|
| break
|
| fi
|
| -
|
| rm -f conftest.err conftest.$ac_ext
|
|
|
| done
|
| # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
| rm -f conftest.err conftest.$ac_ext
|
| -if $ac_preproc_ok; then
|
| +if $ac_preproc_ok; then :
|
| break
|
| fi
|
|
|
| @@ -3621,8 +4100,8 @@
|
| else
|
| ac_cv_prog_CPP=$CPP
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $CPP" >&5
|
| -echo "${ECHO_T}$CPP" >&6; }
|
| +{ $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
|
| @@ -3632,11 +4111,7 @@
|
| # <limits.h> 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 >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #ifdef __STDC__
|
| # include <limits.h>
|
| @@ -3645,83 +4120,40 @@
|
| #endif
|
| Syntax error
|
| _ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| - :
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
|
|
| +else
|
| # Broken: fails on valid input.
|
| continue
|
| fi
|
| -
|
| rm -f conftest.err conftest.$ac_ext
|
|
|
| # OK, works on sane cases. Now check whether nonexistent headers
|
| # can be detected and how.
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <ac_nonexistent.h>
|
| _ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
| # Broken: success on invalid input.
|
| continue
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| # Passes both tests.
|
| ac_preproc_ok=:
|
| break
|
| fi
|
| -
|
| rm -f conftest.err conftest.$ac_ext
|
|
|
| done
|
| # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
| rm -f conftest.err conftest.$ac_ext
|
| -if $ac_preproc_ok; then
|
| - :
|
| +if $ac_preproc_ok; then :
|
| +
|
| else
|
| - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + { { $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
|
| @@ -3730,25 +4162,18 @@
|
| ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
| ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
| -
|
| -cat >>confdefs.h <<_ACEOF
|
| -#define CPP_PROG "${CPP}"
|
| -_ACEOF
|
| -
|
| - case $ac_cv_prog_cc_stdc in
|
| - no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;;
|
| - *) { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
|
| -echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_cc_c99+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + case $ac_cv_prog_cc_stdc in #(
|
| + no) :
|
| + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
|
| + *) :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
|
| +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
|
| +if test "${ac_cv_prog_cc_c99+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| ac_cv_prog_cc_c99=no
|
| ac_save_CC=$CC
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdarg.h>
|
| #include <stdbool.h>
|
| @@ -3887,34 +4312,12 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
|
| +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
|
| do
|
| CC="$ac_save_CC $ac_arg"
|
| - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| + if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_prog_cc_c99=$ac_arg
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext
|
| test "x$ac_cv_prog_cc_c99" != "xno" && break
|
| done
|
| @@ -3925,31 +4328,27 @@
|
| # AC_CACHE_VAL
|
| case "x$ac_cv_prog_cc_c99" in
|
| x)
|
| - { echo "$as_me:$LINENO: result: none needed" >&5
|
| -echo "${ECHO_T}none needed" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
| +$as_echo "none needed" >&6; } ;;
|
| xno)
|
| - { echo "$as_me:$LINENO: result: unsupported" >&5
|
| -echo "${ECHO_T}unsupported" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
| +$as_echo "unsupported" >&6; } ;;
|
| *)
|
| CC="$CC $ac_cv_prog_cc_c99"
|
| - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
|
| -echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
|
| +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
|
| esac
|
| -if test "x$ac_cv_prog_cc_c99" != xno; then
|
| +if test "x$ac_cv_prog_cc_c99" != xno; then :
|
| ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
|
| else
|
| - { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
| -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_cc_c89+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
| +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
| +if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| ac_cv_prog_cc_c89=no
|
| ac_save_CC=$CC
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdarg.h>
|
| #include <stdio.h>
|
| @@ -4006,31 +4405,9 @@
|
| -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
| do
|
| CC="$ac_save_CC $ac_arg"
|
| - 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| + if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_prog_cc_c89=$ac_arg
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext
|
| test "x$ac_cv_prog_cc_c89" != "xno" && break
|
| done
|
| @@ -4041,141 +4418,163 @@
|
| # AC_CACHE_VAL
|
| case "x$ac_cv_prog_cc_c89" in
|
| x)
|
| - { echo "$as_me:$LINENO: result: none needed" >&5
|
| -echo "${ECHO_T}none needed" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
| +$as_echo "none needed" >&6; } ;;
|
| xno)
|
| - { echo "$as_me:$LINENO: result: unsupported" >&5
|
| -echo "${ECHO_T}unsupported" >&6; } ;;
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
| +$as_echo "unsupported" >&6; } ;;
|
| *)
|
| CC="$CC $ac_cv_prog_cc_c89"
|
| - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
| -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
| + { $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
|
| +if test "x$ac_cv_prog_cc_c89" != xno; then :
|
| ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
|
| else
|
| ac_cv_prog_cc_stdc=no
|
| fi
|
|
|
| -
|
| fi
|
| -
|
| ;;
|
| esac
|
| - { echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5
|
| -echo $ECHO_N "checking for $CC option to accept ISO Standard C... $ECHO_C" >&6; }
|
| - if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
|
| +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
|
| + if test "${ac_cv_prog_cc_stdc+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| fi
|
|
|
| - case $ac_cv_prog_cc_stdc in
|
| - no) { echo "$as_me:$LINENO: result: unsupported" >&5
|
| -echo "${ECHO_T}unsupported" >&6; } ;;
|
| - '') { echo "$as_me:$LINENO: result: none needed" >&5
|
| -echo "${ECHO_T}none needed" >&6; } ;;
|
| - *) { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
| -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6; } ;;
|
| + case $ac_cv_prog_cc_stdc in #(
|
| + no) :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
| +$as_echo "unsupported" >&6; } ;; #(
|
| + '') :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
| +$as_echo "none needed" >&6; } ;; #(
|
| + *) :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
|
| +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
|
| esac
|
|
|
|
|
| -# Find a good install program. We prefer a C program (faster),
|
| -# so one script is as good as another. But avoid the broken or
|
| -# incompatible versions:
|
| -# SysV /etc/install, /usr/sbin/install
|
| -# SunOS /usr/etc/install
|
| -# IRIX /sbin/install
|
| -# AIX /bin/install
|
| -# AmigaOS /C/install, which installs bootblocks on floppy discs
|
| -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
|
| -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
| -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
| -# OS/2's system install, which has a completely different semantic
|
| -# ./install, which can be erroneously created by make from ./install.sh.
|
| -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
| -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
| -if test -z "$INSTALL"; then
|
| -if test "${ac_cv_path_install+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&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_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
|
| +$as_echo "no, using $LN_S" >&6; }
|
| +fi
|
| +
|
| +#automake default ARFLAGS to "cru"
|
| +if test -n "$ac_tool_prefix"; then
|
| + for ac_prog in $AR 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 test "${ac_cv_prog_AR+set}" = set; 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=.
|
| - # Account for people who put trailing slashes in PATH elements.
|
| -case $as_dir/ in
|
| - ./ | .// | /cC/* | \
|
| - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
| - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
| - /usr/ucb/* ) ;;
|
| - *)
|
| - # OSF1 and SCO ODT 3.0 have their own names for install.
|
| - # Don't use installbsd from OSF since it installs stuff as root
|
| - # by default.
|
| - for ac_prog in ginstall scoinst install; do
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
| - if test $ac_prog = install &&
|
| - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
| - # AIX install. It has an incompatible calling convention.
|
| - :
|
| - elif test $ac_prog = install &&
|
| - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
| - # program-specific install script used by HP pwplus--don't use.
|
| - :
|
| - else
|
| - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
| - break 3
|
| - fi
|
| - fi
|
| - done
|
| - done
|
| - ;;
|
| -esac
|
| + 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
|
| done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| +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 "${ac_cv_path_install+set}" = set; then
|
| - INSTALL=$ac_cv_path_install
|
| - else
|
| - # As a last resort, use the slow shell script. Don't cache a
|
| - # value for INSTALL within a source directory, because that will
|
| - # break other packages using the cache if that directory is
|
| - # removed, or if the value is a relative name.
|
| - INSTALL=$ac_install_sh
|
| +if test -z "$AR"; then
|
| + ac_ct_AR=$AR
|
| + for ac_prog in $AR 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 test "${ac_cv_prog_ac_ct_AR+set}" = set; 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
|
| +done
|
| + done
|
| +IFS=$as_save_IFS
|
| +
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
| -echo "${ECHO_T}$INSTALL" >&6; }
|
| +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
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| +fi
|
|
|
| -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
| -# It thinks the first close brace ends the variable substitution.
|
| -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
|
|
| -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
| + test -n "$ac_ct_AR" && break
|
| +done
|
|
|
| -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
| -
|
| -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
| -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
|
| -LN_S=$as_ln_s
|
| -if test "$LN_S" = "ln -s"; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| -else
|
| - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
| -echo "${ECHO_T}no, using $LN_S" >&6; }
|
| + if test "x$ac_ct_AR" = x; then
|
| + AR="ar"
|
| + 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
|
|
|
| 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
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_RANLIB+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$RANLIB"; then
|
| ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
| @@ -4185,25 +4584,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| RANLIB=$ac_cv_prog_RANLIB
|
| if test -n "$RANLIB"; then
|
| - { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
| -echo "${ECHO_T}$RANLIB" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
| +$as_echo "$RANLIB" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -4212,10 +4611,10 @@
|
| 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
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
| + $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.
|
| @@ -4225,25 +4624,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
| if test -n "$ac_ct_RANLIB"; then
|
| - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
| -echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
| +$as_echo "$ac_ct_RANLIB" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
| if test "x$ac_ct_RANLIB" = x; then
|
| @@ -4251,12 +4650,8 @@
|
| else
|
| case $cross_compiling:$ac_tool_warned in
|
| yes:)
|
| -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&5
|
| -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
| -whose name does not start with the host triplet. If you think this
|
| -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
| +{ $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
|
| @@ -4268,9 +4663,7 @@
|
|
|
| # REQUIRE a standard (ANSI/ISO) C compiler
|
| if test "$ac_cv_prog_cc_stdc" = no; then
|
| - { { echo "$as_me:$LINENO: error: A standard (ANSI/ISO C89) C compiler is required." >&5
|
| -echo "$as_me: error: A standard (ANSI/ISO C89) C compiler is required." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5
|
| fi
|
|
|
| # Check for xmlto (for rendering manpages, needed only for development)
|
| @@ -4278,10 +4671,10 @@
|
| 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 "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_prog_XMLTO+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_prog_XMLTO+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -n "$XMLTO"; then
|
| ac_cv_prog_XMLTO="$XMLTO" # Let the user override the test.
|
| @@ -4291,25 +4684,25 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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_XMLTO="$ac_prog"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| fi
|
| fi
|
| XMLTO=$ac_cv_prog_XMLTO
|
| if test -n "$XMLTO"; then
|
| - { echo "$as_me:$LINENO: result: $XMLTO" >&5
|
| -echo "${ECHO_T}$XMLTO" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
|
| +$as_echo "$XMLTO" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -4318,8 +4711,8 @@
|
| test -n "$XMLTO" || XMLTO=":"
|
|
|
| if test "$XMLTO" = ":"; then
|
| - { echo "$as_me:$LINENO: WARNING: xmlto not found, manpages will not be rebuilt." >&5
|
| -echo "$as_me: WARNING: xmlto not found, manpages will not be rebuilt." >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found, manpages will not be rebuilt." >&5
|
| +$as_echo "$as_me: WARNING: xmlto not found, manpages will not be rebuilt." >&2;}
|
| fi
|
| if test "$XMLTO" != ":"; then
|
| BUILD_MAN_TRUE=
|
| @@ -4337,28 +4730,26 @@
|
| #
|
| # Checks for libraries.
|
| #
|
| -{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
|
| -echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if malloc debugging is wanted" >&5
|
| +$as_echo_n "checking if malloc debugging is wanted... " >&6; }
|
|
|
| # Check whether --with-dmalloc was given.
|
| -if test "${with_dmalloc+set}" = set; then
|
| +if test "${with_dmalloc+set}" = set; then :
|
| withval=$with_dmalloc; if test "$withval" = yes; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define WITH_DMALLOC 1
|
| -_ACEOF
|
| +$as_echo "#define WITH_DMALLOC 1" >>confdefs.h
|
|
|
| LIBS="$LIBS -ldmalloc"
|
| LDFLAGS="$LDFLAGS -g"
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -4368,45 +4759,40 @@
|
| #
|
|
|
|
|
| -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
| -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_GREP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
| +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
| +if test "${ac_cv_path_GREP+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - # Extract the first word of "grep ggrep" to use in msg output
|
| -if test -z "$GREP"; then
|
| -set dummy grep ggrep; ac_prog_name=$2
|
| -if test "${ac_cv_path_GREP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&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
|
| + # 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.
|
| + 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
|
| - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
| + $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"
|
| - echo 'GREP' >> "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
|
| - ac_count=`expr $ac_count + 1`
|
| + 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"
|
| @@ -4418,77 +4804,61 @@
|
| rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
| esac
|
|
|
| -
|
| - $ac_path_GREP_found && break 3
|
| + $ac_path_GREP_found && break 3
|
| + done
|
| done
|
| -done
|
| -
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
| -
|
| -
|
| -fi
|
| -
|
| -GREP="$ac_cv_path_GREP"
|
| -if test -z "$GREP"; then
|
| - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
| -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| -fi
|
| -
|
| + 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
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
| -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
|
| +{ $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"
|
|
|
|
|
| -{ echo "$as_me:$LINENO: checking for egrep" >&5
|
| -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_EGREP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
| +$as_echo_n "checking for egrep... " >&6; }
|
| +if test "${ac_cv_path_EGREP+set}" = set; then :
|
| + $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
|
| - # Extract the first word of "egrep" to use in msg output
|
| -if test -z "$EGREP"; then
|
| -set dummy egrep; ac_prog_name=$2
|
| -if test "${ac_cv_path_EGREP+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -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
|
| + # 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.
|
| + 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
|
| - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
| + $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"
|
| - echo 'EGREP' >> "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
|
| - ac_count=`expr $ac_count + 1`
|
| + 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"
|
| @@ -4500,46 +4870,31 @@
|
| rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
| esac
|
|
|
| -
|
| - $ac_path_EGREP_found && break 3
|
| + $ac_path_EGREP_found && break 3
|
| + done
|
| done
|
| -done
|
| -
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
| -
|
| -
|
| -fi
|
| -
|
| -EGREP="$ac_cv_path_EGREP"
|
| -if test -z "$EGREP"; then
|
| - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
| -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| -fi
|
| -
|
| + 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
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
| -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
| +{ $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"
|
|
|
|
|
| -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
| -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
| -if test "${ac_cv_header_stdc+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&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 test "${ac_cv_header_stdc+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdlib.h>
|
| #include <stdarg.h>
|
| @@ -4554,47 +4909,23 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_header_stdc=yes
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_header_stdc=no
|
| + ac_cv_header_stdc=no
|
| fi
|
| -
|
| 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 <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <string.h>
|
|
|
| _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
|
| ac_cv_header_stdc=no
|
| fi
|
| @@ -4604,18 +4935,14 @@
|
|
|
| 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 <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdlib.h>
|
|
|
| _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
|
| ac_cv_header_stdc=no
|
| fi
|
| @@ -4625,14 +4952,10 @@
|
|
|
| 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 <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <ctype.h>
|
| #include <stdlib.h>
|
| @@ -4659,113 +4982,36 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - :
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| +if ac_fn_c_try_run "$LINENO"; then :
|
|
|
| -( exit $ac_status )
|
| -ac_cv_header_stdc=no
|
| +else
|
| + ac_cv_header_stdc=no
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +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 "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
| -echo "${ECHO_T}$ac_cv_header_stdc" >&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 <<\_ACEOF
|
| -#define STDC_HEADERS 1
|
| -_ACEOF
|
| +$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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
| -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -
|
| -#include <$ac_header>
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - eval "$as_ac_Header=yes"
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$as_ac_Header=no"
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_Header'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
| +do :
|
| + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
| +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
| +"
|
| +eval as_val=\$$as_ac_Header
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| @@ -4773,148 +5019,14 @@
|
| done
|
|
|
|
|
| -
|
| -
|
| -
|
| -
|
| -for ac_header in strings.h libgen.h unistd.h direct.h
|
| -do
|
| -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
| -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_Header'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -else
|
| - # Is the header compilable?
|
| -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
| -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -#include <$ac_header>
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_header_compiler=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_header_compiler=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
| -echo "${ECHO_T}$ac_header_compiler" >&6; }
|
| -
|
| -# Is the header present?
|
| -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
| -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$ac_header>
|
| -_ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| - ac_header_preproc=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_header_preproc=no
|
| -fi
|
| -
|
| -rm -f conftest.err conftest.$ac_ext
|
| -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
| -echo "${ECHO_T}$ac_header_preproc" >&6; }
|
| -
|
| -# So? What about this header?
|
| -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
| - yes:no: )
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
| -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
| -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
| - ac_header_preproc=yes
|
| - ;;
|
| - no:yes:* )
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
| -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
| -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
| -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
| -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
| -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
| - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
| -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
| - ( cat <<\_ASBOX
|
| -## ----------------------------------- ##
|
| -## Report this to bug-yasm@tortall.net ##
|
| -## ----------------------------------- ##
|
| -_ASBOX
|
| - ) | sed "s/^/$as_me: WARNING: /" >&2
|
| - ;;
|
| -esac
|
| -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - eval "$as_ac_Header=\$ac_header_preproc"
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_Header'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -
|
| -fi
|
| -if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
| +for ac_header in strings.h libgen.h unistd.h direct.h sys/stat.h
|
| +do :
|
| + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
| +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
| +eval as_val=\$$as_ac_Header
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| @@ -4924,24 +5036,18 @@
|
|
|
| # REQUIRE standard C headers
|
| if test "$ac_cv_header_stdc" != yes; then
|
| - { { echo "$as_me:$LINENO: error: Standard (ANSI/ISO C89) header files are required." >&5
|
| -echo "$as_me: error: Standard (ANSI/ISO C89) header files are required." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5
|
| fi
|
|
|
| #
|
| # Checks for typedefs, structures, and compiler characteristics.
|
| #
|
| -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
|
| -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
|
| -if test "${ac_cv_c_const+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
| +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
| +if test "${ac_cv_c_const+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
|
|
| int
|
| @@ -5001,55 +5107,29 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_c_const=yes
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_c_const=no
|
| + ac_cv_c_const=no
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
|
| -echo "${ECHO_T}$ac_cv_c_const" >&6; }
|
| +{ $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 <<\_ACEOF
|
| -#define const
|
| -_ACEOF
|
| +$as_echo "#define const /**/" >>confdefs.h
|
|
|
| fi
|
|
|
| -{ echo "$as_me:$LINENO: checking for inline" >&5
|
| -echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
|
| -if test "${ac_cv_c_inline+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
|
| +$as_echo_n "checking for inline... " >&6; }
|
| +if test "${ac_cv_c_inline+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| ac_cv_c_inline=no
|
| for ac_kw in inline __inline__ __inline; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #ifndef __cplusplus
|
| typedef int foo_t;
|
| @@ -5058,40 +5138,17 @@
|
| #endif
|
|
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_c_inline=$ac_kw
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| test "$ac_cv_c_inline" != no && break
|
| done
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
| -echo "${ECHO_T}$ac_cv_c_inline" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
|
| +$as_echo "$ac_cv_c_inline" >&6; }
|
|
|
| -
|
| case $ac_cv_c_inline in
|
| inline | yes) ;;
|
| *)
|
| @@ -5107,81 +5164,25 @@
|
| ;;
|
| esac
|
|
|
| -{ echo "$as_me:$LINENO: checking for function prototypes" >&5
|
| -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
|
| +$as_echo_n "checking for function prototypes... " >&6; }
|
| if test "$ac_cv_prog_cc_c89" != no; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define PROTOTYPES 1
|
| -_ACEOF
|
| +$as_echo "#define PROTOTYPES 1" >>confdefs.h
|
|
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define __PROTOTYPES 1
|
| -_ACEOF
|
| +$as_echo "#define __PROTOTYPES 1" >>confdefs.h
|
|
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
| -{ echo "$as_me:$LINENO: checking for size_t" >&5
|
| -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_size_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef size_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_size_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
|
| +if test "x$ac_cv_type_size_t" = x""yes; then :
|
|
|
| - ac_cv_type_size_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
|
| -if test $ac_cv_type_size_t = yes; then
|
| - :
|
| else
|
|
|
| cat >>confdefs.h <<_ACEOF
|
| @@ -5191,23 +5192,19 @@
|
| fi
|
|
|
| # ------ AX CREATE STDINT H -------------------------------------
|
| -{ echo "$as_me:$LINENO: checking for stdint types" >&5
|
| -echo $ECHO_N "checking for stdint types... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint types" >&5
|
| +$as_echo_n "checking for stdint types... " >&6; }
|
| ac_stdint_h=`echo libyasm-stdint.h`
|
| # try to shortcircuit - if the default include path of the compiler
|
| # can find a "stdint.h" header then we assume that all compilers can.
|
| -if test "${ac_cv_header_stdint_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +if test "${ac_cv_header_stdint_t+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
|
| old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
|
| old_CFLAGS="$CFLAGS" ; CFLAGS=""
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdint.h>
|
| int
|
| @@ -5218,32 +5215,12 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| +if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_cv_stdint_result="(assuming C99 compatible system)"
|
| ac_cv_header_stdint_t="stdint.h";
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_header_stdint_t=""
|
| + ac_cv_header_stdint_t=""
|
| fi
|
| -
|
| rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| CXXFLAGS="$old_CXXFLAGS"
|
| CPPFLAGS="$old_CPPFLAGS"
|
| @@ -5253,18 +5230,18 @@
|
|
|
| v="... $ac_cv_header_stdint_h"
|
| if test "$ac_stdint_h" = "stdint.h" ; then
|
| - { echo "$as_me:$LINENO: result: (are you sure you want them in ./stdint.h?)" >&5
|
| -echo "${ECHO_T}(are you sure you want them in ./stdint.h?)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./stdint.h?)" >&5
|
| +$as_echo "(are you sure you want them in ./stdint.h?)" >&6; }
|
| elif test "$ac_stdint_h" = "inttypes.h" ; then
|
| - { echo "$as_me:$LINENO: result: (are you sure you want them in ./inttypes.h?)" >&5
|
| -echo "${ECHO_T}(are you sure you want them in ./inttypes.h?)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./inttypes.h?)" >&5
|
| +$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; }
|
| elif test "_$ac_cv_header_stdint_t" = "_" ; then
|
| - { echo "$as_me:$LINENO: result: (putting them into $ac_stdint_h)$v" >&5
|
| -echo "${ECHO_T}(putting them into $ac_stdint_h)$v" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (putting them into $ac_stdint_h)$v" >&5
|
| +$as_echo "(putting them into $ac_stdint_h)$v" >&6; }
|
| else
|
| ac_cv_header_stdint="$ac_cv_header_stdint_t"
|
| - { echo "$as_me:$LINENO: result: $ac_cv_header_stdint (shortcircuit)" >&5
|
| -echo "${ECHO_T}$ac_cv_header_stdint (shortcircuit)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint (shortcircuit)" >&5
|
| +$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; }
|
| fi
|
|
|
| if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
|
| @@ -5274,133 +5251,29 @@
|
|
|
| ac_cv_stdint_result="(no helpful system typedefs seen)"
|
|
|
| -{ echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5
|
| -echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_header_stdint_x+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
|
| +$as_echo_n "checking for stdint uintptr_t... " >&6; }
|
| +if test "${ac_cv_header_stdint_x+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
|
| - { echo "$as_me:$LINENO: result: (..)" >&5
|
| -echo "${ECHO_T}(..)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
|
| +$as_echo "(..)" >&6; }
|
| for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do
|
| unset ac_cv_type_uintptr_t
|
| unset ac_cv_type_uint64_t
|
| - { echo "$as_me:$LINENO: checking for uintptr_t" >&5
|
| -echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_uintptr_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$i>
|
| -
|
| -typedef uintptr_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_uintptr_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_uintptr_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; }
|
| -if test $ac_cv_type_uintptr_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i>
|
| +"
|
| +if test "x$ac_cv_type_uintptr_t" = x""yes; then :
|
| ac_cv_header_stdint_x=$i
|
| else
|
| continue
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking for uint64_t" >&5
|
| -echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_uint64_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include<$i>
|
| -
|
| -typedef uint64_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_uint64_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_uint64_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
|
| -if test $ac_cv_type_uint64_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
|
| +"
|
| +if test "x$ac_cv_type_uint64_t" = x""yes; then :
|
| and64="/uint64_t"
|
| else
|
| and64=""
|
| @@ -5408,143 +5281,39 @@
|
|
|
| break;
|
| done
|
| - { echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5
|
| -echo $ECHO_N "checking for stdint uintptr_t... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
|
| +$as_echo_n "checking for stdint uintptr_t... " >&6; }
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_x" >&5
|
| -echo "${ECHO_T}$ac_cv_header_stdint_x" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_x" >&5
|
| +$as_echo "$ac_cv_header_stdint_x" >&6; }
|
|
|
|
|
| if test "_$ac_cv_header_stdint_x" = "_" ; then
|
|
|
| -{ echo "$as_me:$LINENO: checking for stdint uint32_t" >&5
|
| -echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_header_stdint_o+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
|
| +$as_echo_n "checking for stdint uint32_t... " >&6; }
|
| +if test "${ac_cv_header_stdint_o+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
|
| - { echo "$as_me:$LINENO: result: (..)" >&5
|
| -echo "${ECHO_T}(..)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
|
| +$as_echo "(..)" >&6; }
|
| for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do
|
| unset ac_cv_type_uint32_t
|
| unset ac_cv_type_uint64_t
|
| - { echo "$as_me:$LINENO: checking for uint32_t" >&5
|
| -echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_uint32_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$i>
|
| -
|
| -typedef uint32_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_uint32_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_uint32_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
|
| -if test $ac_cv_type_uint32_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i>
|
| +"
|
| +if test "x$ac_cv_type_uint32_t" = x""yes; then :
|
| ac_cv_header_stdint_o=$i
|
| else
|
| continue
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking for uint64_t" >&5
|
| -echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_uint64_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include<$i>
|
| -
|
| -typedef uint64_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_uint64_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_uint64_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
|
| -if test $ac_cv_type_uint64_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
|
| +"
|
| +if test "x$ac_cv_type_uint64_t" = x""yes; then :
|
| and64="/uint64_t"
|
| else
|
| and64=""
|
| @@ -5552,145 +5321,41 @@
|
|
|
| break;
|
| done
|
| - { echo "$as_me:$LINENO: checking for stdint uint32_t" >&5
|
| -echo $ECHO_N "checking for stdint uint32_t... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
|
| +$as_echo_n "checking for stdint uint32_t... " >&6; }
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_o" >&5
|
| -echo "${ECHO_T}$ac_cv_header_stdint_o" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_o" >&5
|
| +$as_echo "$ac_cv_header_stdint_o" >&6; }
|
|
|
| fi
|
|
|
| if test "_$ac_cv_header_stdint_x" = "_" ; then
|
| if test "_$ac_cv_header_stdint_o" = "_" ; then
|
|
|
| -{ echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5
|
| -echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_header_stdint_u+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
|
| +$as_echo_n "checking for stdint u_int32_t... " >&6; }
|
| +if test "${ac_cv_header_stdint_u+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
|
| - { echo "$as_me:$LINENO: result: (..)" >&5
|
| -echo "${ECHO_T}(..)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
|
| +$as_echo "(..)" >&6; }
|
| for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do
|
| unset ac_cv_type_u_int32_t
|
| unset ac_cv_type_u_int64_t
|
| - { echo "$as_me:$LINENO: checking for u_int32_t" >&5
|
| -echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_u_int32_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$i>
|
| -
|
| -typedef u_int32_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_u_int32_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_u_int32_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; }
|
| -if test $ac_cv_type_u_int32_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i>
|
| +"
|
| +if test "x$ac_cv_type_u_int32_t" = x""yes; then :
|
| ac_cv_header_stdint_u=$i
|
| else
|
| continue
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking for u_int64_t" >&5
|
| -echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_u_int64_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include<$i>
|
| -
|
| -typedef u_int64_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_u_int64_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_u_int64_t=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6; }
|
| -if test $ac_cv_type_u_int64_t = yes; then
|
| + ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i>
|
| +"
|
| +if test "x$ac_cv_type_u_int64_t" = x""yes; then :
|
| and64="/u_int64_t"
|
| else
|
| and64=""
|
| @@ -5698,418 +5363,47 @@
|
|
|
| break;
|
| done
|
| - { echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5
|
| -echo $ECHO_N "checking for stdint u_int32_t... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
|
| +$as_echo_n "checking for stdint u_int32_t... " >&6; }
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_u" >&5
|
| -echo "${ECHO_T}$ac_cv_header_stdint_u" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_u" >&5
|
| +$as_echo "$ac_cv_header_stdint_u" >&6; }
|
|
|
| fi fi
|
|
|
| if test "_$ac_cv_header_stdint_x" = "_" ; then
|
| - { echo "$as_me:$LINENO: checking for stdint datatype model" >&5
|
| -echo $ECHO_N "checking for stdint datatype model... $ECHO_C" >&6; }
|
| - { echo "$as_me:$LINENO: result: (..)" >&5
|
| -echo "${ECHO_T}(..)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint datatype model" >&5
|
| +$as_echo_n "checking for stdint datatype model... " >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
|
| +$as_echo "(..)" >&6; }
|
|
|
| - { echo "$as_me:$LINENO: checking for char" >&5
|
| -echo $ECHO_N "checking for char... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_char+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef char ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_char=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_char=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
|
| -echo "${ECHO_T}$ac_cv_type_char" >&6; }
|
| -
|
| -# The cast to long int works around a bug in the HP C Compiler
|
| + # 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.
|
| -{ echo "$as_me:$LINENO: checking size of char" >&5
|
| -echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
|
| -if test "${ac_cv_sizeof_char+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
|
| +$as_echo_n "checking size of char... " >&6; }
|
| +if test "${ac_cv_sizeof_char+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then
|
| - # Depending upon the size, compute the lo and hi bounds.
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
|
| -test_array [0] = 0
|
| + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then :
|
|
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=0 ac_mid=0
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid; break
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr $ac_mid + 1`
|
| - if test $ac_lo -le $ac_mid; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=-1 ac_mid=-1
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=$ac_mid; break
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_hi=`expr '(' $ac_mid ')' - 1`
|
| - if test $ac_mid -le $ac_hi; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - 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
|
| - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr '(' $ac_mid ')' + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -done
|
| -case $ac_lo in
|
| -?*) ac_cv_sizeof_char=$ac_lo;;
|
| -'') if test "$ac_cv_type_char" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (char)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| + if test "$ac_cv_type_char" = yes; then
|
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "cannot compute sizeof (char)
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| else
|
| ac_cv_sizeof_char=0
|
| - fi ;;
|
| -esac
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef char ac__type_sizeof_;
|
| -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -#include <stdio.h>
|
| -#include <stdlib.h>
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - FILE *f = fopen ("conftest.val", "w");
|
| - if (! f)
|
| - return 1;
|
| - if (((long int) (sizeof (ac__type_sizeof_))) < 0)
|
| - {
|
| - long int i = longval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%ld\n", i);
|
| - }
|
| - else
|
| - {
|
| - unsigned long int i = ulongval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%lu\n", i);
|
| - }
|
| - return ferror (f) || fclose (f) != 0;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - ac_cv_sizeof_char=`cat conftest.val`
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -( exit $ac_status )
|
| -if test "$ac_cv_type_char" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (char)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| - else
|
| - ac_cv_sizeof_char=0
|
| fi
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +
|
| fi
|
| -rm -f conftest.val
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
|
| -echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
|
| +$as_echo "$ac_cv_sizeof_char" >&6; }
|
|
|
|
|
|
|
| @@ -6118,403 +5412,32 @@
|
| _ACEOF
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for short" >&5
|
| -echo $ECHO_N "checking for short... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_short+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef short ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_short=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_short=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
|
| -echo "${ECHO_T}$ac_cv_type_short" >&6; }
|
| -
|
| -# The cast to long int works around a bug in the HP C Compiler
|
| + # 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.
|
| -{ echo "$as_me:$LINENO: checking size of short" >&5
|
| -echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
|
| -if test "${ac_cv_sizeof_short+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
|
| +$as_echo_n "checking size of short... " >&6; }
|
| +if test "${ac_cv_sizeof_short+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then
|
| - # Depending upon the size, compute the lo and hi bounds.
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
|
| -test_array [0] = 0
|
| + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
|
|
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=0 ac_mid=0
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid; break
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr $ac_mid + 1`
|
| - if test $ac_lo -le $ac_mid; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=-1 ac_mid=-1
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=$ac_mid; break
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_hi=`expr '(' $ac_mid ')' - 1`
|
| - if test $ac_mid -le $ac_hi; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - 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
|
| - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr '(' $ac_mid ')' + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -done
|
| -case $ac_lo in
|
| -?*) ac_cv_sizeof_short=$ac_lo;;
|
| -'') if test "$ac_cv_type_short" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (short)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| + if test "$ac_cv_type_short" = yes; then
|
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "cannot compute sizeof (short)
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| else
|
| ac_cv_sizeof_short=0
|
| - fi ;;
|
| -esac
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef short ac__type_sizeof_;
|
| -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -#include <stdio.h>
|
| -#include <stdlib.h>
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - FILE *f = fopen ("conftest.val", "w");
|
| - if (! f)
|
| - return 1;
|
| - if (((long int) (sizeof (ac__type_sizeof_))) < 0)
|
| - {
|
| - long int i = longval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%ld\n", i);
|
| - }
|
| - else
|
| - {
|
| - unsigned long int i = ulongval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%lu\n", i);
|
| - }
|
| - return ferror (f) || fclose (f) != 0;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - ac_cv_sizeof_short=`cat conftest.val`
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -( exit $ac_status )
|
| -if test "$ac_cv_type_short" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (short)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| - else
|
| - ac_cv_sizeof_short=0
|
| fi
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +
|
| fi
|
| -rm -f conftest.val
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
|
| -echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
|
| +$as_echo "$ac_cv_sizeof_short" >&6; }
|
|
|
|
|
|
|
| @@ -6523,403 +5446,32 @@
|
| _ACEOF
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for int" >&5
|
| -echo $ECHO_N "checking for int... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_int+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef int ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_int=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_int=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
|
| -echo "${ECHO_T}$ac_cv_type_int" >&6; }
|
| -
|
| -# The cast to long int works around a bug in the HP C Compiler
|
| + # 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.
|
| -{ echo "$as_me:$LINENO: checking size of int" >&5
|
| -echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
|
| -if test "${ac_cv_sizeof_int+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
|
| +$as_echo_n "checking size of int... " >&6; }
|
| +if test "${ac_cv_sizeof_int+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then
|
| - # Depending upon the size, compute the lo and hi bounds.
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
|
| -test_array [0] = 0
|
| + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
|
|
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=0 ac_mid=0
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid; break
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr $ac_mid + 1`
|
| - if test $ac_lo -le $ac_mid; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=-1 ac_mid=-1
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=$ac_mid; break
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_hi=`expr '(' $ac_mid ')' - 1`
|
| - if test $ac_mid -le $ac_hi; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - 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
|
| - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr '(' $ac_mid ')' + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -done
|
| -case $ac_lo in
|
| -?*) ac_cv_sizeof_int=$ac_lo;;
|
| -'') if test "$ac_cv_type_int" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (int)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| + if test "$ac_cv_type_int" = yes; then
|
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "cannot compute sizeof (int)
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| else
|
| ac_cv_sizeof_int=0
|
| - fi ;;
|
| -esac
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef int ac__type_sizeof_;
|
| -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -#include <stdio.h>
|
| -#include <stdlib.h>
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - FILE *f = fopen ("conftest.val", "w");
|
| - if (! f)
|
| - return 1;
|
| - if (((long int) (sizeof (ac__type_sizeof_))) < 0)
|
| - {
|
| - long int i = longval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%ld\n", i);
|
| - }
|
| - else
|
| - {
|
| - unsigned long int i = ulongval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%lu\n", i);
|
| - }
|
| - return ferror (f) || fclose (f) != 0;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - ac_cv_sizeof_int=`cat conftest.val`
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -( exit $ac_status )
|
| -if test "$ac_cv_type_int" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (int)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| - else
|
| - ac_cv_sizeof_int=0
|
| fi
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +
|
| fi
|
| -rm -f conftest.val
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
|
| -echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
|
| +$as_echo "$ac_cv_sizeof_int" >&6; }
|
|
|
|
|
|
|
| @@ -6928,403 +5480,32 @@
|
| _ACEOF
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for long" >&5
|
| -echo $ECHO_N "checking for long... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_long+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef long ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_long=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_long=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
|
| -echo "${ECHO_T}$ac_cv_type_long" >&6; }
|
| -
|
| -# The cast to long int works around a bug in the HP C Compiler
|
| + # 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.
|
| -{ echo "$as_me:$LINENO: checking size of long" >&5
|
| -echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
|
| -if test "${ac_cv_sizeof_long+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
|
| +$as_echo_n "checking size of long... " >&6; }
|
| +if test "${ac_cv_sizeof_long+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then
|
| - # Depending upon the size, compute the lo and hi bounds.
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
|
| -test_array [0] = 0
|
| + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
|
|
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=0 ac_mid=0
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid; break
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr $ac_mid + 1`
|
| - if test $ac_lo -le $ac_mid; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=-1 ac_mid=-1
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=$ac_mid; break
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_hi=`expr '(' $ac_mid ')' - 1`
|
| - if test $ac_mid -le $ac_hi; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - 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
|
| - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr '(' $ac_mid ')' + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -done
|
| -case $ac_lo in
|
| -?*) ac_cv_sizeof_long=$ac_lo;;
|
| -'') if test "$ac_cv_type_long" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (long)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| + if test "$ac_cv_type_long" = yes; then
|
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "cannot compute sizeof (long)
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| else
|
| ac_cv_sizeof_long=0
|
| - fi ;;
|
| -esac
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef long ac__type_sizeof_;
|
| -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -#include <stdio.h>
|
| -#include <stdlib.h>
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - FILE *f = fopen ("conftest.val", "w");
|
| - if (! f)
|
| - return 1;
|
| - if (((long int) (sizeof (ac__type_sizeof_))) < 0)
|
| - {
|
| - long int i = longval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%ld\n", i);
|
| - }
|
| - else
|
| - {
|
| - unsigned long int i = ulongval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%lu\n", i);
|
| - }
|
| - return ferror (f) || fclose (f) != 0;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - ac_cv_sizeof_long=`cat conftest.val`
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -( exit $ac_status )
|
| -if test "$ac_cv_type_long" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (long)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| - else
|
| - ac_cv_sizeof_long=0
|
| fi
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +
|
| fi
|
| -rm -f conftest.val
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
|
| -echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
|
| +$as_echo "$ac_cv_sizeof_long" >&6; }
|
|
|
|
|
|
|
| @@ -7333,403 +5514,32 @@
|
| _ACEOF
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for void*" >&5
|
| -echo $ECHO_N "checking for void*... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_voidp+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -typedef void* ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_voidp=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_voidp=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
|
| -echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
|
| -
|
| -# The cast to long int works around a bug in the HP C Compiler
|
| + # 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.
|
| -{ echo "$as_me:$LINENO: checking size of void*" >&5
|
| -echo $ECHO_N "checking size of void*... $ECHO_C" >&6; }
|
| -if test "${ac_cv_sizeof_voidp+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
|
| +$as_echo_n "checking size of void*... " >&6; }
|
| +if test "${ac_cv_sizeof_voidp+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then
|
| - # Depending upon the size, compute the lo and hi bounds.
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
|
| -test_array [0] = 0
|
| + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then :
|
|
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=0 ac_mid=0
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid; break
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr $ac_mid + 1`
|
| - if test $ac_lo -le $ac_mid; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=-1 ac_mid=-1
|
| - while :; do
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_lo=$ac_mid; break
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_hi=`expr '(' $ac_mid ')' - 1`
|
| - if test $ac_mid -le $ac_hi; then
|
| - ac_lo= ac_hi=
|
| - break
|
| - fi
|
| - ac_mid=`expr 2 '*' $ac_mid`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - done
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - 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
|
| - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -int
|
| -main ()
|
| -{
|
| -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
|
| -test_array [0] = 0
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_hi=$ac_mid
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_lo=`expr '(' $ac_mid ')' + 1`
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -done
|
| -case $ac_lo in
|
| -?*) ac_cv_sizeof_voidp=$ac_lo;;
|
| -'') if test "$ac_cv_type_voidp" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (void*)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| + if test "$ac_cv_type_voidp" = yes; then
|
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| +{ as_fn_set_status 77
|
| +as_fn_error "cannot compute sizeof (void*)
|
| +See \`config.log' for more details." "$LINENO" 5; }; }
|
| else
|
| ac_cv_sizeof_voidp=0
|
| - fi ;;
|
| -esac
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| - typedef void* ac__type_sizeof_;
|
| -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
|
| -#include <stdio.h>
|
| -#include <stdlib.h>
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - FILE *f = fopen ("conftest.val", "w");
|
| - if (! f)
|
| - return 1;
|
| - if (((long int) (sizeof (ac__type_sizeof_))) < 0)
|
| - {
|
| - long int i = longval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%ld\n", i);
|
| - }
|
| - else
|
| - {
|
| - unsigned long int i = ulongval ();
|
| - if (i != ((long int) (sizeof (ac__type_sizeof_))))
|
| - return 1;
|
| - fprintf (f, "%lu\n", i);
|
| - }
|
| - return ferror (f) || fclose (f) != 0;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -rm -f conftest$ac_exeext
|
| -if { (ac_try="$ac_link"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
| - { (case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; }; then
|
| - ac_cv_sizeof_voidp=`cat conftest.val`
|
| -else
|
| - echo "$as_me: program exited with status $ac_status" >&5
|
| -echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -( exit $ac_status )
|
| -if test "$ac_cv_type_voidp" = yes; then
|
| - { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
|
| -See \`config.log' for more details." >&5
|
| -echo "$as_me: error: cannot compute sizeof (void*)
|
| -See \`config.log' for more details." >&2;}
|
| - { (exit 77); exit 77; }; }
|
| - else
|
| - ac_cv_sizeof_voidp=0
|
| fi
|
| fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
| +
|
| fi
|
| -rm -f conftest.val
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
|
| -echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
|
| +$as_echo "$ac_cv_sizeof_voidp" >&6; }
|
|
|
|
|
|
|
| @@ -7746,8 +5556,8 @@
|
| ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
|
| ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
|
| ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
|
| - { echo "$as_me:$LINENO: checking data model" >&5
|
| -echo $ECHO_N "checking data model... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking data model" >&5
|
| +$as_echo_n "checking data model... " >&6; }
|
| case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
|
| 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;;
|
| 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;;
|
| @@ -7767,8 +5577,8 @@
|
| ac_cv_data_model="iDSP" ; n="unusual dsptype" ;;
|
| *) ac_cv_data_model="none" ; n="very unusual model" ;;
|
| esac
|
| - { echo "$as_me:$LINENO: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5
|
| -echo "${ECHO_T}$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5
|
| +$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; }
|
|
|
| fi
|
|
|
| @@ -7782,178 +5592,31 @@
|
| ac_cv_header_stdint="stddef.h"
|
| fi
|
|
|
| -{ echo "$as_me:$LINENO: checking for extra inttypes in chosen header" >&5
|
| -echo $ECHO_N "checking for extra inttypes in chosen header... $ECHO_C" >&6; }
|
| -{ echo "$as_me:$LINENO: result: ($ac_cv_header_stdint)" >&5
|
| -echo "${ECHO_T}($ac_cv_header_stdint)" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra inttypes in chosen header" >&5
|
| +$as_echo_n "checking for extra inttypes in chosen header... " >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($ac_cv_header_stdint)" >&5
|
| +$as_echo "($ac_cv_header_stdint)" >&6; }
|
| unset ac_cv_type_int_least32_t
|
| unset ac_cv_type_int_fast32_t
|
| -{ echo "$as_me:$LINENO: checking for int_least32_t" >&5
|
| -echo $ECHO_N "checking for int_least32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_int_least32_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$ac_cv_header_stdint>
|
| +ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint>
|
| +"
|
| +if test "x$ac_cv_type_int_least32_t" = x""yes; then :
|
|
|
| -typedef int_least32_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_int_least32_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_int_least32_t=no
|
| fi
|
|
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_int_least32_t" >&6; }
|
| +ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint>
|
| +"
|
| +if test "x$ac_cv_type_int_fast32_t" = x""yes; then :
|
|
|
| -{ echo "$as_me:$LINENO: checking for int_fast32_t" >&5
|
| -echo $ECHO_N "checking for int_fast32_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_int_fast32_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include<$ac_cv_header_stdint>
|
| -
|
| -typedef int_fast32_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_int_fast32_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_int_fast32_t=no
|
| fi
|
|
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_int_fast32_t" >&6; }
|
| +ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint>
|
| +"
|
| +if test "x$ac_cv_type_intmax_t" = x""yes; then :
|
|
|
| -{ echo "$as_me:$LINENO: checking for intmax_t" >&5
|
| -echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
|
| -if test "${ac_cv_type_intmax_t+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <$ac_cv_header_stdint>
|
| -
|
| -typedef intmax_t ac__type_new_;
|
| -int
|
| -main ()
|
| -{
|
| -if ((ac__type_new_ *) 0)
|
| - return 0;
|
| -if (sizeof (ac__type_new_))
|
| - return 0;
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_compile") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest.$ac_objext; then
|
| - ac_cv_type_intmax_t=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - ac_cv_type_intmax_t=no
|
| fi
|
|
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5
|
| -echo "${ECHO_T}$ac_cv_type_intmax_t" >&6; }
|
|
|
| -
|
| fi # shortcircut to system "stdint.h"
|
| # ------------------ PREPARE VARIABLES ------------------------------
|
| #if test "$GCC" = "yes" ; then
|
| @@ -7962,8 +5625,8 @@
|
| ac_cv_stdint_message="using $CC"
|
| #fi
|
|
|
| -{ echo "$as_me:$LINENO: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5
|
| -echo "${ECHO_T}make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5
|
| +$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; }
|
|
|
| # ----------------- DONE inttypes.h checks START header -------------
|
| ac_config_commands="$ac_config_commands $ac_stdint_h"
|
| @@ -7973,387 +5636,54 @@
|
| #
|
| # Checks for library functions.
|
| #
|
| -
|
| -
|
| -
|
| for ac_func in abort toascii vsnprintf
|
| -do
|
| -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
| -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
| - For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
| -#define $ac_func innocuous_$ac_func
|
| -
|
| -/* System header to define __stub macros and hopefully few prototypes,
|
| - which can conflict with char $ac_func (); below.
|
| - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
| - <limits.h> exists even on freestanding compilers. */
|
| -
|
| -#ifdef __STDC__
|
| -# include <limits.h>
|
| -#else
|
| -# include <assert.h>
|
| -#endif
|
| -
|
| -#undef $ac_func
|
| -
|
| -/* 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 $ac_func ();
|
| -/* 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
|
| -#endif
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -return $ac_func ();
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - eval "$as_ac_var=yes"
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$as_ac_var=no"
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_var'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -if test `eval echo '${'$as_ac_var'}'` = yes; then
|
| +do :
|
| + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
| +eval as_val=\$$as_ac_var
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| done
|
|
|
| -
|
| -
|
| -
|
| for ac_func in strsep mergesort getcwd
|
| -do
|
| -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
| -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
| - For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
| -#define $ac_func innocuous_$ac_func
|
| -
|
| -/* System header to define __stub macros and hopefully few prototypes,
|
| - which can conflict with char $ac_func (); below.
|
| - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
| - <limits.h> exists even on freestanding compilers. */
|
| -
|
| -#ifdef __STDC__
|
| -# include <limits.h>
|
| -#else
|
| -# include <assert.h>
|
| -#endif
|
| -
|
| -#undef $ac_func
|
| -
|
| -/* 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 $ac_func ();
|
| -/* 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
|
| -#endif
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -return $ac_func ();
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - eval "$as_ac_var=yes"
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$as_ac_var=no"
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_var'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -if test `eval echo '${'$as_ac_var'}'` = yes; then
|
| +do :
|
| + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
| +eval as_val=\$$as_ac_var
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| done
|
|
|
| -
|
| -
|
| for ac_func in popen ftruncate
|
| -do
|
| -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
| -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
| - For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
| -#define $ac_func innocuous_$ac_func
|
| -
|
| -/* System header to define __stub macros and hopefully few prototypes,
|
| - which can conflict with char $ac_func (); below.
|
| - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
| - <limits.h> exists even on freestanding compilers. */
|
| -
|
| -#ifdef __STDC__
|
| -# include <limits.h>
|
| -#else
|
| -# include <assert.h>
|
| -#endif
|
| -
|
| -#undef $ac_func
|
| -
|
| -/* 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 $ac_func ();
|
| -/* 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
|
| -#endif
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -return $ac_func ();
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - eval "$as_ac_var=yes"
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$as_ac_var=no"
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_var'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -if test `eval echo '${'$as_ac_var'}'` = yes; then
|
| +do :
|
| + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
| +eval as_val=\$$as_ac_var
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| done
|
|
|
| # Look for the case-insensitive comparison functions
|
| -
|
| -
|
| -
|
| -
|
| -
|
| for ac_func in strcasecmp strncasecmp stricmp _stricmp strcmpi
|
| -do
|
| -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
| -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
| -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
| - For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
| -#define $ac_func innocuous_$ac_func
|
| -
|
| -/* System header to define __stub macros and hopefully few prototypes,
|
| - which can conflict with char $ac_func (); below.
|
| - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
| - <limits.h> exists even on freestanding compilers. */
|
| -
|
| -#ifdef __STDC__
|
| -# include <limits.h>
|
| -#else
|
| -# include <assert.h>
|
| -#endif
|
| -
|
| -#undef $ac_func
|
| -
|
| -/* 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 $ac_func ();
|
| -/* 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
|
| -#endif
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -return $ac_func ();
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - eval "$as_ac_var=yes"
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$as_ac_var=no"
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| -fi
|
| -ac_res=`eval echo '${'$as_ac_var'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| -if test `eval echo '${'$as_ac_var'}'` = yes; then
|
| +do :
|
| + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
| +eval as_val=\$$as_ac_var
|
| + if test "x$as_val" = x""yes; then :
|
| cat >>confdefs.h <<_ACEOF
|
| -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
| _ACEOF
|
|
|
| fi
|
| @@ -8365,23 +5695,26 @@
|
| #
|
| ALL_LINGUAS=""
|
|
|
| - { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
|
| -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
|
| +$as_echo_n "checking whether NLS is requested... " >&6; }
|
| # Check whether --enable-nls was given.
|
| -if test "${enable_nls+set}" = set; then
|
| +if test "${enable_nls+set}" = set; then :
|
| enableval=$enable_nls; USE_NLS=$enableval
|
| else
|
| USE_NLS=yes
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: result: $USE_NLS" >&5
|
| -echo "${ECHO_T}$USE_NLS" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
|
| +$as_echo "$USE_NLS" >&6; }
|
|
|
|
|
|
|
|
|
| + GETTEXT_MACRO_VERSION=0.17
|
|
|
|
|
| +
|
| +
|
| # Prepare PATH_SEPARATOR.
|
| # The user is always right.
|
| if test "${PATH_SEPARATOR+set}" != set; then
|
| @@ -8412,10 +5745,10 @@
|
|
|
| # Extract the first word of "msgfmt", so it can be a program name with args.
|
| set dummy msgfmt; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_MSGFMT+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_path_MSGFMT+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| case "$MSGFMT" in
|
| [\\/]* | ?:[\\/]*)
|
| @@ -8444,19 +5777,19 @@
|
| fi
|
| MSGFMT="$ac_cv_path_MSGFMT"
|
| if test "$MSGFMT" != ":"; then
|
| - { echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
| -echo "${ECHO_T}$MSGFMT" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
|
| +$as_echo "$MSGFMT" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
| # Extract the first word of "gmsgfmt", so it can be a program name with args.
|
| set dummy gmsgfmt; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_GMSGFMT+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_path_GMSGFMT+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| case $GMSGFMT in
|
| [\\/]* | ?:[\\/]*)
|
| @@ -8468,14 +5801,14 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
| @@ -8484,11 +5817,11 @@
|
| fi
|
| GMSGFMT=$ac_cv_path_GMSGFMT
|
| if test -n "$GMSGFMT"; then
|
| - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
|
| -echo "${ECHO_T}$GMSGFMT" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
|
| +$as_echo "$GMSGFMT" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -8535,10 +5868,10 @@
|
|
|
| # Extract the first word of "xgettext", so it can be a program name with args.
|
| set dummy xgettext; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_XGETTEXT+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_path_XGETTEXT+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| case "$XGETTEXT" in
|
| [\\/]* | ?:[\\/]*)
|
| @@ -8567,11 +5900,11 @@
|
| fi
|
| XGETTEXT="$ac_cv_path_XGETTEXT"
|
| if test "$XGETTEXT" != ":"; then
|
| - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
| -echo "${ECHO_T}$XGETTEXT" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
|
| +$as_echo "$XGETTEXT" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
| rm -f messages.po
|
| @@ -8613,10 +5946,10 @@
|
|
|
| # Extract the first word of "msgmerge", so it can be a program name with args.
|
| set dummy msgmerge; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_MSGMERGE+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_path_MSGMERGE+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| case "$MSGMERGE" in
|
| [\\/]* | ?:[\\/]*)
|
| @@ -8644,17 +5977,20 @@
|
| fi
|
| MSGMERGE="$ac_cv_path_MSGMERGE"
|
| if test "$MSGMERGE" != ":"; then
|
| - { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
|
| -echo "${ECHO_T}$MSGMERGE" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
|
| +$as_echo "$MSGMERGE" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| test -n "$localedir" || localedir='${datadir}/locale'
|
|
|
|
|
| + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
|
| +
|
| +
|
| ac_config_commands="$ac_config_commands po-directories"
|
|
|
|
|
| @@ -8676,35 +6012,27 @@
|
|
|
| # Make sure we can run config.sub.
|
| $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
| - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
| -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
|
| -{ echo "$as_me:$LINENO: checking build system type" >&5
|
| -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
| -if test "${ac_cv_build+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
| +$as_echo_n "checking build system type... " >&6; }
|
| +if test "${ac_cv_build+set}" = set; then :
|
| + $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 &&
|
| - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
| -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + 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` ||
|
| - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
| -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
| -echo "${ECHO_T}$ac_cv_build" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
| +$as_echo "$ac_cv_build" >&6; }
|
| case $ac_cv_build in
|
| *-*-*) ;;
|
| -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
| -echo "$as_me: error: invalid value of canonical build" >&2;}
|
| - { (exit 1); exit 1; }; };;
|
| +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
| esac
|
| build=$ac_cv_build
|
| ac_save_IFS=$IFS; IFS='-'
|
| @@ -8720,28 +6048,24 @@
|
| case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
|
|
|
| -{ echo "$as_me:$LINENO: checking host system type" >&5
|
| -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
| -if test "${ac_cv_host+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
| +$as_echo_n "checking host system type... " >&6; }
|
| +if test "${ac_cv_host+set}" = set; then :
|
| + $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` ||
|
| - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
| -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
| fi
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
| -echo "${ECHO_T}$ac_cv_host" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
| +$as_echo "$ac_cv_host" >&6; }
|
| case $ac_cv_host in
|
| *-*-*) ;;
|
| -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
| -echo "$as_me: error: invalid value of canonical host" >&2;}
|
| - { (exit 1); exit 1; }; };;
|
| +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
| esac
|
| host=$ac_cv_host
|
| ac_save_IFS=$IFS; IFS='-'
|
| @@ -8759,7 +6083,7 @@
|
|
|
|
|
| # Check whether --with-gnu-ld was given.
|
| -if test "${with_gnu_ld+set}" = set; then
|
| +if test "${with_gnu_ld+set}" = set; then :
|
| withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
|
| else
|
| with_gnu_ld=no
|
| @@ -8781,8 +6105,8 @@
|
| ac_prog=ld
|
| if test "$GCC" = yes; then
|
| # Check if gcc -print-prog-name=ld gives a path.
|
| - { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
|
| -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
|
| +$as_echo_n "checking for ld used by GCC... " >&6; }
|
| case $host in
|
| *-*-mingw*)
|
| # gcc leaves a trailing carriage return which upsets mingw
|
| @@ -8811,14 +6135,14 @@
|
| ;;
|
| esac
|
| elif test "$with_gnu_ld" = yes; then
|
| - { echo "$as_me:$LINENO: checking for GNU ld" >&5
|
| -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
|
| +$as_echo_n "checking for GNU ld... " >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
|
| -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
|
| +$as_echo_n "checking for non-GNU ld... " >&6; }
|
| fi
|
| -if test "${acl_cv_path_LD+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +if test "${acl_cv_path_LD+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| if test -z "$LD"; then
|
| IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
| @@ -8845,19 +6169,17 @@
|
|
|
| LD="$acl_cv_path_LD"
|
| if test -n "$LD"; then
|
| - { echo "$as_me:$LINENO: result: $LD" >&5
|
| -echo "${ECHO_T}$LD" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
|
| +$as_echo "$LD" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
| -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
|
| -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
|
| -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
|
| -if test "${acl_cv_prog_gnu_ld+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&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 test "${acl_cv_prog_gnu_ld+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| # I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
| case `$LD -v 2>&1 </dev/null` in
|
| @@ -8867,17 +6189,17 @@
|
| acl_cv_prog_gnu_ld=no ;;
|
| esac
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
|
| -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
|
| +$as_echo "$acl_cv_prog_gnu_ld" >&6; }
|
| with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
|
|
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
|
| -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
|
| -if test "${acl_cv_rpath+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
|
| +$as_echo_n "checking for shared library run path origin... " >&6; }
|
| +if test "${acl_cv_rpath+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
| @@ -8887,17 +6209,19 @@
|
| acl_cv_rpath=done
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
|
| -echo "${ECHO_T}$acl_cv_rpath" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
|
| +$as_echo "$acl_cv_rpath" >&6; }
|
| wl="$acl_cv_wl"
|
| - libext="$acl_cv_libext"
|
| - shlibext="$acl_cv_shlibext"
|
| - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
| - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
| - hardcode_direct="$acl_cv_hardcode_direct"
|
| - hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
| + acl_libext="$acl_cv_libext"
|
| + acl_shlibext="$acl_cv_shlibext"
|
| + acl_libname_spec="$acl_cv_libname_spec"
|
| + acl_library_names_spec="$acl_cv_library_names_spec"
|
| + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
| + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
| + acl_hardcode_direct="$acl_cv_hardcode_direct"
|
| + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
| # Check whether --enable-rpath was given.
|
| -if test "${enable_rpath+set}" = set; then
|
| +if test "${enable_rpath+set}" = set; then :
|
| enableval=$enable_rpath; :
|
| else
|
| enable_rpath=yes
|
| @@ -8930,6 +6254,7 @@
|
|
|
|
|
|
|
| +
|
| use_additional=yes
|
|
|
| acl_save_prefix="$prefix"
|
| @@ -8945,7 +6270,7 @@
|
|
|
|
|
| # Check whether --with-libiconv-prefix was given.
|
| -if test "${with_libiconv_prefix+set}" = set; then
|
| +if test "${with_libiconv_prefix+set}" = set; then :
|
| withval=$with_libiconv_prefix;
|
| if test "X$withval" = "Xno"; then
|
| use_additional=no
|
| @@ -8974,6 +6299,7 @@
|
| LIBICONV=
|
| LTLIBICONV=
|
| INCICONV=
|
| + LIBICONV_PREFIX=
|
| rpathdirs=
|
| ltrpathdirs=
|
| names_already_handled=
|
| @@ -9007,27 +6333,50 @@
|
| found_la=
|
| found_so=
|
| found_a=
|
| + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
|
| + if test -n "$acl_shlibext"; then
|
| + shrext=".$acl_shlibext" # typically: shrext=.so
|
| + else
|
| + shrext=
|
| + fi
|
| if test $use_additional = yes; then
|
| - if test -n "$shlibext" \
|
| - && { test -f "$additional_libdir/lib$name.$shlibext" \
|
| - || { test "$shlibext" = dll \
|
| - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
|
| - found_dir="$additional_libdir"
|
| - if test -f "$additional_libdir/lib$name.$shlibext"; then
|
| - found_so="$additional_libdir/lib$name.$shlibext"
|
| + dir="$additional_libdir"
|
| + if test -n "$acl_shlibext"; then
|
| + if test -f "$dir/$libname$shrext"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext"
|
| else
|
| - found_so="$additional_libdir/lib$name.dll.a"
|
| + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
| + ver=`(cd "$dir" && \
|
| + for f in "$libname$shrext".*; do echo "$f"; done \
|
| + | sed -e "s,^$libname$shrext\\\\.,," \
|
| + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
| + | sed 1q ) 2>/dev/null`
|
| + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext.$ver"
|
| + fi
|
| + else
|
| + eval library_names=\"$acl_library_names_spec\"
|
| + for f in $library_names; do
|
| + if test -f "$dir/$f"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$f"
|
| + break
|
| + fi
|
| + done
|
| + fi
|
| fi
|
| - if test -f "$additional_libdir/lib$name.la"; then
|
| - found_la="$additional_libdir/lib$name.la"
|
| + fi
|
| + if test "X$found_dir" = "X"; then
|
| + if test -f "$dir/$libname.$acl_libext"; then
|
| + found_dir="$dir"
|
| + found_a="$dir/$libname.$acl_libext"
|
| fi
|
| - else
|
| - if test -f "$additional_libdir/lib$name.$libext"; then
|
| - found_dir="$additional_libdir"
|
| - found_a="$additional_libdir/lib$name.$libext"
|
| - if test -f "$additional_libdir/lib$name.la"; then
|
| - found_la="$additional_libdir/lib$name.la"
|
| - fi
|
| + fi
|
| + if test "X$found_dir" != "X"; then
|
| + if test -f "$dir/$libname.la"; then
|
| + found_la="$dir/$libname.la"
|
| fi
|
| fi
|
| fi
|
| @@ -9045,28 +6394,44 @@
|
| case "$x" in
|
| -L*)
|
| dir=`echo "X$x" | sed -e 's/^X-L//'`
|
| - if test -n "$shlibext" \
|
| - && { test -f "$dir/lib$name.$shlibext" \
|
| - || { test "$shlibext" = dll \
|
| - && test -f "$dir/lib$name.dll.a"; }; }; then
|
| - found_dir="$dir"
|
| - if test -f "$dir/lib$name.$shlibext"; then
|
| - found_so="$dir/lib$name.$shlibext"
|
| + if test -n "$acl_shlibext"; then
|
| + if test -f "$dir/$libname$shrext"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext"
|
| else
|
| - found_so="$dir/lib$name.dll.a"
|
| + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
| + ver=`(cd "$dir" && \
|
| + for f in "$libname$shrext".*; do echo "$f"; done \
|
| + | sed -e "s,^$libname$shrext\\\\.,," \
|
| + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
| + | sed 1q ) 2>/dev/null`
|
| + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext.$ver"
|
| + fi
|
| + else
|
| + eval library_names=\"$acl_library_names_spec\"
|
| + for f in $library_names; do
|
| + if test -f "$dir/$f"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$f"
|
| + break
|
| + fi
|
| + done
|
| + fi
|
| fi
|
| - if test -f "$dir/lib$name.la"; then
|
| - found_la="$dir/lib$name.la"
|
| - fi
|
| - else
|
| - if test -f "$dir/lib$name.$libext"; then
|
| + fi
|
| + if test "X$found_dir" = "X"; then
|
| + if test -f "$dir/$libname.$acl_libext"; then
|
| found_dir="$dir"
|
| - found_a="$dir/lib$name.$libext"
|
| - if test -f "$dir/lib$name.la"; then
|
| - found_la="$dir/lib$name.la"
|
| - fi
|
| + found_a="$dir/$libname.$acl_libext"
|
| fi
|
| fi
|
| + if test "X$found_dir" != "X"; then
|
| + if test -f "$dir/$libname.la"; then
|
| + found_la="$dir/$libname.la"
|
| + fi
|
| + fi
|
| ;;
|
| esac
|
| if test "X$found_dir" != "X"; then
|
| @@ -9090,10 +6455,10 @@
|
| if test -z "$haveit"; then
|
| ltrpathdirs="$ltrpathdirs $found_dir"
|
| fi
|
| - if test "$hardcode_direct" = yes; then
|
| + if test "$acl_hardcode_direct" = yes; then
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
| else
|
| - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
| + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
| haveit=
|
| for x in $rpathdirs; do
|
| @@ -9125,7 +6490,7 @@
|
| if test -z "$haveit"; then
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
|
| fi
|
| - if test "$hardcode_minus_L" != no; then
|
| + if test "$acl_hardcode_minus_L" != no; then
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
| else
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
|
| @@ -9144,6 +6509,7 @@
|
| case "$found_dir" in
|
| */$acl_libdirstem | */$acl_libdirstem/)
|
| basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
| + LIBICONV_PREFIX="$basedir"
|
| additional_includedir="$basedir/include"
|
| ;;
|
| esac
|
| @@ -9294,21 +6660,21 @@
|
| done
|
| done
|
| if test "X$rpathdirs" != "X"; then
|
| - if test -n "$hardcode_libdir_separator"; then
|
| + if test -n "$acl_hardcode_libdir_separator"; then
|
| alldirs=
|
| for found_dir in $rpathdirs; do
|
| - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
| + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
| done
|
| acl_save_libdir="$libdir"
|
| libdir="$alldirs"
|
| - eval flag=\"$hardcode_libdir_flag_spec\"
|
| + eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
| libdir="$acl_save_libdir"
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
| else
|
| for found_dir in $rpathdirs; do
|
| acl_save_libdir="$libdir"
|
| libdir="$found_dir"
|
| - eval flag=\"$hardcode_libdir_flag_spec\"
|
| + eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
| libdir="$acl_save_libdir"
|
| LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
| done
|
| @@ -9343,139 +6709,11 @@
|
|
|
|
|
|
|
| + gt_INTL_MACOSX
|
|
|
| - { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
|
| -echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
|
| -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - gt_save_LIBS="$LIBS"
|
| - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <CoreFoundation/CFPreferences.h>
|
| -int
|
| -main ()
|
| -{
|
| -CFPreferencesCopyAppValue(NULL, NULL)
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - gt_cv_func_CFPreferencesCopyAppValue=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
| - gt_cv_func_CFPreferencesCopyAppValue=no
|
| -fi
|
|
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| - LIBS="$gt_save_LIBS"
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
|
| -echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
|
| - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
|
| -_ACEOF
|
| -
|
| - fi
|
| - { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
|
| -echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
|
| -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| -else
|
| - gt_save_LIBS="$LIBS"
|
| - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| -/* end confdefs.h. */
|
| -#include <CoreFoundation/CFLocale.h>
|
| -int
|
| -main ()
|
| -{
|
| -CFLocaleCopyCurrent();
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| - gt_cv_func_CFLocaleCopyCurrent=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - gt_cv_func_CFLocaleCopyCurrent=no
|
| -fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| - LIBS="$gt_save_LIBS"
|
| -fi
|
| -{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
|
| -echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
|
| - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
| -
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_CFLOCALECOPYCURRENT 1
|
| -_ACEOF
|
| -
|
| - fi
|
| - INTL_MACOSX_LIBS=
|
| - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
| - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
|
| - fi
|
| -
|
| -
|
| -
|
| -
|
| -
|
| -
|
| LIBINTL=
|
| LTLIBINTL=
|
| POSUB=
|
| @@ -9508,16 +6746,12 @@
|
| gt_expression_test_code=
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
|
| -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
|
| -if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
|
| +$as_echo_n "checking for GNU gettext in libc... " >&6; }
|
| +if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <libintl.h>
|
| $gt_revision_test_code
|
| @@ -9532,38 +6766,17 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| eval "$gt_func_gnugettext_libc=yes"
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$gt_func_gnugettext_libc=no"
|
| + eval "$gt_func_gnugettext_libc=no"
|
| fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| fi
|
| -ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| +eval ac_res=\$$gt_func_gnugettext_libc
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
| +$as_echo "$ac_res" >&6; }
|
|
|
| if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
|
|
|
| @@ -9596,19 +6809,15 @@
|
| done
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for iconv" >&5
|
| -echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
|
| -if test "${am_cv_func_iconv+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
|
| +$as_echo_n "checking for iconv... " >&6; }
|
| +if test "${am_cv_func_iconv+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| am_cv_func_iconv="no, consider installing GNU libiconv"
|
| am_cv_lib_iconv=no
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdlib.h>
|
| #include <iconv.h>
|
| @@ -9622,42 +6831,15 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| am_cv_func_iconv=yes
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| if test "$am_cv_func_iconv" != yes; then
|
| am_save_LIBS="$LIBS"
|
| LIBS="$LIBS $LIBICONV"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdlib.h>
|
| #include <iconv.h>
|
| @@ -9671,53 +6853,126 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| am_cv_lib_iconv=yes
|
| am_cv_func_iconv=yes
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| + LIBS="$am_save_LIBS"
|
| + fi
|
| +
|
| +fi
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
|
| +$as_echo "$am_cv_func_iconv" >&6; }
|
| + if test "$am_cv_func_iconv" = yes; then
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
|
| +$as_echo_n "checking for working iconv... " >&6; }
|
| +if test "${am_cv_func_iconv_works+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
| + am_save_LIBS="$LIBS"
|
| + if test $am_cv_lib_iconv = yes; then
|
| + LIBS="$LIBS $LIBICONV"
|
| + fi
|
| + if test "$cross_compiling" = yes; then :
|
| + case "$host_os" in
|
| + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
| + *) am_cv_func_iconv_works="guessing yes" ;;
|
| + esac
|
| +else
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
|
|
| +#include <iconv.h>
|
| +#include <string.h>
|
| +int main ()
|
| +{
|
| + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
| + returns. */
|
| + {
|
| + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
| + if (cd_utf8_to_88591 != (iconv_t)(-1))
|
| + {
|
| + static const char input[] = "\342\202\254"; /* EURO SIGN */
|
| + char buf[10];
|
| + const char *inptr = input;
|
| + size_t inbytesleft = strlen (input);
|
| + char *outptr = buf;
|
| + size_t outbytesleft = sizeof (buf);
|
| + size_t res = iconv (cd_utf8_to_88591,
|
| + (char **) &inptr, &inbytesleft,
|
| + &outptr, &outbytesleft);
|
| + if (res == 0)
|
| + return 1;
|
| + }
|
| + }
|
| +#if 0 /* This bug could be worked around by the caller. */
|
| + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
|
| + {
|
| + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
| + if (cd_88591_to_utf8 != (iconv_t)(-1))
|
| + {
|
| + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
| + char buf[50];
|
| + const char *inptr = input;
|
| + size_t inbytesleft = strlen (input);
|
| + char *outptr = buf;
|
| + size_t outbytesleft = sizeof (buf);
|
| + size_t res = iconv (cd_88591_to_utf8,
|
| + (char **) &inptr, &inbytesleft,
|
| + &outptr, &outbytesleft);
|
| + if ((int)res > 0)
|
| + return 1;
|
| + }
|
| + }
|
| +#endif
|
| + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
| + provided. */
|
| + if (/* Try standardized names. */
|
| + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
|
| + /* Try IRIX, OSF/1 names. */
|
| + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
|
| + /* Try AIX names. */
|
| + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
| + /* Try HP-UX names. */
|
| + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
| + return 1;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_run "$LINENO"; then :
|
| + am_cv_func_iconv_works=yes
|
| +else
|
| + am_cv_func_iconv_works=no
|
| fi
|
| +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 conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| LIBS="$am_save_LIBS"
|
| - fi
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
|
| -echo "${ECHO_T}$am_cv_func_iconv" >&6; }
|
| - if test "$am_cv_func_iconv" = yes; then
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
|
| +$as_echo "$am_cv_func_iconv_works" >&6; }
|
| + case "$am_cv_func_iconv_works" in
|
| + *no) am_func_iconv=no am_cv_lib_iconv=no ;;
|
| + *) am_func_iconv=yes ;;
|
| + esac
|
| + else
|
| + am_func_iconv=no am_cv_lib_iconv=no
|
| + fi
|
| + if test "$am_func_iconv" = yes; then
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_ICONV 1
|
| -_ACEOF
|
| +$as_echo "#define HAVE_ICONV 1" >>confdefs.h
|
|
|
| fi
|
| if test "$am_cv_lib_iconv" = yes; then
|
| - { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
|
| -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
|
| - { echo "$as_me:$LINENO: result: $LIBICONV" >&5
|
| -echo "${ECHO_T}$LIBICONV" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
|
| +$as_echo_n "checking how to link with libiconv... " >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
|
| +$as_echo "$LIBICONV" >&6; }
|
| else
|
| CPPFLAGS="$am_save_CPPFLAGS"
|
| LIBICONV=
|
| @@ -9730,6 +6985,7 @@
|
|
|
|
|
|
|
| +
|
| use_additional=yes
|
|
|
| acl_save_prefix="$prefix"
|
| @@ -9745,7 +7001,7 @@
|
|
|
|
|
| # Check whether --with-libintl-prefix was given.
|
| -if test "${with_libintl_prefix+set}" = set; then
|
| +if test "${with_libintl_prefix+set}" = set; then :
|
| withval=$with_libintl_prefix;
|
| if test "X$withval" = "Xno"; then
|
| use_additional=no
|
| @@ -9774,6 +7030,7 @@
|
| LIBINTL=
|
| LTLIBINTL=
|
| INCINTL=
|
| + LIBINTL_PREFIX=
|
| rpathdirs=
|
| ltrpathdirs=
|
| names_already_handled=
|
| @@ -9807,27 +7064,50 @@
|
| found_la=
|
| found_so=
|
| found_a=
|
| + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
|
| + if test -n "$acl_shlibext"; then
|
| + shrext=".$acl_shlibext" # typically: shrext=.so
|
| + else
|
| + shrext=
|
| + fi
|
| if test $use_additional = yes; then
|
| - if test -n "$shlibext" \
|
| - && { test -f "$additional_libdir/lib$name.$shlibext" \
|
| - || { test "$shlibext" = dll \
|
| - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
|
| - found_dir="$additional_libdir"
|
| - if test -f "$additional_libdir/lib$name.$shlibext"; then
|
| - found_so="$additional_libdir/lib$name.$shlibext"
|
| + dir="$additional_libdir"
|
| + if test -n "$acl_shlibext"; then
|
| + if test -f "$dir/$libname$shrext"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext"
|
| else
|
| - found_so="$additional_libdir/lib$name.dll.a"
|
| + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
| + ver=`(cd "$dir" && \
|
| + for f in "$libname$shrext".*; do echo "$f"; done \
|
| + | sed -e "s,^$libname$shrext\\\\.,," \
|
| + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
| + | sed 1q ) 2>/dev/null`
|
| + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext.$ver"
|
| + fi
|
| + else
|
| + eval library_names=\"$acl_library_names_spec\"
|
| + for f in $library_names; do
|
| + if test -f "$dir/$f"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$f"
|
| + break
|
| + fi
|
| + done
|
| + fi
|
| fi
|
| - if test -f "$additional_libdir/lib$name.la"; then
|
| - found_la="$additional_libdir/lib$name.la"
|
| + fi
|
| + if test "X$found_dir" = "X"; then
|
| + if test -f "$dir/$libname.$acl_libext"; then
|
| + found_dir="$dir"
|
| + found_a="$dir/$libname.$acl_libext"
|
| fi
|
| - else
|
| - if test -f "$additional_libdir/lib$name.$libext"; then
|
| - found_dir="$additional_libdir"
|
| - found_a="$additional_libdir/lib$name.$libext"
|
| - if test -f "$additional_libdir/lib$name.la"; then
|
| - found_la="$additional_libdir/lib$name.la"
|
| - fi
|
| + fi
|
| + if test "X$found_dir" != "X"; then
|
| + if test -f "$dir/$libname.la"; then
|
| + found_la="$dir/$libname.la"
|
| fi
|
| fi
|
| fi
|
| @@ -9845,28 +7125,44 @@
|
| case "$x" in
|
| -L*)
|
| dir=`echo "X$x" | sed -e 's/^X-L//'`
|
| - if test -n "$shlibext" \
|
| - && { test -f "$dir/lib$name.$shlibext" \
|
| - || { test "$shlibext" = dll \
|
| - && test -f "$dir/lib$name.dll.a"; }; }; then
|
| - found_dir="$dir"
|
| - if test -f "$dir/lib$name.$shlibext"; then
|
| - found_so="$dir/lib$name.$shlibext"
|
| + if test -n "$acl_shlibext"; then
|
| + if test -f "$dir/$libname$shrext"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext"
|
| else
|
| - found_so="$dir/lib$name.dll.a"
|
| + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
| + ver=`(cd "$dir" && \
|
| + for f in "$libname$shrext".*; do echo "$f"; done \
|
| + | sed -e "s,^$libname$shrext\\\\.,," \
|
| + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
| + | sed 1q ) 2>/dev/null`
|
| + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$libname$shrext.$ver"
|
| + fi
|
| + else
|
| + eval library_names=\"$acl_library_names_spec\"
|
| + for f in $library_names; do
|
| + if test -f "$dir/$f"; then
|
| + found_dir="$dir"
|
| + found_so="$dir/$f"
|
| + break
|
| + fi
|
| + done
|
| + fi
|
| fi
|
| - if test -f "$dir/lib$name.la"; then
|
| - found_la="$dir/lib$name.la"
|
| - fi
|
| - else
|
| - if test -f "$dir/lib$name.$libext"; then
|
| + fi
|
| + if test "X$found_dir" = "X"; then
|
| + if test -f "$dir/$libname.$acl_libext"; then
|
| found_dir="$dir"
|
| - found_a="$dir/lib$name.$libext"
|
| - if test -f "$dir/lib$name.la"; then
|
| - found_la="$dir/lib$name.la"
|
| - fi
|
| + found_a="$dir/$libname.$acl_libext"
|
| fi
|
| fi
|
| + if test "X$found_dir" != "X"; then
|
| + if test -f "$dir/$libname.la"; then
|
| + found_la="$dir/$libname.la"
|
| + fi
|
| + fi
|
| ;;
|
| esac
|
| if test "X$found_dir" != "X"; then
|
| @@ -9890,10 +7186,10 @@
|
| if test -z "$haveit"; then
|
| ltrpathdirs="$ltrpathdirs $found_dir"
|
| fi
|
| - if test "$hardcode_direct" = yes; then
|
| + if test "$acl_hardcode_direct" = yes; then
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
| else
|
| - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
| + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
| haveit=
|
| for x in $rpathdirs; do
|
| @@ -9925,7 +7221,7 @@
|
| if test -z "$haveit"; then
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
|
| fi
|
| - if test "$hardcode_minus_L" != no; then
|
| + if test "$acl_hardcode_minus_L" != no; then
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
| else
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
|
| @@ -9944,6 +7240,7 @@
|
| case "$found_dir" in
|
| */$acl_libdirstem | */$acl_libdirstem/)
|
| basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
| + LIBINTL_PREFIX="$basedir"
|
| additional_includedir="$basedir/include"
|
| ;;
|
| esac
|
| @@ -10094,21 +7391,21 @@
|
| done
|
| done
|
| if test "X$rpathdirs" != "X"; then
|
| - if test -n "$hardcode_libdir_separator"; then
|
| + if test -n "$acl_hardcode_libdir_separator"; then
|
| alldirs=
|
| for found_dir in $rpathdirs; do
|
| - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
| + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
| done
|
| acl_save_libdir="$libdir"
|
| libdir="$alldirs"
|
| - eval flag=\"$hardcode_libdir_flag_spec\"
|
| + eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
| libdir="$acl_save_libdir"
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
|
| else
|
| for found_dir in $rpathdirs; do
|
| acl_save_libdir="$libdir"
|
| libdir="$found_dir"
|
| - eval flag=\"$hardcode_libdir_flag_spec\"
|
| + eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
| libdir="$acl_save_libdir"
|
| LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
|
| done
|
| @@ -10120,20 +7417,16 @@
|
| done
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
|
| -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
|
| -if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
|
| +$as_echo_n "checking for GNU gettext in libintl... " >&6; }
|
| +if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| gt_save_CPPFLAGS="$CPPFLAGS"
|
| CPPFLAGS="$CPPFLAGS $INCINTL"
|
| gt_save_LIBS="$LIBS"
|
| LIBS="$LIBS $LIBINTL"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <libintl.h>
|
| $gt_revision_test_code
|
| @@ -10152,41 +7445,16 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| eval "$gt_func_gnugettext_libintl=yes"
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - eval "$gt_func_gnugettext_libintl=no"
|
| + eval "$gt_func_gnugettext_libintl=no"
|
| fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
|
| LIBS="$LIBS $LIBICONV"
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <libintl.h>
|
| $gt_revision_test_code
|
| @@ -10205,44 +7473,21 @@
|
| return 0;
|
| }
|
| _ACEOF
|
| -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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_link") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } && {
|
| - test -z "$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - } && test -s conftest$ac_exeext &&
|
| - $as_test_x conftest$ac_exeext; then
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| LIBINTL="$LIBINTL $LIBICONV"
|
| LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
| eval "$gt_func_gnugettext_libintl=yes"
|
|
|
| -else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| -
|
| fi
|
| -
|
| -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| - conftest$ac_exeext conftest.$ac_ext
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| fi
|
| CPPFLAGS="$gt_save_CPPFLAGS"
|
| LIBS="$gt_save_LIBS"
|
| fi
|
| -ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
|
| - { echo "$as_me:$LINENO: result: $ac_res" >&5
|
| -echo "${ECHO_T}$ac_res" >&6; }
|
| +eval ac_res=\$$gt_func_gnugettext_libintl
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
| +$as_echo "$ac_res" >&6; }
|
| fi
|
|
|
| if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|
| @@ -10269,22 +7514,20 @@
|
| if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
| || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define ENABLE_NLS 1
|
| -_ACEOF
|
| +$as_echo "#define ENABLE_NLS 1" >>confdefs.h
|
|
|
| else
|
| USE_NLS=no
|
| fi
|
| fi
|
|
|
| - { echo "$as_me:$LINENO: checking whether to use NLS" >&5
|
| -echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
|
| - { echo "$as_me:$LINENO: result: $USE_NLS" >&5
|
| -echo "${ECHO_T}$USE_NLS" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
|
| +$as_echo_n "checking whether to use NLS... " >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
|
| +$as_echo "$USE_NLS" >&6; }
|
| if test "$USE_NLS" = "yes"; then
|
| - { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
|
| -echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
|
| +$as_echo_n "checking where the gettext function comes from... " >&6; }
|
| if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
| if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
|
| gt_source="external libintl"
|
| @@ -10294,18 +7537,18 @@
|
| else
|
| gt_source="included intl directory"
|
| fi
|
| - { echo "$as_me:$LINENO: result: $gt_source" >&5
|
| -echo "${ECHO_T}$gt_source" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
|
| +$as_echo "$gt_source" >&6; }
|
| fi
|
|
|
| if test "$USE_NLS" = "yes"; then
|
|
|
| if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
| if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
|
| - { echo "$as_me:$LINENO: checking how to link with libintl" >&5
|
| -echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
|
| - { echo "$as_me:$LINENO: result: $LIBINTL" >&5
|
| -echo "${ECHO_T}$LIBINTL" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
|
| +$as_echo_n "checking how to link with libintl... " >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
|
| +$as_echo "$LIBINTL" >&6; }
|
|
|
| for element in $INCINTL; do
|
| haveit=
|
| @@ -10332,14 +7575,10 @@
|
| fi
|
|
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_GETTEXT 1
|
| -_ACEOF
|
| +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
|
|
|
|
|
| -cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_DCGETTEXT 1
|
| -_ACEOF
|
| +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
|
|
|
| fi
|
|
|
| @@ -10362,24 +7601,14 @@
|
|
|
|
|
|
|
| -
|
| -
|
| -
|
| -
|
| -
|
| # Check for GNU C Library
|
|
|
| -
|
| -{ echo "$as_me:$LINENO: checking for GNU C Library" >&5
|
| -echo $ECHO_N "checking for GNU C Library... $ECHO_C" >&6; }
|
| -if test "${yasm_cv_header_gnulib+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU C Library" >&5
|
| +$as_echo_n "checking for GNU C Library... " >&6; }
|
| +if test "${yasm_cv_header_gnulib+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <features.h>
|
| #ifdef __GNU_LIBRARY__
|
| @@ -10388,7 +7617,7 @@
|
|
|
| _ACEOF
|
| if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
| - $EGREP "gnulib" >/dev/null 2>&1; then
|
| + $EGREP "gnulib" >/dev/null 2>&1; then :
|
| yasm_cv_header_gnulib=yes
|
| else
|
| yasm_cv_header_gnulib=no
|
| @@ -10396,12 +7625,10 @@
|
| rm -f conftest*
|
|
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $yasm_cv_header_gnulib" >&5
|
| -echo "${ECHO_T}$yasm_cv_header_gnulib" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $yasm_cv_header_gnulib" >&5
|
| +$as_echo "$yasm_cv_header_gnulib" >&6; }
|
| if test "$yasm_cv_header_gnulib" = yes; then
|
| - cat >>confdefs.h <<\_ACEOF
|
| -#define HAVE_GNU_C_LIBRARY 1
|
| -_ACEOF
|
| + $as_echo "#define HAVE_GNU_C_LIBRARY 1" >>confdefs.h
|
|
|
| fi
|
|
|
| @@ -10484,37 +7711,36 @@
|
| fi
|
|
|
|
|
| -#
|
| -# Cross-building
|
| -#
|
| -if test "$cross_compiling" = "yes"; then
|
| - { echo "$as_me:$LINENO: checking cc for build" >&5
|
| -echo $ECHO_N "checking cc for build... $ECHO_C" >&6; }
|
| - CC_FOR_BUILD="${CC_FOR_BUILD-PATH=/usr/bin:$PATH cc}"
|
| - { echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
|
| -echo "${ECHO_T}$CC_FOR_BUILD" >&6; }
|
| - CCLD_FOR_BUILD="$CC_FOR_BUILD"
|
| +
|
| +
|
| +if test "${build}" != "${host}" ; then
|
| + CC_FOR_BUILD=${CC_FOR_BUILD-cc}
|
| + CCLD_FOR_BUILD=${CCLD_FOR_BUILD-cc}
|
| else
|
| - CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
|
| - CCLD_FOR_BUILD="${CCLD_FOR_BUILD-$CC}"
|
| + CC_FOR_BUILD="\$(CC)"
|
| + CCLD_FOR_BUILD="\$(CC)"
|
| fi
|
|
|
|
|
|
|
|
|
| +if test "$build" != "$target" || test "$build" != "$host"; then
|
| + CPP_PROG="${CPP_FOR_HOST-cc -E}"
|
| +else
|
| + CPP_PROG="${CPP}"
|
| +fi
|
|
|
| +cat >>confdefs.h <<_ACEOF
|
| +#define CPP_PROG "${CPP_PROG}"
|
| +_ACEOF
|
|
|
| -# libtool erroneously calls CC_FOR_BUILD HOST_CC;
|
| -# --host is the platform that the package is compiled for.
|
| -HOST_CC="$CC_FOR_BUILD"
|
|
|
| -
|
| # Detect if we have Python
|
| if test x$enable_python = xno; then
|
| have_python=no
|
| else
|
| - { echo "$as_me:$LINENO: Checking for Python" >&5
|
| -echo "$as_me: Checking for Python" >&6;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for Python" >&5
|
| +$as_echo "$as_me: Checking for Python" >&6;}
|
| have_python=no
|
|
|
|
|
| @@ -10522,69 +7748,69 @@
|
|
|
| if test -n "$PYTHON"; then
|
| # If the user set $PYTHON, use it and don't search something else.
|
| - { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
|
| -echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
|
| - prog="import sys, string
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5
|
| +$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
|
| + prog="import sys
|
| # split strings by '.' and convert to numeric. Append some zeros
|
| # because we need at least 4 digits for the hex conversion.
|
| -minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
|
| +# map returns an iterator in Python 3.0 and a list in 2.x
|
| +minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
|
| minverhex = 0
|
| -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
|
| +# xrange is not present in Python 3.0 and range returns an iterator
|
| +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
| sys.exit(sys.hexversion < minverhex)"
|
| if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
|
| ($PYTHON -c "$prog") >&5 2>&5
|
| ac_status=$?
|
| echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| + (exit $ac_status); }; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| else
|
| - { { echo "$as_me:$LINENO: error: too old" >&5
|
| -echo "$as_me: error: too old" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "too old" "$LINENO" 5
|
| fi
|
| -
|
| am_display_PYTHON=$PYTHON
|
| else
|
| # Otherwise, try each interpreter until we find one that satisfies
|
| # VERSION.
|
| - { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
|
| -echo $ECHO_N "checking for a Python interpreter with version >= 2.4... $ECHO_C" >&6; }
|
| -if test "${am_cv_pathless_PYTHON+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.4" >&5
|
| +$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
|
| +if test "${am_cv_pathless_PYTHON+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
|
|
| - for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
|
| + for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
|
| test "$am_cv_pathless_PYTHON" = none && break
|
| - prog="import sys, string
|
| + prog="import sys
|
| # split strings by '.' and convert to numeric. Append some zeros
|
| # because we need at least 4 digits for the hex conversion.
|
| -minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
|
| +# map returns an iterator in Python 3.0 and a list in 2.x
|
| +minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
|
| minverhex = 0
|
| -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
|
| +# xrange is not present in Python 3.0 and range returns an iterator
|
| +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
| sys.exit(sys.hexversion < minverhex)"
|
| if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
|
| ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
|
| ac_status=$?
|
| echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| + (exit $ac_status); }; then :
|
| break
|
| fi
|
| -
|
| done
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
|
| -echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
|
| +$as_echo "$am_cv_pathless_PYTHON" >&6; }
|
| # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
|
| if test "$am_cv_pathless_PYTHON" = none; then
|
| PYTHON=:
|
| else
|
| # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
|
| set dummy $am_cv_pathless_PYTHON; ac_word=$2
|
| -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| -if test "${ac_cv_path_PYTHON+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| +$as_echo_n "checking for $ac_word... " >&6; }
|
| +if test "${ac_cv_path_PYTHON+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| case $PYTHON in
|
| [\\/]* | ?:[\\/]*)
|
| @@ -10596,14 +7822,14 @@
|
| do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| - for ac_exec_ext in '' $ac_executable_extensions; do
|
| + 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_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| fi
|
| done
|
| -done
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| ;;
|
| @@ -10611,11 +7837,11 @@
|
| fi
|
| PYTHON=$ac_cv_path_PYTHON
|
| if test -n "$PYTHON"; then
|
| - { echo "$as_me:$LINENO: result: $PYTHON" >&5
|
| -echo "${ECHO_T}$PYTHON" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
|
| +$as_echo "$PYTHON" >&6; }
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| fi
|
|
|
|
|
| @@ -10625,20 +7851,20 @@
|
|
|
|
|
| if test "$PYTHON" = :; then
|
| - { echo "$as_me:$LINENO: WARNING: Python not found" >&5
|
| -echo "$as_me: WARNING: Python not found" >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python not found" >&5
|
| +$as_echo "$as_me: WARNING: Python not found" >&2;}
|
| else
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
|
| -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
|
| -if test "${am_cv_python_version+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
|
| +$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
|
| +if test "${am_cv_python_version+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
|
| + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
|
| -echo "${ECHO_T}$am_cv_python_version" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
| +$as_echo "$am_cv_python_version" >&6; }
|
| PYTHON_VERSION=$am_cv_python_version
|
|
|
|
|
| @@ -10649,30 +7875,51 @@
|
|
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
|
| -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
|
| -if test "${am_cv_python_platform+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
|
| +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
|
| +if test "${am_cv_python_platform+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
|
| + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
|
| -echo "${ECHO_T}$am_cv_python_platform" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
|
| +$as_echo "$am_cv_python_platform" >&6; }
|
| PYTHON_PLATFORM=$am_cv_python_platform
|
|
|
|
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
|
| -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
|
| -if test "${am_cv_python_pythondir+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
|
| +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
|
| +if test "${am_cv_python_pythondir+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
|
| + if test "x$prefix" = xNONE
|
| + then
|
| + am_py_prefix=$ac_default_prefix
|
| + else
|
| + am_py_prefix=$prefix
|
| + fi
|
| + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
|
| echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
|
| + case $am_cv_python_pythondir in
|
| + $am_py_prefix*)
|
| + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
| + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
|
| + ;;
|
| + *)
|
| + case $am_py_prefix in
|
| + /usr|/System*) ;;
|
| + *)
|
| + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
| + ;;
|
| + esac
|
| + ;;
|
| + esac
|
| +
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
|
| -echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
|
| +$as_echo "$am_cv_python_pythondir" >&6; }
|
| pythondir=$am_cv_python_pythondir
|
|
|
|
|
| @@ -10680,16 +7927,37 @@
|
| pkgpythondir=\${pythondir}/$PACKAGE
|
|
|
|
|
| - { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
|
| -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
|
| -if test "${am_cv_python_pyexecdir+set}" = set; then
|
| - echo $ECHO_N "(cached) $ECHO_C" >&6
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
|
| +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
|
| +if test "${am_cv_python_pyexecdir+set}" = set; then :
|
| + $as_echo_n "(cached) " >&6
|
| else
|
| - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
|
| - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
|
| + if test "x$exec_prefix" = xNONE
|
| + then
|
| + am_py_exec_prefix=$am_py_prefix
|
| + else
|
| + am_py_exec_prefix=$exec_prefix
|
| + fi
|
| + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
|
| + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
|
| + case $am_cv_python_pyexecdir in
|
| + $am_py_exec_prefix*)
|
| + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
| + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
|
| + ;;
|
| + *)
|
| + case $am_py_exec_prefix in
|
| + /usr|/System*) ;;
|
| + *)
|
| + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
| + ;;
|
| + esac
|
| + ;;
|
| + esac
|
| +
|
| fi
|
| -{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
|
| -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
|
| +$as_echo "$am_cv_python_pyexecdir" >&6; }
|
| pyexecdir=$am_cv_python_pyexecdir
|
|
|
|
|
| @@ -10710,56 +7978,53 @@
|
|
|
| if test x$have_python = xno ; then
|
| if test x$enable_python = xyes ; then
|
| - { { echo "$as_me:$LINENO: error: Python explicitly requested, but a suitable Python version was not found" >&5
|
| -echo "$as_me: error: Python explicitly requested, but a suitable Python version was not found" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5
|
| else
|
| - { echo "$as_me:$LINENO: WARNING: Could not find a suitable version of Python" >&5
|
| -echo "$as_me: WARNING: Could not find a suitable version of Python" >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable version of Python" >&5
|
| +$as_echo "$as_me: WARNING: Could not find a suitable version of Python" >&2;}
|
| fi
|
| fi
|
| fi
|
|
|
| # Detect if we can build Python bindings
|
| -# (needs Python, Python headers, and Pyrex)
|
| +# (needs Python, Python headers, and Cython)
|
| if test x$enable_python_bindings = xno; then
|
| have_python_bindings=no
|
| else
|
| - { echo "$as_me:$LINENO: Checking to see if we can build Python bindings" >&5
|
| -echo "$as_me: Checking to see if we can build Python bindings" >&6;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: Checking to see if we can build Python bindings" >&5
|
| +$as_echo "$as_me: Checking to see if we can build Python bindings" >&6;}
|
| have_python_bindings=no
|
| if test x$have_python = xyes; then
|
| - { echo "$as_me:$LINENO: checking for Pyrex >= 0.9.5.1" >&5
|
| -echo $ECHO_N "checking for Pyrex >= 0.9.5.1... $ECHO_C" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cython >= 0.11.3" >&5
|
| +$as_echo_n "checking for Cython >= 0.11.3... " >&6; }
|
| prog="import sys
|
| -from Pyrex.Compiler.Version import version
|
| +from Cython.Compiler.Version import version
|
| # split strings by '.' and convert to numeric. Append some zeros
|
| # because we need at least 4 digits for the hex conversion.
|
| -pyrexver = map(int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0]
|
| -pyrexverhex = 0
|
| -for i in xrange(0, 4): pyrexverhex = (pyrexverhex << 8) + pyrexver[i]
|
| -minver = map(int, '0.9.5.1'.split('.')) + [0, 0, 0]
|
| +ver = map(int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0]
|
| +verhex = 0
|
| +for i in xrange(0, 4): verhex = (verhex << 8) + ver[i]
|
| +minver = map(int, '0.11.3'.split('.')) + [0, 0, 0]
|
| minverhex = 0
|
| for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
|
| -sys.exit(pyrexverhex < minverhex)"
|
| +sys.exit(verhex < minverhex)"
|
| if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
|
| ($PYTHON -c "$prog") >&5 2>&5
|
| ac_status=$?
|
| echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); }; then
|
| - { echo "$as_me:$LINENO: result: yes" >&5
|
| -echo "${ECHO_T}yes" >&6; }
|
| - have_pyrex=yes
|
| + (exit $ac_status); }; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| + have_cython=yes
|
| else
|
| - { echo "$as_me:$LINENO: result: no" >&5
|
| -echo "${ECHO_T}no" >&6; }
|
| - have_pyrex=no
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| + have_cython=no
|
| fi
|
|
|
|
|
| -
|
| -{ echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
|
| -echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
|
| +$as_echo_n "checking for headers required to compile python extensions... " >&6; }
|
| py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
|
| py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
| PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
|
| @@ -10769,59 +8034,34 @@
|
|
|
| save_CPPFLAGS="$CPPFLAGS"
|
| CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
|
| -cat >conftest.$ac_ext <<_ACEOF
|
| -/* confdefs.h. */
|
| -_ACEOF
|
| -cat confdefs.h >>conftest.$ac_ext
|
| -cat >>conftest.$ac_ext <<_ACEOF
|
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <Python.h>
|
| _ACEOF
|
| -if { (ac_try="$ac_cpp conftest.$ac_ext"
|
| -case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
| - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
| - ac_status=$?
|
| - grep -v '^ *+' conftest.er1 >conftest.err
|
| - rm -f conftest.er1
|
| - cat conftest.err >&5
|
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| - (exit $ac_status); } >/dev/null && {
|
| - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
| - test ! -s conftest.err
|
| - }; then
|
| - { echo "$as_me:$LINENO: result: found" >&5
|
| -echo "${ECHO_T}found" >&6; }
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
|
| +$as_echo "found" >&6; }
|
| have_python_headers=yes
|
| else
|
| - echo "$as_me: failed program was:" >&5
|
| -sed 's/^/| /' conftest.$ac_ext >&5
|
| -
|
| - { echo "$as_me:$LINENO: result: not found" >&5
|
| -echo "${ECHO_T}not found" >&6; }
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
|
| +$as_echo "not found" >&6; }
|
| have_python_headers=no
|
| fi
|
| -
|
| rm -f conftest.err conftest.$ac_ext
|
| CPPFLAGS="$save_CPPFLAGS"
|
|
|
|
|
| - if test x$have_pyrex = xyes -a x$have_python_headers = xyes ; then
|
| + if test x$have_cython = xyes -a x$have_python_headers = xyes ; then
|
| have_python_bindings=yes
|
| fi
|
| fi
|
|
|
| if test x$have_python_bindings = xno ; then
|
| if test x$enable_python_bindings = xyes ; then
|
| - { { echo "$as_me:$LINENO: error: Building Python bindings explicitly requested, but can't build Python bindings because either Pyrex, Python headers or a suitable Python version was not found" >&5
|
| -echo "$as_me: error: Building Python bindings explicitly requested, but can't build Python bindings because either Pyrex, Python headers or a suitable Python version was not found" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "Building Python bindings explicitly requested, but can't build Python bindings because either Cython, Python headers or a suitable Python version was not found" "$LINENO" 5
|
| else
|
| - { echo "$as_me:$LINENO: WARNING: Couldn't find either Pyrex, the Python headers or a suitable version of Python, not building Python bindings" >&5
|
| -echo "$as_me: WARNING: Couldn't find either Pyrex, the Python headers or a suitable version of Python, not building Python bindings" >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&5
|
| +$as_echo "$as_me: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&2;}
|
| fi
|
| fi
|
| fi
|
| @@ -10872,12 +8112,13 @@
|
| case $ac_val in #(
|
| *${as_nl}*)
|
| case $ac_var in #(
|
| - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
| -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
| + *_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) ;; #(
|
| - *) $as_unset $ac_var ;;
|
| + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
| + *) { eval $ac_var=; unset $ac_var;} ;;
|
| esac ;;
|
| esac
|
| done
|
| @@ -10885,8 +8126,8 @@
|
| (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 \).
|
| + # `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"
|
| @@ -10909,12 +8150,12 @@
|
| if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
| if test -w "$cache_file"; then
|
| test "x$cache_file" != "x/dev/null" &&
|
| - { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
| -echo "$as_me: updating cache $cache_file" >&6;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
| +$as_echo "$as_me: updating cache $cache_file" >&6;}
|
| cat confcache >$cache_file
|
| else
|
| - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
| -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
| + { $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
|
| fi
|
| rm -f confcache
|
| @@ -10930,66 +8171,58 @@
|
| 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=`echo "$ac_i" | sed "$ac_script"`
|
| + 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.
|
| - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
| - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
| + 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
|
|
|
| LTLIBOBJS=$ac_ltlibobjs
|
|
|
|
|
| + if test -n "$EXEEXT"; then
|
| + am__EXEEXT_TRUE=
|
| + am__EXEEXT_FALSE='#'
|
| +else
|
| + am__EXEEXT_TRUE='#'
|
| + am__EXEEXT_FALSE=
|
| +fi
|
| +
|
| if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"AMDEP\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"AMDEP\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| if test -z "${BUILD_MAN_TRUE}" && test -z "${BUILD_MAN_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"BUILD_MAN\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"BUILD_MAN\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"BUILD_MAN\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| if test -z "${HAVE_PYTHON_BINDINGS_TRUE}" && test -z "${HAVE_PYTHON_BINDINGS_FALSE}"; then
|
| - { { echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON_BINDINGS\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&5
|
| -echo "$as_me: error: conditional \"HAVE_PYTHON_BINDINGS\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + as_fn_error "conditional \"HAVE_PYTHON_BINDINGS\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
|
|
| : ${CONFIG_STATUS=./config.status}
|
| +ac_write_fail=0
|
| ac_clean_files_save=$ac_clean_files
|
| ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
| -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
| -echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
| -cat >$CONFIG_STATUS <<_ACEOF
|
| +{ $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.
|
| @@ -10999,59 +8232,79 @@
|
| debug=false
|
| ac_cs_recheck=false
|
| ac_cs_silent=false
|
| +
|
| SHELL=\${CONFIG_SHELL-$SHELL}
|
| -_ACEOF
|
| +export SHELL
|
| +_ASEOF
|
| +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
| +## -------------------- ##
|
| +## M4sh Initialization. ##
|
| +## -------------------- ##
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| -## --------------------- ##
|
| -## 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
|
| +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
|
| + # 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 ;;
|
| + case `(set -o) 2>/dev/null` in #(
|
| + *posix*) :
|
| + set -o posix ;; #(
|
| + *) :
|
| + ;;
|
| esac
|
| -
|
| fi
|
|
|
|
|
| -
|
| -
|
| -# PATH needs CR
|
| -# 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
|
| -
|
| -# The user is always right.
|
| -if test "${PATH_SEPARATOR+set}" != set; then
|
| - echo "#! /bin/sh" >conf$$.sh
|
| - echo "exit 0" >>conf$$.sh
|
| - chmod +x conf$$.sh
|
| - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
| - PATH_SEPARATOR=';'
|
| +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
|
| - PATH_SEPARATOR=:
|
| + 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
|
| - rm -f conf$$.sh
|
| + export as_echo_body
|
| + as_echo='sh -c $as_echo_body as_echo'
|
| fi
|
|
|
| -# Support unset when possible.
|
| -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| - as_unset=unset
|
| -else
|
| - as_unset=false
|
| +# 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
|
|
|
|
|
| @@ -11060,20 +8313,18 @@
|
| # 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.)
|
| -as_nl='
|
| -'
|
| IFS=" "" $as_nl"
|
|
|
| # Find who we are. Look in the path if we contain no directory separator.
|
| -case $0 in
|
| +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
|
| + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| + done
|
| IFS=$as_save_IFS
|
|
|
| ;;
|
| @@ -11084,32 +8335,111 @@
|
| as_myself=$0
|
| fi
|
| if test ! -f "$as_myself"; then
|
| - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| - { (exit 1); exit 1; }
|
| + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| + exit 1
|
| fi
|
|
|
| -# Work around bugs in pre-3.0 UWIN ksh.
|
| -for as_var in ENV MAIL MAILPATH
|
| -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| +# 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.
|
| -for as_var in \
|
| - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
| - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
| - LC_TELEPHONE LC_TIME
|
| -do
|
| - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
| - eval $as_var=C; export $as_var
|
| - else
|
| - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| +LC_ALL=C
|
| +export LC_ALL
|
| +LANGUAGE=C
|
| +export LANGUAGE
|
| +
|
| +# CDPATH.
|
| +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
| +
|
| +
|
| +# as_fn_error ERROR [LINENO LOG_FD]
|
| +# ---------------------------------
|
| +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
| +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
| +# script with status $?, using 1 if that was 0.
|
| +as_fn_error ()
|
| +{
|
| + as_status=$?; test $as_status -eq 0 && as_status=1
|
| + if test "$3"; then
|
| + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
| + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
| fi
|
| -done
|
| + $as_echo "$as_me: error: $1" >&2
|
| + as_fn_exit $as_status
|
| +} # as_fn_error
|
|
|
| -# Required to use basename.
|
| +
|
| +# 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_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
|
| +
|
| +# 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
|
| +
|
| +
|
| if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| as_expr=expr
|
| @@ -11123,13 +8453,17 @@
|
| 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
|
|
|
| -# Name of the executable.
|
| as_me=`$as_basename -- "$0" ||
|
| $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
| X"$0" : 'X\(//\)$' \| \
|
| X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X/"$0" |
|
| +$as_echo X/"$0" |
|
| sed '/^.*\/\([^/][^/]*\)\/*$/{
|
| s//\1/
|
| q
|
| @@ -11144,104 +8478,103 @@
|
| }
|
| s/.*/./; q'`
|
|
|
| -# CDPATH.
|
| -$as_unset CDPATH
|
| +# 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_2=$LINENO
|
| - test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
| -
|
| - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
| - # uniformly replaced by the line number. The first 'sed' inserts a
|
| - # line-number line after each line using $LINENO; the second 'sed'
|
| - # does the real work. The second script uses 'N' to pair each
|
| - # line-number line with the line containing $LINENO, and appends
|
| - # trailing '-' during substitution so that $LINENO is not a special
|
| - # case at line end.
|
| - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
| - # scripts with optimization help from Paolo Bonzini. 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" ||
|
| - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
| - { (exit 1); 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
|
| -}
|
| -
|
| -
|
| -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| - as_dirname=dirname
|
| -else
|
| - as_dirname=false
|
| -fi
|
| -
|
| ECHO_C= ECHO_N= ECHO_T=
|
| -case `echo -n x` in
|
| +case `echo -n x` in #(((((
|
| -n*)
|
| - case `echo 'x\c'` in
|
| + case `echo 'xy\c'` in
|
| *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
| - *) ECHO_C='\c';;
|
| + xy) ECHO_C='\c';;
|
| + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
| + ECHO_T=' ';;
|
| esac;;
|
| *)
|
| ECHO_N='-n';;
|
| esac
|
|
|
| -if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| - test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| - as_expr=expr
|
| -else
|
| - as_expr=false
|
| -fi
|
| -
|
| 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
|
| + mkdir conf$$.dir 2>/dev/null
|
| fi
|
| -echo >conf$$.file
|
| -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 ||
|
| +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'
|
| -elif ln conf$$.file conf$$ 2>/dev/null; then
|
| - as_ln_s=ln
|
| + 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
|
|
|
| +
|
| +# 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
|
| if mkdir -p . 2>/dev/null; then
|
| - as_mkdir_p=:
|
| + as_mkdir_p='mkdir -p "$as_dir"'
|
| else
|
| test -d ./-p && rmdir ./-p
|
| as_mkdir_p=false
|
| @@ -11258,12 +8591,12 @@
|
| as_test_x='
|
| eval sh -c '\''
|
| if test -d "$1"; then
|
| - test -d "$1/.";
|
| + test -d "$1/.";
|
| else
|
| - case $1 in
|
| - -*)set "./$1";;
|
| + case $1 in #(
|
| + -*)set "./$1";;
|
| esac;
|
| - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
| + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| ???[sx]*):;;*)false;;esac;fi
|
| '\'' sh
|
| '
|
| @@ -11278,13 +8611,19 @@
|
|
|
|
|
| exec 6>&1
|
| +## ----------------------------------- ##
|
| +## Main body of $CONFIG_STATUS script. ##
|
| +## ----------------------------------- ##
|
| +_ASEOF
|
| +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
|
|
| -# Save the log message, to keep $[0] and so on meaningful, and to
|
| +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 yasm $as_me 0.8.0, which was
|
| -generated by GNU Autoconf 2.61. Invocation command line was
|
| +This file was extended by yasm $as_me 1.1.0, which was
|
| +generated by GNU Autoconf 2.65. Invocation command line was
|
|
|
| CONFIG_FILES = $CONFIG_FILES
|
| CONFIG_HEADERS = $CONFIG_HEADERS
|
| @@ -11297,30 +8636,42 @@
|
|
|
| _ACEOF
|
|
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| +case $ac_config_files in *"
|
| +"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
| +esac
|
| +
|
| +case $ac_config_headers in *"
|
| +"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
|
| +esac
|
| +
|
| +
|
| +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"
|
| +config_files="`echo $ac_config_files`"
|
| +config_headers="`echo $ac_config_headers`"
|
| +config_commands="`echo $ac_config_commands`"
|
|
|
| _ACEOF
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
| ac_cs_usage="\
|
| -\`$as_me' instantiates files from templates according to the
|
| -current configuration.
|
| +\`$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 [OPTIONS] [FILE]...
|
| +Usage: $0 [OPTION]... [TAG]...
|
|
|
| -h, --help print this help, then exit
|
| -V, --version print version number and configuration settings, then exit
|
| - -q, --quiet do not print progress messages
|
| + --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
|
| + --file=FILE[:TEMPLATE]
|
| + instantiate the configuration file FILE
|
| + --header=FILE[:TEMPLATE]
|
| + instantiate the configuration header FILE
|
|
|
| Configuration files:
|
| $config_files
|
| @@ -11331,16 +8682,17 @@
|
| Configuration commands:
|
| $config_commands
|
|
|
| -Report bugs to <bug-autoconf@gnu.org>."
|
| +Report bugs to <bug-yasm@tortall.net>."
|
|
|
| _ACEOF
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
| ac_cs_version="\\
|
| -yasm config.status 0.8.0
|
| -configured by $0, generated by GNU Autoconf 2.61,
|
| - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
| +yasm config.status 1.1.0
|
| +configured by $0, generated by GNU Autoconf 2.65,
|
| + with options \\"\$ac_cs_config\\"
|
|
|
| -Copyright (C) 2006 Free Software Foundation, Inc.
|
| +Copyright (C) 2009 Free Software Foundation, Inc.
|
| This config.status script is free software; the Free Software Foundation
|
| gives unlimited permission to copy, distribute and modify it."
|
|
|
| @@ -11348,11 +8700,12 @@
|
| srcdir='$srcdir'
|
| INSTALL='$INSTALL'
|
| MKDIR_P='$MKDIR_P'
|
| +AWK='$AWK'
|
| +test -n "\$AWK" || AWK=awk
|
| _ACEOF
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| -# If no file are specified by the user, then we need to provide default
|
| -# value. By we need to know if files were specified by the user.
|
| +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
|
| @@ -11374,34 +8727,40 @@
|
| -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
| ac_cs_recheck=: ;;
|
| --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
| - echo "$ac_cs_version"; exit ;;
|
| + $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
|
| - CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
| + case $ac_optarg in
|
| + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| + esac
|
| + as_fn_append CONFIG_FILES " '$ac_optarg'"
|
| ac_need_defaults=false;;
|
| --header | --heade | --head | --hea )
|
| $ac_shift
|
| - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
| + 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
|
| - { echo "$as_me: error: ambiguous option: $1
|
| -Try \`$0 --help' for more information." >&2
|
| - { (exit 1); exit 1; }; };;
|
| + as_fn_error "ambiguous option: \`$1'
|
| +Try \`$0 --help' for more information.";;
|
| --help | --hel | -h )
|
| - echo "$ac_cs_usage"; exit ;;
|
| + $as_echo "$ac_cs_usage"; exit ;;
|
| -q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
| | -silent | --silent | --silen | --sile | --sil | --si | --s)
|
| ac_cs_silent=: ;;
|
|
|
| # This is an error.
|
| - -*) { echo "$as_me: error: unrecognized option: $1
|
| -Try \`$0 --help' for more information." >&2
|
| - { (exit 1); exit 1; }; } ;;
|
| + -*) as_fn_error "unrecognized option: \`$1'
|
| +Try \`$0 --help' for more information." ;;
|
|
|
| - *) ac_config_targets="$ac_config_targets $1"
|
| + *) as_fn_append ac_config_targets " $1"
|
| ac_need_defaults=false ;;
|
|
|
| esac
|
| @@ -11416,27 +8775,29 @@
|
| fi
|
|
|
| _ACEOF
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| if \$ac_cs_recheck; then
|
| - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
| - CONFIG_SHELL=$SHELL
|
| + 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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
| + exec "\$@"
|
| fi
|
|
|
| _ACEOF
|
| -cat >>$CONFIG_STATUS <<\_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
|
| - echo "$ac_log"
|
| + $as_echo "$ac_log"
|
| } >&5
|
|
|
| _ACEOF
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| #
|
| # INIT-COMMANDS
|
| #
|
| @@ -11445,7 +8806,7 @@
|
| PACKAGE="$PACKAGE"
|
| VERSION="$VERSION"
|
| ac_stdint_h="$ac_stdint_h"
|
| -_ac_stdint_h=`echo "_$PACKAGE-$ac_stdint_h" | $as_tr_cpp`
|
| +_ac_stdint_h=`$as_echo "_$PACKAGE-$ac_stdint_h" | $as_tr_cpp`
|
| ac_cv_stdint_message="$ac_cv_stdint_message"
|
| ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
|
| ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
|
| @@ -11469,7 +8830,7 @@
|
|
|
| _ACEOF
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
|
| # Handling of arguments.
|
| for ac_config_target in $ac_config_targets
|
| @@ -11482,9 +8843,7 @@
|
| "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
| "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
|
|
|
| - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
| -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
| - { (exit 1); exit 1; }; };;
|
| + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
| esac
|
| done
|
|
|
| @@ -11511,7 +8870,7 @@
|
| trap 'exit_status=$?
|
| { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
| ' 0
|
| - trap '{ (exit 1); exit 1; }' 1 2 13 15
|
| + trap 'as_fn_exit 1' 1 2 13 15
|
| }
|
| # Create a (secure) tmp directory for tmp files.
|
|
|
| @@ -11522,239 +8881,140 @@
|
| {
|
| tmp=./conf$$-$RANDOM
|
| (umask 077 && mkdir "$tmp")
|
| -} ||
|
| -{
|
| - echo "$me: cannot create a temporary directory in ." >&2
|
| - { (exit 1); exit 1; }
|
| -}
|
| +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
| -#
|
| -# Set up the sed scripts for CONFIG_FILES section.
|
| -#
|
| -
|
| -# No need to generate the scripts if there are no CONFIG_FILES.
|
| -# This happens for instance when ./config.status config.h
|
| +# 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
|
|
|
| -_ACEOF
|
|
|
| -
|
| -
|
| -ac_delim='%!_!# '
|
| -for ac_last_try in false false false false false :; do
|
| - cat >conf$$subs.sed <<_ACEOF
|
| -SHELL!$SHELL$ac_delim
|
| -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
| -PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
| -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
| -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
| -PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
| -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
| -exec_prefix!$exec_prefix$ac_delim
|
| -prefix!$prefix$ac_delim
|
| -program_transform_name!$program_transform_name$ac_delim
|
| -bindir!$bindir$ac_delim
|
| -sbindir!$sbindir$ac_delim
|
| -libexecdir!$libexecdir$ac_delim
|
| -datarootdir!$datarootdir$ac_delim
|
| -datadir!$datadir$ac_delim
|
| -sysconfdir!$sysconfdir$ac_delim
|
| -sharedstatedir!$sharedstatedir$ac_delim
|
| -localstatedir!$localstatedir$ac_delim
|
| -includedir!$includedir$ac_delim
|
| -oldincludedir!$oldincludedir$ac_delim
|
| -docdir!$docdir$ac_delim
|
| -infodir!$infodir$ac_delim
|
| -htmldir!$htmldir$ac_delim
|
| -dvidir!$dvidir$ac_delim
|
| -pdfdir!$pdfdir$ac_delim
|
| -psdir!$psdir$ac_delim
|
| -libdir!$libdir$ac_delim
|
| -localedir!$localedir$ac_delim
|
| -mandir!$mandir$ac_delim
|
| -DEFS!$DEFS$ac_delim
|
| -ECHO_C!$ECHO_C$ac_delim
|
| -ECHO_N!$ECHO_N$ac_delim
|
| -ECHO_T!$ECHO_T$ac_delim
|
| -LIBS!$LIBS$ac_delim
|
| -build_alias!$build_alias$ac_delim
|
| -host_alias!$host_alias$ac_delim
|
| -target_alias!$target_alias$ac_delim
|
| -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
| -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
| -INSTALL_DATA!$INSTALL_DATA$ac_delim
|
| -am__isrc!$am__isrc$ac_delim
|
| -CYGPATH_W!$CYGPATH_W$ac_delim
|
| -PACKAGE!$PACKAGE$ac_delim
|
| -VERSION!$VERSION$ac_delim
|
| -ACLOCAL!$ACLOCAL$ac_delim
|
| -AUTOCONF!$AUTOCONF$ac_delim
|
| -AUTOMAKE!$AUTOMAKE$ac_delim
|
| -AUTOHEADER!$AUTOHEADER$ac_delim
|
| -MAKEINFO!$MAKEINFO$ac_delim
|
| -install_sh!$install_sh$ac_delim
|
| -STRIP!$STRIP$ac_delim
|
| -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
|
| -mkdir_p!$mkdir_p$ac_delim
|
| -AWK!$AWK$ac_delim
|
| -SET_MAKE!$SET_MAKE$ac_delim
|
| -am__leading_dot!$am__leading_dot$ac_delim
|
| -AMTAR!$AMTAR$ac_delim
|
| -am__tar!$am__tar$ac_delim
|
| -am__untar!$am__untar$ac_delim
|
| -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
|
| -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
|
| -MAINT!$MAINT$ac_delim
|
| -CC!$CC$ac_delim
|
| -CFLAGS!$CFLAGS$ac_delim
|
| -LDFLAGS!$LDFLAGS$ac_delim
|
| -CPPFLAGS!$CPPFLAGS$ac_delim
|
| -ac_ct_CC!$ac_ct_CC$ac_delim
|
| -EXEEXT!$EXEEXT$ac_delim
|
| -OBJEXT!$OBJEXT$ac_delim
|
| -DEPDIR!$DEPDIR$ac_delim
|
| -am__include!$am__include$ac_delim
|
| -am__quote!$am__quote$ac_delim
|
| -AMDEP_TRUE!$AMDEP_TRUE$ac_delim
|
| -AMDEP_FALSE!$AMDEP_FALSE$ac_delim
|
| -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
|
| -CCDEPMODE!$CCDEPMODE$ac_delim
|
| -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
|
| -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
|
| -CPP!$CPP$ac_delim
|
| -LN_S!$LN_S$ac_delim
|
| -RANLIB!$RANLIB$ac_delim
|
| -XMLTO!$XMLTO$ac_delim
|
| -BUILD_MAN_TRUE!$BUILD_MAN_TRUE$ac_delim
|
| -BUILD_MAN_FALSE!$BUILD_MAN_FALSE$ac_delim
|
| -GREP!$GREP$ac_delim
|
| -EGREP!$EGREP$ac_delim
|
| -USE_NLS!$USE_NLS$ac_delim
|
| -MSGFMT!$MSGFMT$ac_delim
|
| -GMSGFMT!$GMSGFMT$ac_delim
|
| -MSGFMT_015!$MSGFMT_015$ac_delim
|
| -GMSGFMT_015!$GMSGFMT_015$ac_delim
|
| -XGETTEXT!$XGETTEXT$ac_delim
|
| -XGETTEXT_015!$XGETTEXT_015$ac_delim
|
| -MSGMERGE!$MSGMERGE$ac_delim
|
| -build!$build$ac_delim
|
| -build_cpu!$build_cpu$ac_delim
|
| -build_vendor!$build_vendor$ac_delim
|
| -_ACEOF
|
| -
|
| - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
| - break
|
| - elif $ac_last_try; then
|
| - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| - else
|
| - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
| - fi
|
| -done
|
| -
|
| -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
| -if test -n "$ac_eof"; then
|
| - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
| - ac_eof=`expr $ac_eof + 1`
|
| +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 2>/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
|
|
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
| -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
| +echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
| _ACEOF
|
| -sed '
|
| -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
| -s/^/s,@/; s/!/@,|#_!!_#|/
|
| -:n
|
| -t n
|
| -s/'"$ac_delim"'$/,g/; t
|
| -s/$/\\/; p
|
| -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
| -' >>$CONFIG_STATUS <conf$$subs.sed
|
| -rm -f conf$$subs.sed
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| -CEOF$ac_eof
|
| -_ACEOF
|
|
|
|
|
| +{
|
| + 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
|
| - cat >conf$$subs.sed <<_ACEOF
|
| -build_os!$build_os$ac_delim
|
| -host!$host$ac_delim
|
| -host_cpu!$host_cpu$ac_delim
|
| -host_vendor!$host_vendor$ac_delim
|
| -host_os!$host_os$ac_delim
|
| -INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
|
| -LIBICONV!$LIBICONV$ac_delim
|
| -LTLIBICONV!$LTLIBICONV$ac_delim
|
| -INTLLIBS!$INTLLIBS$ac_delim
|
| -LIBINTL!$LIBINTL$ac_delim
|
| -LTLIBINTL!$LTLIBINTL$ac_delim
|
| -POSUB!$POSUB$ac_delim
|
| -ARCH!$ARCH$ac_delim
|
| -GCC!$GCC$ac_delim
|
| -MORE_CFLAGS!$MORE_CFLAGS$ac_delim
|
| -CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
|
| -CCLD_FOR_BUILD!$CCLD_FOR_BUILD$ac_delim
|
| -HOST_CC!$HOST_CC$ac_delim
|
| -PYTHON!$PYTHON$ac_delim
|
| -PYTHON_VERSION!$PYTHON_VERSION$ac_delim
|
| -PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
|
| -PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
|
| -PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
|
| -pythondir!$pythondir$ac_delim
|
| -pkgpythondir!$pkgpythondir$ac_delim
|
| -pyexecdir!$pyexecdir$ac_delim
|
| -pkgpyexecdir!$pkgpyexecdir$ac_delim
|
| -PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
|
| -HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim
|
| -HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim
|
| -HAVE_PYTHON_BINDINGS_TRUE!$HAVE_PYTHON_BINDINGS_TRUE$ac_delim
|
| -HAVE_PYTHON_BINDINGS_FALSE!$HAVE_PYTHON_BINDINGS_FALSE$ac_delim
|
| -LIBOBJS!$LIBOBJS$ac_delim
|
| -LTLIBOBJS!$LTLIBOBJS$ac_delim
|
| -_ACEOF
|
| + . ./conf$$subs.sh ||
|
| + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
| - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
|
| + 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
|
| - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| - { (exit 1); exit 1; }; }
|
| + 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
|
|
|
| -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
| -if test -n "$ac_eof"; then
|
| - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
| - ac_eof=`expr $ac_eof + 1`
|
| -fi
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| +cat >>"\$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
|
| +' <conf$$subs.awk | sed '
|
| +/^[^""]/{
|
| + N
|
| + s/\n//
|
| +}
|
| +' >>$CONFIG_STATUS || ac_write_fail=1
|
| +rm -f conf$$subs.awk
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| +_ACAWK
|
| +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
| + for (key in S) S_is_set[key] = 1
|
| + FS = ""
|
|
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
|
| -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
| +}
|
| +{
|
| + 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
|
| + }
|
| +
|
| + print line
|
| +}
|
| +
|
| +_ACAWK
|
| _ACEOF
|
| -sed '
|
| -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
| -s/^/s,@/; s/!/@,|#_!!_#|/
|
| -:n
|
| -t n
|
| -s/'"$ac_delim"'$/,g/; t
|
| -s/$/\\/; p
|
| -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
| -' >>$CONFIG_STATUS <conf$$subs.sed
|
| -rm -f conf$$subs.sed
|
| -cat >>$CONFIG_STATUS <<_ACEOF
|
| -:end
|
| -s/|#_!!_#|//g
|
| -CEOF$ac_eof
|
| +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 < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
| + || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
| _ACEOF
|
|
|
| -
|
| # VPATH may cause trouble with some makes, so we remove $(srcdir),
|
| # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
| # trailing colons and then remove the whole line if VPATH becomes empty
|
| @@ -11770,20 +9030,128 @@
|
| }'
|
| fi
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| +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 >"$tmp/defines.awk" <<\_ACAWK ||
|
| +BEGIN {
|
| +_ACEOF
|
|
|
| -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
|
| +# 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_t=`sed -n "/$ac_delim/p" confdefs.h`
|
| + if test -z "$ac_t"; then
|
| + break
|
| + elif $ac_last_try; then
|
| + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
| + else
|
| + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
| + fi
|
| +done
|
| +
|
| +# 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
|
| +' <confdefs.h | sed '
|
| +s/'"$ac_delim"'/"\\\
|
| +"/g' >>$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"
|
| +
|
| +
|
| +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*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
| -echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
| - { (exit 1); exit 1; }; };;
|
| + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
| :[FH]-) ac_tag=-:-;;
|
| :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
| esac
|
| @@ -11811,26 +9179,34 @@
|
| [\\/$]*) false;;
|
| *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
| esac ||
|
| - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
| -echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
| - { (exit 1); exit 1; }; };;
|
| + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
| esac
|
| - ac_file_inputs="$ac_file_inputs $ac_f"
|
| + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
| + as_fn_append ac_file_inputs " '$ac_f'"
|
| done
|
|
|
| # 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 "`IFS=:
|
| - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
| + 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"
|
| - { echo "$as_me:$LINENO: creating $ac_file" >&5
|
| -echo "$as_me: creating $ac_file" >&6;}
|
| + { $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 >"$tmp/stdin";;
|
| + *:-:* | *:-) cat >"$tmp/stdin" \
|
| + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
| esac
|
| ;;
|
| esac
|
| @@ -11840,7 +9216,7 @@
|
| X"$ac_file" : 'X\(//\)[^/]' \| \
|
| X"$ac_file" : 'X\(//\)$' \| \
|
| X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$ac_file" |
|
| +$as_echo X"$ac_file" |
|
| sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| s//\1/
|
| q
|
| @@ -11858,55 +9234,15 @@
|
| q
|
| }
|
| s/.*/./; q'`
|
| - { as_dir="$ac_dir"
|
| - case $as_dir in #(
|
| - -*) as_dir=./$as_dir;;
|
| - esac
|
| - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
| - as_dirs=
|
| - while :; do
|
| - case $as_dir in #(
|
| - *\'*) as_qdir=`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 ||
|
| -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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
| -echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
| - { (exit 1); exit 1; }; }; }
|
| + as_dir="$ac_dir"; as_fn_mkdir_p
|
| ac_builddir=.
|
|
|
| case "$ac_dir" in
|
| .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
| *)
|
| - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
| + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
| # A ".." for each directory in $ac_dir_suffix.
|
| - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
| + 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/ ;;
|
| @@ -11951,12 +9287,12 @@
|
| esac
|
| _ACEOF
|
|
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| +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=
|
| -
|
| -case `sed -n '/datarootdir/ {
|
| +ac_sed_dataroot='
|
| +/datarootdir/ {
|
| p
|
| q
|
| }
|
| @@ -11964,36 +9300,37 @@
|
| /@docdir@/p
|
| /@infodir@/p
|
| /@localedir@/p
|
| -/@mandir@/p
|
| -' $ac_file_inputs` in
|
| +/@mandir@/p'
|
| +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
| *datarootdir*) ac_datarootdir_seen=yes;;
|
| *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
| - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
| -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
| + { $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
|
| +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' ;;
|
| + 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
|
| - sed "$ac_vpsub
|
| +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| +ac_sed_extra="$ac_vpsub
|
| $extrasub
|
| _ACEOF
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
| :t
|
| /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
| -s&@configure_input@&$configure_input&;t t
|
| +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
|
| @@ -12004,121 +9341,50 @@
|
| s&@INSTALL@&$ac_INSTALL&;t t
|
| s&@MKDIR_P@&$ac_MKDIR_P&;t t
|
| $ac_datarootdir_hack
|
| -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
|
| +"
|
| +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
| + || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
|
| test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
| { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
| { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
| - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
| + { $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
|
| -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
| +$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 "$tmp/stdin"
|
| case $ac_file in
|
| - -) cat "$tmp/out"; rm -f "$tmp/out";;
|
| - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
| - esac
|
| + -) cat "$tmp/out" && rm -f "$tmp/out";;
|
| + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
| + esac \
|
| + || as_fn_error "could not create $ac_file" "$LINENO" 5
|
| ;;
|
| :H)
|
| #
|
| # CONFIG_HEADER
|
| #
|
| -_ACEOF
|
| -
|
| -# Transform confdefs.h into a sed script `conftest.defines', that
|
| -# substitutes the proper values into config.h.in to produce config.h.
|
| -rm -f conftest.defines conftest.tail
|
| -# First, append a space to every undef/define line, to ease matching.
|
| -echo 's/$/ /' >conftest.defines
|
| -# Then, protect against being on the right side of a sed subst, or in
|
| -# an unquoted here document, in config.status. If some macros were
|
| -# called several times there might be several #defines for the same
|
| -# symbol, which is useless. But do not sort them, since the last
|
| -# AC_DEFINE must be honored.
|
| -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
| -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
|
| -# NAME is the cpp macro being defined, VALUE is the value it is being given.
|
| -# PARAMS is the parameter list in the macro definition--in most cases, it's
|
| -# just an empty string.
|
| -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
|
| -ac_dB='\\)[ (].*,\\1define\\2'
|
| -ac_dC=' '
|
| -ac_dD=' ,'
|
| -
|
| -uniq confdefs.h |
|
| - sed -n '
|
| - t rset
|
| - :rset
|
| - s/^[ ]*#[ ]*define[ ][ ]*//
|
| - t ok
|
| - d
|
| - :ok
|
| - s/[\\&,]/\\&/g
|
| - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
|
| - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
|
| - ' >>conftest.defines
|
| -
|
| -# Remove the space that was appended to ease matching.
|
| -# Then 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.
|
| -# (The regexp can be short, since the line contains either #define or #undef.)
|
| -echo 's/ $//
|
| -s,^[ #]*u.*,/* & */,' >>conftest.defines
|
| -
|
| -# Break up conftest.defines:
|
| -ac_max_sed_lines=50
|
| -
|
| -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
|
| -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
|
| -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
|
| -# et cetera.
|
| -ac_in='$ac_file_inputs'
|
| -ac_out='"$tmp/out1"'
|
| -ac_nxt='"$tmp/out2"'
|
| -
|
| -while :
|
| -do
|
| - # Write a here document:
|
| - cat >>$CONFIG_STATUS <<_ACEOF
|
| - # First, check the format of the line:
|
| - cat >"\$tmp/defines.sed" <<\\CEOF
|
| -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
|
| -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
|
| -b
|
| -:def
|
| -_ACEOF
|
| - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
|
| - echo 'CEOF
|
| - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
|
| - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
|
| - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
|
| - grep . conftest.tail >/dev/null || break
|
| - rm -f conftest.defines
|
| - mv conftest.tail conftest.defines
|
| -done
|
| -rm -f conftest.defines conftest.tail
|
| -
|
| -echo "ac_result=$ac_in" >>$CONFIG_STATUS
|
| -cat >>$CONFIG_STATUS <<\_ACEOF
|
| if test x"$ac_file" != x-; then
|
| - echo "/* $configure_input */" >"$tmp/config.h"
|
| - cat "$ac_result" >>"$tmp/config.h"
|
| - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
|
| - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
| -echo "$as_me: $ac_file is unchanged" >&6;}
|
| + {
|
| + $as_echo "/* $configure_input */" \
|
| + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
| + } >"$tmp/config.h" \
|
| + || as_fn_error "could not create $ac_file" "$LINENO" 5
|
| + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
|
| +$as_echo "$as_me: $ac_file is unchanged" >&6;}
|
| else
|
| - rm -f $ac_file
|
| - mv "$tmp/config.h" $ac_file
|
| + rm -f "$ac_file"
|
| + mv "$tmp/config.h" "$ac_file" \
|
| + || as_fn_error "could not create $ac_file" "$LINENO" 5
|
| fi
|
| else
|
| - echo "/* $configure_input */"
|
| - cat "$ac_result"
|
| + $as_echo "/* $configure_input */" \
|
| + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
| + || as_fn_error "could not create -" "$LINENO" 5
|
| fi
|
| - rm -f "$tmp/out12"
|
| -# Compute $ac_file's index in $config_headers.
|
| -_am_arg=$ac_file
|
| +# Compute "$ac_file"'s index in $config_headers.
|
| +_am_arg="$ac_file"
|
| _am_stamp_count=1
|
| for _am_header in $config_headers :; do
|
| case $_am_header in
|
| @@ -12133,7 +9399,7 @@
|
| X"$_am_arg" : 'X\(//\)[^/]' \| \
|
| X"$_am_arg" : 'X\(//\)$' \| \
|
| X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$_am_arg" |
|
| +$as_echo X"$_am_arg" |
|
| sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| s//\1/
|
| q
|
| @@ -12153,30 +9419,40 @@
|
| s/.*/./; q'`/stamp-h$_am_stamp_count
|
| ;;
|
|
|
| - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
|
| -echo "$as_me: executing $ac_file commands" >&6;}
|
| + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
|
| +$as_echo "$as_me: executing $ac_file commands" >&6;}
|
| ;;
|
| esac
|
|
|
|
|
| case $ac_file$ac_mode in
|
| - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
| - # Strip MF so we end up with the name of the file.
|
| - mf=`echo "$mf" | sed -e 's/:.*$//'`
|
| - # Check whether this is an Automake generated Makefile or not.
|
| - # We used to match only the files named `Makefile.in', but
|
| - # some people rename them; so instead we look at the file content.
|
| - # Grep'ing the first line is not enough: some people post-process
|
| - # each Makefile.in and add a new line on top of each file to say so.
|
| - # Grep'ing the whole file is not good either: AIX grep has a line
|
| - # limit of 2048, but all sed's we know have understand at least 4000.
|
| - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
| - dirpart=`$as_dirname -- "$mf" ||
|
| + "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
|
| + # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
| + # are listed without --file. Let's play safe and only enable the eval
|
| + # if we detect the quoting.
|
| + case $CONFIG_FILES in
|
| + *\'*) eval set x "$CONFIG_FILES" ;;
|
| + *) set x $CONFIG_FILES ;;
|
| + esac
|
| + shift
|
| + for mf
|
| + do
|
| + # Strip MF so we end up with the name of the file.
|
| + mf=`echo "$mf" | sed -e 's/:.*$//'`
|
| + # Check whether this is an Automake generated Makefile or not.
|
| + # We used to match only the files named `Makefile.in', but
|
| + # some people rename them; so instead we look at the file content.
|
| + # Grep'ing the first line is not enough: some people post-process
|
| + # each Makefile.in and add a new line on top of each file to say so.
|
| + # Grep'ing the whole file is not good either: AIX grep has a line
|
| + # limit of 2048, but all sed's we know have understand at least 4000.
|
| + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
| + dirpart=`$as_dirname -- "$mf" ||
|
| $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| X"$mf" : 'X\(//\)[^/]' \| \
|
| X"$mf" : 'X\(//\)$' \| \
|
| X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$mf" |
|
| +$as_echo X"$mf" |
|
| sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| s//\1/
|
| q
|
| @@ -12194,33 +9470,33 @@
|
| q
|
| }
|
| s/.*/./; q'`
|
| - else
|
| - continue
|
| - fi
|
| - # Extract the definition of DEPDIR, am__include, and am__quote
|
| - # from the Makefile without running `make'.
|
| - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
| - test -z "$DEPDIR" && continue
|
| - am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
| - test -z "am__include" && continue
|
| - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
| - # When using ansi2knr, U may be empty or an underscore; expand it
|
| - U=`sed -n 's/^U = //p' < "$mf"`
|
| - # Find all dependency output files, they are included files with
|
| - # $(DEPDIR) in their names. We invoke sed twice because it is the
|
| - # simplest approach to changing $(DEPDIR) to its actual value in the
|
| - # expansion.
|
| - for file in `sed -n "
|
| - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
| - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
| - # Make sure the directory exists.
|
| - test -f "$dirpart/$file" && continue
|
| - fdir=`$as_dirname -- "$file" ||
|
| + else
|
| + continue
|
| + fi
|
| + # Extract the definition of DEPDIR, am__include, and am__quote
|
| + # from the Makefile without running `make'.
|
| + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
| + test -z "$DEPDIR" && continue
|
| + am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
| + test -z "am__include" && continue
|
| + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
| + # When using ansi2knr, U may be empty or an underscore; expand it
|
| + U=`sed -n 's/^U = //p' < "$mf"`
|
| + # Find all dependency output files, they are included files with
|
| + # $(DEPDIR) in their names. We invoke sed twice because it is the
|
| + # simplest approach to changing $(DEPDIR) to its actual value in the
|
| + # expansion.
|
| + for file in `sed -n "
|
| + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
| + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
| + # Make sure the directory exists.
|
| + test -f "$dirpart/$file" && continue
|
| + fdir=`$as_dirname -- "$file" ||
|
| $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| X"$file" : 'X\(//\)[^/]' \| \
|
| X"$file" : 'X\(//\)$' \| \
|
| X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$file" |
|
| +$as_echo X"$file" |
|
| sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| s//\1/
|
| q
|
| @@ -12238,55 +9514,16 @@
|
| q
|
| }
|
| s/.*/./; q'`
|
| - { as_dir=$dirpart/$fdir
|
| - case $as_dir in #(
|
| - -*) as_dir=./$as_dir;;
|
| - esac
|
| - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
| - as_dirs=
|
| - while :; do
|
| - case $as_dir in #(
|
| - *\'*) as_qdir=`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 ||
|
| -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
|
| + as_dir=$dirpart/$fdir; as_fn_mkdir_p
|
| + # echo "creating $dirpart/$file"
|
| + echo '# dummy' > "$dirpart/$file"
|
| done
|
| - test -z "$as_dirs" || eval "mkdir $as_dirs"
|
| - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
| -echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
| - { (exit 1); exit 1; }; }; }
|
| - # echo "creating $dirpart/$file"
|
| - echo '# dummy' > "$dirpart/$file"
|
| done
|
| -done
|
| +}
|
| ;;
|
| "$ac_stdint_h":C)
|
| -{ echo "$as_me:$LINENO: creating $ac_stdint_h : $_ac_stdint_h" >&5
|
| -echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;}
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_stdint_h : $_ac_stdint_h" >&5
|
| +$as_echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;}
|
| ac_stdint=$tmp/_stdint.h
|
|
|
| echo "#ifndef" $_ac_stdint_h >$ac_stdint
|
| @@ -12717,15 +9954,15 @@
|
| STDINT_EOF
|
| fi
|
| if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
|
| - { echo "$as_me:$LINENO: $ac_stdint_h is unchanged" >&5
|
| -echo "$as_me: $ac_stdint_h is unchanged" >&6;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_stdint_h is unchanged" >&5
|
| +$as_echo "$as_me: $ac_stdint_h is unchanged" >&6;}
|
| else
|
| ac_dir=`$as_dirname -- "$ac_stdint_h" ||
|
| $as_expr X"$ac_stdint_h" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| X"$ac_stdint_h" : 'X\(//\)[^/]' \| \
|
| X"$ac_stdint_h" : 'X\(//\)$' \| \
|
| X"$ac_stdint_h" : 'X\(/\)' \| . 2>/dev/null ||
|
| -echo X"$ac_stdint_h" |
|
| +$as_echo X"$ac_stdint_h" |
|
| sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| s//\1/
|
| q
|
| @@ -12743,47 +9980,7 @@
|
| q
|
| }
|
| s/.*/./; q'`
|
| - { as_dir="$ac_dir"
|
| - case $as_dir in #(
|
| - -*) as_dir=./$as_dir;;
|
| - esac
|
| - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
| - as_dirs=
|
| - while :; do
|
| - case $as_dir in #(
|
| - *\'*) as_qdir=`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 ||
|
| -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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
| -echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
| - { (exit 1); exit 1; }; }; }
|
| + as_dir="$ac_dir"; as_fn_mkdir_p
|
| rm -f $ac_stdint_h
|
| mv $ac_stdint $ac_stdint_h
|
| fi
|
| @@ -12906,12 +10103,14 @@
|
| done # for ac_tag
|
|
|
|
|
| -{ (exit 0); exit 0; }
|
| +as_fn_exit 0
|
| _ACEOF
|
| -chmod +x $CONFIG_STATUS
|
| 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
|
| @@ -12930,6 +10129,10 @@
|
| 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 || { (exit 1); exit 1; }
|
| + $ac_cs_success || as_fn_exit $?
|
| fi
|
| +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
| +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
| +fi
|
|
|
|
|
Chromium Code Reviews
Issue 6170009:
Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/