Index: third_party/yasm/patched-yasm/configure |
=================================================================== |
--- third_party/yasm/patched-yasm/configure (revision 165590) |
+++ third_party/yasm/patched-yasm/configure (working copy) |
@@ -1,13 +1,13 @@ |
#! /bin/sh |
# Guess values for system-dependent variables and create Makefiles. |
-# Generated by GNU Autoconf 2.65 for yasm 1.1.0. |
+# Generated by GNU Autoconf 2.68 for yasm 1.2.0. |
# |
# Report bugs to <bug-yasm@tortall.net>. |
# |
# |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
-# Inc. |
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
+# Foundation, Inc. |
# |
# |
# This configure script is free software; the Free Software Foundation |
@@ -91,6 +91,7 @@ |
IFS=" "" $as_nl" |
# Find who we are. Look in the path if we contain no directory separator. |
+as_myself= |
case $0 in #(( |
*[\\/]* ) as_myself=$0 ;; |
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
@@ -216,11 +217,18 @@ |
# We cannot yet assume a decent shell, so we have to provide a |
# neutralization value for shells without unset; and this also |
# works around shells that cannot unset nonexistent variables. |
+ # Preserve -v and -x to the replacement shell. |
BASH_ENV=/dev/null |
ENV=/dev/null |
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
export CONFIG_SHELL |
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
+ case $- in # (((( |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
+ *v* ) as_opts=-v ;; |
+ *x* ) as_opts=-x ;; |
+ * ) as_opts= ;; |
+ esac |
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
fi |
if test x$as_have_required = xno; then : |
@@ -319,7 +327,7 @@ |
test -d "$as_dir" && break |
done |
test -z "$as_dirs" || eval "mkdir $as_dirs" |
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
} # as_fn_mkdir_p |
@@ -359,19 +367,19 @@ |
fi # as_fn_arith |
-# as_fn_error ERROR [LINENO LOG_FD] |
-# --------------------------------- |
+# as_fn_error STATUS ERROR [LINENO LOG_FD] |
+# ---------------------------------------- |
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
-# script with status $?, using 1 if that was 0. |
+# script with STATUS, using 1 if that was 0. |
as_fn_error () |
{ |
- as_status=$?; test $as_status -eq 0 && as_status=1 |
- if test "$3"; then |
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
+ as_status=$1; test $as_status -eq 0 && as_status=1 |
+ if test "$4"; then |
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
fi |
- $as_echo "$as_me: error: $1" >&2 |
+ $as_echo "$as_me: error: $2" >&2 |
as_fn_exit $as_status |
} # as_fn_error |
@@ -533,7 +541,7 @@ |
exec 6>&1 |
# Name of the host. |
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
# so uname gets run too. |
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
@@ -552,8 +560,8 @@ |
# Identity of this package. |
PACKAGE_NAME='yasm' |
PACKAGE_TARNAME='yasm' |
-PACKAGE_VERSION='1.1.0' |
-PACKAGE_STRING='yasm 1.1.0' |
+PACKAGE_VERSION='1.2.0' |
+PACKAGE_STRING='yasm 1.2.0' |
PACKAGE_BUGREPORT='bug-yasm@tortall.net' |
PACKAGE_URL='' |
@@ -624,6 +632,7 @@ |
INTLLIBS |
LTLIBICONV |
LIBICONV |
+INTL_MACOSX_LIBS |
host_os |
host_vendor |
host_cpu |
@@ -824,8 +833,9 @@ |
fi |
case $ac_option in |
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
- *) ac_optarg=yes ;; |
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
+ *=) ac_optarg= ;; |
+ *) ac_optarg=yes ;; |
esac |
# Accept the important Cygnus configure options, so we can diagnose typos. |
@@ -870,7 +880,7 @@ |
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
# Reject names that are not valid shell variable names. |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
- as_fn_error "invalid feature name: $ac_useropt" |
+ as_fn_error $? "invalid feature name: $ac_useropt" |
ac_useropt_orig=$ac_useropt |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
case $ac_user_opts in |
@@ -896,7 +906,7 @@ |
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
# Reject names that are not valid shell variable names. |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
- as_fn_error "invalid feature name: $ac_useropt" |
+ as_fn_error $? "invalid feature name: $ac_useropt" |
ac_useropt_orig=$ac_useropt |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
case $ac_user_opts in |
@@ -1100,7 +1110,7 @@ |
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
# Reject names that are not valid shell variable names. |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
- as_fn_error "invalid package name: $ac_useropt" |
+ as_fn_error $? "invalid package name: $ac_useropt" |
ac_useropt_orig=$ac_useropt |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
case $ac_user_opts in |
@@ -1116,7 +1126,7 @@ |
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
# Reject names that are not valid shell variable names. |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
- as_fn_error "invalid package name: $ac_useropt" |
+ as_fn_error $? "invalid package name: $ac_useropt" |
ac_useropt_orig=$ac_useropt |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
case $ac_user_opts in |
@@ -1146,8 +1156,8 @@ |
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
x_libraries=$ac_optarg ;; |
- -*) as_fn_error "unrecognized option: \`$ac_option' |
-Try \`$0 --help' for more information." |
+ -*) as_fn_error $? "unrecognized option: \`$ac_option' |
+Try \`$0 --help' for more information" |
;; |
*=*) |
@@ -1155,7 +1165,7 @@ |
# Reject names that are not valid shell variable names. |
case $ac_envvar in #( |
'' | [0-9]* | *[!_$as_cr_alnum]* ) |
- as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
esac |
eval $ac_envvar=\$ac_optarg |
export $ac_envvar ;; |
@@ -1165,7 +1175,7 @@ |
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
;; |
esac |
@@ -1173,13 +1183,13 @@ |
if test -n "$ac_prev"; then |
ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
- as_fn_error "missing argument to $ac_option" |
+ as_fn_error $? "missing argument to $ac_option" |
fi |
if test -n "$ac_unrecognized_opts"; then |
case $enable_option_checking in |
no) ;; |
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
esac |
fi |
@@ -1202,7 +1212,7 @@ |
[\\/$]* | ?:[\\/]* ) continue;; |
NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
esac |
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
done |
# There might be people who depend on the old broken behavior: `$host' |
@@ -1216,8 +1226,8 @@ |
if test "x$host_alias" != x; then |
if test "x$build_alias" = x; then |
cross_compiling=maybe |
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
- If a cross compiler is detected then cross compile mode will be used." >&2 |
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
+ If a cross compiler is detected then cross compile mode will be used" >&2 |
elif test "x$build_alias" != "x$host_alias"; then |
cross_compiling=yes |
fi |
@@ -1232,9 +1242,9 @@ |
ac_pwd=`pwd` && test -n "$ac_pwd" && |
ac_ls_di=`ls -di .` && |
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
- as_fn_error "working directory cannot be determined" |
+ as_fn_error $? "working directory cannot be determined" |
test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
- as_fn_error "pwd does not report name of working directory" |
+ as_fn_error $? "pwd does not report name of working directory" |
# Find the source files, if location was not specified. |
@@ -1273,11 +1283,11 @@ |
fi |
if test ! -r "$srcdir/$ac_unique_file"; then |
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
fi |
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
ac_abs_confdir=`( |
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
pwd)` |
# When building in place, set srcdir=. |
if test "$ac_abs_confdir" = "$ac_pwd"; then |
@@ -1303,7 +1313,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 1.1.0 to adapt to many kinds of systems. |
+\`configure' configures yasm 1.2.0 to adapt to many kinds of systems. |
Usage: $0 [OPTION]... [VAR=VALUE]... |
@@ -1317,7 +1327,7 @@ |
--help=short display options specific to this package |
--help=recursive display the short help of all the included packages |
-V, --version display version information and exit |
- -q, --quiet, --silent do not print \`checking...' messages |
+ -q, --quiet, --silent do not print \`checking ...' messages |
--cache-file=FILE cache test results in FILE [disabled] |
-C, --config-cache alias for \`--cache-file=config.cache' |
-n, --no-create do not create output files |
@@ -1373,7 +1383,7 @@ |
if test -n "$ac_init_help"; then |
case $ac_init_help in |
- short | recursive ) echo "Configuration of yasm 1.1.0:";; |
+ short | recursive ) echo "Configuration of yasm 1.2.0:";; |
esac |
cat <<\_ACEOF |
@@ -1488,10 +1498,10 @@ |
test -n "$ac_init_help" && exit $ac_status |
if $ac_init_version; then |
cat <<\_ACEOF |
-yasm configure 1.1.0 |
-generated by GNU Autoconf 2.65 |
+yasm configure 1.2.0 |
+generated by GNU Autoconf 2.68 |
-Copyright (C) 2009 Free Software Foundation, Inc. |
+Copyright (C) 2010 Free Software Foundation, Inc. |
This configure script is free software; the Free Software Foundation |
gives unlimited permission to copy, distribute and modify it. |
_ACEOF |
@@ -1535,7 +1545,7 @@ |
ac_retval=1 |
fi |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
as_fn_set_status $ac_retval |
} # ac_fn_c_try_compile |
@@ -1561,7 +1571,7 @@ |
mv -f conftest.er1 conftest.err |
fi |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
- test $ac_status = 0; } >/dev/null && { |
+ test $ac_status = 0; } > conftest.i && { |
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
test ! -s conftest.err |
}; then : |
@@ -1572,7 +1582,7 @@ |
ac_retval=1 |
fi |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
as_fn_set_status $ac_retval |
} # ac_fn_c_try_cpp |
@@ -1614,7 +1624,7 @@ |
ac_retval=$ac_status |
fi |
rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
as_fn_set_status $ac_retval |
} # ac_fn_c_try_run |
@@ -1627,10 +1637,10 @@ |
ac_fn_c_check_header_mongrel () |
{ |
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
+ if eval \${$3+:} false; then : |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
$as_echo_n "checking for $2... " >&6; } |
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
+if eval \${$3+:} false; then : |
$as_echo_n "(cached) " >&6 |
fi |
eval ac_res=\$$3 |
@@ -1666,7 +1676,7 @@ |
else |
ac_header_preproc=no |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
$as_echo "$ac_header_preproc" >&6; } |
@@ -1689,17 +1699,15 @@ |
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
-( cat <<\_ASBOX |
-## ----------------------------------- ## |
+( $as_echo "## ----------------------------------- ## |
## Report this to 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 : |
+if eval \${$3+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
eval "$3=\$ac_header_compiler" |
@@ -1708,7 +1716,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
$as_echo "$ac_res" >&6; } |
fi |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
} # ac_fn_c_check_header_mongrel |
@@ -1721,7 +1729,7 @@ |
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
$as_echo_n "checking for $2... " >&6; } |
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
+if eval \${$3+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -1739,7 +1747,7 @@ |
eval ac_res=\$$3 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
$as_echo "$ac_res" >&6; } |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
} # ac_fn_c_check_header_compile |
@@ -1752,7 +1760,7 @@ |
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
$as_echo_n "checking for $2... " >&6; } |
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
+if eval \${$3+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
eval "$3=no" |
@@ -1793,7 +1801,7 @@ |
eval ac_res=\$$3 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
$as_echo "$ac_res" >&6; } |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
} # ac_fn_c_check_type |
@@ -1970,7 +1978,7 @@ |
rm -f conftest.val |
fi |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
as_fn_set_status $ac_retval |
} # ac_fn_c_compute_int |
@@ -2016,7 +2024,7 @@ |
# interfere with the next link command; also delete a directory that is |
# left behind by Apple's compiler. We do this before executing the actions. |
rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
as_fn_set_status $ac_retval |
} # ac_fn_c_try_link |
@@ -2029,7 +2037,7 @@ |
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
$as_echo_n "checking for $2... " >&6; } |
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
+if eval \${$3+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -2084,15 +2092,15 @@ |
eval ac_res=\$$3 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
$as_echo "$ac_res" >&6; } |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
} # ac_fn_c_check_func |
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 1.1.0, which was |
-generated by GNU Autoconf 2.65. Invocation command line was |
+It was created by yasm $as_me 1.2.0, which was |
+generated by GNU Autoconf 2.68. Invocation command line was |
$ $0 $@ |
@@ -2202,11 +2210,9 @@ |
{ |
echo |
- cat <<\_ASBOX |
-## ---------------- ## |
+ $as_echo "## ---------------- ## |
## Cache variables. ## |
-## ---------------- ## |
-_ASBOX |
+## ---------------- ##" |
echo |
# The following way of writing the cache mishandles newlines in values, |
( |
@@ -2240,11 +2246,9 @@ |
) |
echo |
- cat <<\_ASBOX |
-## ----------------- ## |
+ $as_echo "## ----------------- ## |
## Output variables. ## |
-## ----------------- ## |
-_ASBOX |
+## ----------------- ##" |
echo |
for ac_var in $ac_subst_vars |
do |
@@ -2257,11 +2261,9 @@ |
echo |
if test -n "$ac_subst_files"; then |
- cat <<\_ASBOX |
-## ------------------- ## |
+ $as_echo "## ------------------- ## |
## File substitutions. ## |
-## ------------------- ## |
-_ASBOX |
+## ------------------- ##" |
echo |
for ac_var in $ac_subst_files |
do |
@@ -2275,11 +2277,9 @@ |
fi |
if test -s confdefs.h; then |
- cat <<\_ASBOX |
-## ----------- ## |
+ $as_echo "## ----------- ## |
## confdefs.h. ## |
-## ----------- ## |
-_ASBOX |
+## ----------- ##" |
echo |
cat confdefs.h |
echo |
@@ -2334,7 +2334,12 @@ |
ac_site_file1=NONE |
ac_site_file2=NONE |
if test -n "$CONFIG_SITE"; then |
- ac_site_file1=$CONFIG_SITE |
+ # We do not want a PATH search for config.site. |
+ case $CONFIG_SITE in #(( |
+ -*) ac_site_file1=./$CONFIG_SITE;; |
+ */*) ac_site_file1=$CONFIG_SITE;; |
+ *) ac_site_file1=./$CONFIG_SITE;; |
+ esac |
elif test "x$prefix" != xNONE; then |
ac_site_file1=$prefix/share/config.site |
ac_site_file2=$prefix/etc/config.site |
@@ -2349,7 +2354,11 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
$as_echo "$as_me: loading site script $ac_site_file" >&6;} |
sed 's/^/| /' "$ac_site_file" >&5 |
- . "$ac_site_file" |
+ . "$ac_site_file" \ |
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
+as_fn_error $? "failed to load site script $ac_site_file |
+See \`config.log' for more details" "$LINENO" 5; } |
fi |
done |
@@ -2426,7 +2435,7 @@ |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
fi |
## -------------------- ## |
## Main body of script. ## |
@@ -2442,16 +2451,22 @@ |
#AC_CONFIG_SRCDIR([src/main.c]) |
ac_aux_dir= |
for ac_dir in config "$srcdir"/config; do |
- for ac_t in install-sh install.sh shtool; do |
- if test -f "$ac_dir/$ac_t"; then |
- ac_aux_dir=$ac_dir |
- ac_install_sh="$ac_aux_dir/$ac_t -c" |
- break 2 |
- fi |
- done |
+ if test -f "$ac_dir/install-sh"; then |
+ ac_aux_dir=$ac_dir |
+ ac_install_sh="$ac_aux_dir/install-sh -c" |
+ break |
+ elif test -f "$ac_dir/install.sh"; then |
+ ac_aux_dir=$ac_dir |
+ ac_install_sh="$ac_aux_dir/install.sh -c" |
+ break |
+ elif test -f "$ac_dir/shtool"; then |
+ ac_aux_dir=$ac_dir |
+ ac_install_sh="$ac_aux_dir/shtool install -c" |
+ break |
+ fi |
done |
if test -z "$ac_aux_dir"; then |
- as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 |
+ 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, |
@@ -2485,7 +2500,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
$as_echo_n "checking for a BSD-compatible install... " >&6; } |
if test -z "$INSTALL"; then |
-if test "${ac_cv_path_install+set}" = set; then : |
+if ${ac_cv_path_install+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
@@ -2572,11 +2587,11 @@ |
' |
case `pwd` in |
*[\\\"\#\$\&\'\`$am_lf]*) |
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
+ 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;; |
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
esac |
# Do `set' in a subshell so we don't clobber the current shell's |
@@ -2598,7 +2613,7 @@ |
# if, for instance, CONFIG_SHELL is bash and it inherits a |
# broken ls alias from the environment. This has actually |
# happened. Such a system could not be considered "sane". |
- as_fn_error "ls -t appears to fail. Make sure there is not a broken |
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
alias in your environment" "$LINENO" 5 |
fi |
@@ -2608,7 +2623,7 @@ |
# Ok. |
: |
else |
- as_fn_error "newly created file is older than distributed files! |
+ as_fn_error $? "newly created file is older than distributed files! |
Check your system clock" "$LINENO" 5 |
fi |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
@@ -2662,7 +2677,7 @@ |
set dummy ${ac_tool_prefix}strip; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_STRIP+set}" = set; then : |
+if ${ac_cv_prog_STRIP+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$STRIP"; then |
@@ -2702,7 +2717,7 @@ |
set dummy strip; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$ac_ct_STRIP"; then |
@@ -2755,7 +2770,7 @@ |
{ $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 : |
+ if ${ac_cv_path_mkdir+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
@@ -2806,7 +2821,7 @@ |
set dummy $ac_prog; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_AWK+set}" = set; then : |
+if ${ac_cv_prog_AWK+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$AWK"; then |
@@ -2846,7 +2861,7 @@ |
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
set x ${MAKE-make} |
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat >conftest.make <<\_ACEOF |
@@ -2854,7 +2869,7 @@ |
all: |
@echo '@@@%%%=$(MAKE)=@@@%%%' |
_ACEOF |
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
case `${MAKE-make} -f conftest.make 2>/dev/null` in |
*@@@%%%=?*=@@@%%%*) |
eval ac_cv_prog_make_${ac_make}_set=yes;; |
@@ -2888,7 +2903,7 @@ |
am__isrc=' -I$(srcdir)' |
# test to see if srcdir already configured |
if test -f $srcdir/config.status; then |
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
fi |
fi |
@@ -2904,7 +2919,7 @@ |
# Define the identity of the package. |
PACKAGE='yasm' |
- VERSION='1.1.0' |
+ VERSION='1.2.0' |
cat >>confdefs.h <<_ACEOF |
@@ -2968,13 +2983,6 @@ |
- |
-$as_echo "#define PACKAGE_INTVER \"1.1.0\"" >>confdefs.h |
- |
- |
-$as_echo "#define PACKAGE_BUILD \"2352\"" >>confdefs.h |
- |
- |
# |
# autoconf command-line options |
# |
@@ -2983,7 +2991,7 @@ |
enableval=$enable_debug; case "${enableval}" in |
yes) debugging="yes" ;; |
no) debugging="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; |
esac |
fi |
@@ -2993,7 +3001,7 @@ |
enableval=$enable_warnerror; case "${enableval}" in |
yes) warnerror="yes" ;; |
no) warnerror="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;; |
esac |
fi |
@@ -3003,7 +3011,7 @@ |
enableval=$enable_profiling; case "${enableval}" in |
yes) profiling="yes" ;; |
no) profiling="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;; |
esac |
fi |
@@ -3013,7 +3021,7 @@ |
enableval=$enable_gcov; case "${enableval}" in |
yes) gcov="yes" ;; |
no) gcov="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;; |
esac |
fi |
@@ -3023,7 +3031,7 @@ |
enableval=$enable_python; case "${enableval}" in |
yes) enable_python="yes" ;; |
no) enable_python="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; |
esac |
else |
enable_python="auto" |
@@ -3035,7 +3043,7 @@ |
enableval=$enable_python_bindings; case "${enableval}" in |
yes) enable_python_bindings="yes" ;; |
no) enable_python_bindings="no" ;; |
- *) as_fn_error "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;; |
esac |
else |
enable_python_bindings="no" |
@@ -3117,7 +3125,7 @@ |
set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_CC+set}" = set; then : |
+if ${ac_cv_prog_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$CC"; then |
@@ -3157,7 +3165,7 @@ |
set dummy gcc; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
+if ${ac_cv_prog_ac_ct_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$ac_ct_CC"; then |
@@ -3210,7 +3218,7 @@ |
set dummy ${ac_tool_prefix}cc; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_CC+set}" = set; then : |
+if ${ac_cv_prog_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$CC"; then |
@@ -3250,7 +3258,7 @@ |
set dummy cc; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_CC+set}" = set; then : |
+if ${ac_cv_prog_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$CC"; then |
@@ -3309,7 +3317,7 @@ |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_CC+set}" = set; then : |
+if ${ac_cv_prog_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$CC"; then |
@@ -3353,7 +3361,7 @@ |
set dummy $ac_prog; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
+if ${ac_cv_prog_ac_ct_CC+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$ac_ct_CC"; then |
@@ -3407,8 +3415,8 @@ |
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-as_fn_error "no acceptable C compiler found in \$PATH |
-See \`config.log' for more details." "$LINENO" 5; } |
+as_fn_error $? "no acceptable C compiler found in \$PATH |
+See \`config.log' for more details" "$LINENO" 5; } |
# Provide some information about the compiler. |
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
@@ -3522,9 +3530,8 @@ |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-{ as_fn_set_status 77 |
-as_fn_error "C compiler cannot create executables |
-See \`config.log' for more details." "$LINENO" 5; }; } |
+as_fn_error 77 "C compiler cannot create executables |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
$as_echo "yes" >&6; } |
@@ -3566,8 +3573,8 @@ |
else |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-as_fn_error "cannot compute suffix of executables: cannot compile and link |
-See \`config.log' for more details." "$LINENO" 5; } |
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
+See \`config.log' for more details" "$LINENO" 5; } |
fi |
rm -f conftest conftest$ac_cv_exeext |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
@@ -3624,9 +3631,9 @@ |
else |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-as_fn_error "cannot run C compiled programs. |
+as_fn_error $? "cannot run C compiled programs. |
If you meant to cross compile, use \`--host'. |
-See \`config.log' for more details." "$LINENO" 5; } |
+See \`config.log' for more details" "$LINENO" 5; } |
fi |
fi |
fi |
@@ -3637,7 +3644,7 @@ |
ac_clean_files=$ac_clean_files_save |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
$as_echo_n "checking for suffix of object files... " >&6; } |
-if test "${ac_cv_objext+set}" = set; then : |
+if ${ac_cv_objext+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -3677,8 +3684,8 @@ |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-as_fn_error "cannot compute suffix of object files: cannot compile |
-See \`config.log' for more details." "$LINENO" 5; } |
+as_fn_error $? "cannot compute suffix of object files: cannot compile |
+See \`config.log' for more details" "$LINENO" 5; } |
fi |
rm -f conftest.$ac_cv_objext conftest.$ac_ext |
fi |
@@ -3688,7 +3695,7 @@ |
ac_objext=$OBJEXT |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
-if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
+if ${ac_cv_c_compiler_gnu+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -3725,7 +3732,7 @@ |
ac_save_CFLAGS=$CFLAGS |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
$as_echo_n "checking whether $CC accepts -g... " >&6; } |
-if test "${ac_cv_prog_cc_g+set}" = set; then : |
+if ${ac_cv_prog_cc_g+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_save_c_werror_flag=$ac_c_werror_flag |
@@ -3803,7 +3810,7 @@ |
fi |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
-if test "${ac_cv_prog_cc_c89+set}" = set; then : |
+if ${ac_cv_prog_cc_c89+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_cv_prog_cc_c89=no |
@@ -3902,7 +3909,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
$as_echo_n "checking dependency style of $depcc... " >&6; } |
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
+if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
@@ -4037,7 +4044,7 @@ |
CPP= |
fi |
if test -z "$CPP"; then |
- if test "${ac_cv_prog_CPP+set}" = set; then : |
+ if ${ac_cv_prog_CPP+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
# Double quotes because CPP needs to be expanded |
@@ -4067,7 +4074,7 @@ |
# Broken: fails on valid input. |
continue |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
# OK, works on sane cases. Now check whether nonexistent headers |
# can be detected and how. |
@@ -4083,11 +4090,11 @@ |
ac_preproc_ok=: |
break |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
done |
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.i conftest.err conftest.$ac_ext |
if $ac_preproc_ok; then : |
break |
fi |
@@ -4126,7 +4133,7 @@ |
# Broken: fails on valid input. |
continue |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
# OK, works on sane cases. Now check whether nonexistent headers |
# can be detected and how. |
@@ -4142,18 +4149,18 @@ |
ac_preproc_ok=: |
break |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
done |
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.i conftest.err conftest.$ac_ext |
if $ac_preproc_ok; then : |
else |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-as_fn_error "C preprocessor \"$CPP\" fails sanity check |
-See \`config.log' for more details." "$LINENO" 5; } |
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
+See \`config.log' for more details" "$LINENO" 5; } |
fi |
ac_ext=c |
@@ -4168,7 +4175,7 @@ |
*) : |
{ $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 : |
+if ${ac_cv_prog_cc_c99+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_cv_prog_cc_c99=no |
@@ -4343,7 +4350,7 @@ |
else |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
-if test "${ac_cv_prog_cc_c89+set}" = set; then : |
+if ${ac_cv_prog_cc_c89+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_cv_prog_cc_c89=no |
@@ -4439,7 +4446,7 @@ |
esac |
{ $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 : |
+ if ${ac_cv_prog_cc_stdc+:} false; then : |
$as_echo_n "(cached) " >&6 |
fi |
@@ -4475,7 +4482,7 @@ |
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 : |
+if ${ac_cv_prog_AR+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$AR"; then |
@@ -4519,7 +4526,7 @@ |
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 : |
+if ${ac_cv_prog_ac_ct_AR+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$ac_ct_AR"; then |
@@ -4573,7 +4580,7 @@ |
set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_RANLIB+set}" = set; then : |
+if ${ac_cv_prog_RANLIB+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$RANLIB"; then |
@@ -4613,7 +4620,7 @@ |
set dummy ranlib; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$ac_ct_RANLIB"; then |
@@ -4663,7 +4670,7 @@ |
# REQUIRE a standard (ANSI/ISO) C compiler |
if test "$ac_cv_prog_cc_stdc" = no; then |
- as_fn_error "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5 |
+ 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) |
@@ -4673,7 +4680,7 @@ |
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_XMLTO+set}" = set; then : |
+if ${ac_cv_prog_XMLTO+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -n "$XMLTO"; then |
@@ -4761,7 +4768,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
$as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
-if test "${ac_cv_path_GREP+set}" = set; then : |
+if ${ac_cv_path_GREP+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -z "$GREP"; then |
@@ -4810,7 +4817,7 @@ |
done |
IFS=$as_save_IFS |
if test -z "$ac_cv_path_GREP"; then |
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
fi |
else |
ac_cv_path_GREP=$GREP |
@@ -4824,7 +4831,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
$as_echo_n "checking for egrep... " >&6; } |
-if test "${ac_cv_path_EGREP+set}" = set; then : |
+if ${ac_cv_path_EGREP+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
@@ -4876,7 +4883,7 @@ |
done |
IFS=$as_save_IFS |
if test -z "$ac_cv_path_EGREP"; then |
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
fi |
else |
ac_cv_path_EGREP=$EGREP |
@@ -4891,7 +4898,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
$as_echo_n "checking for ANSI C header files... " >&6; } |
-if test "${ac_cv_header_stdc+set}" = set; then : |
+if ${ac_cv_header_stdc+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -5008,8 +5015,7 @@ |
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
" |
-eval as_val=\$$as_ac_Header |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5023,8 +5029,7 @@ |
do : |
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
-eval as_val=\$$as_ac_Header |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5036,7 +5041,7 @@ |
# REQUIRE standard C headers |
if test "$ac_cv_header_stdc" != yes; then |
- as_fn_error "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5 |
+ as_fn_error $? "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5 |
fi |
# |
@@ -5044,7 +5049,7 @@ |
# |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 |
$as_echo_n "checking for an ANSI C-conforming const... " >&6; } |
-if test "${ac_cv_c_const+set}" = set; then : |
+if ${ac_cv_c_const+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -5124,7 +5129,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 |
$as_echo_n "checking for inline... " >&6; } |
-if test "${ac_cv_c_inline+set}" = set; then : |
+if ${ac_cv_c_inline+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_cv_c_inline=no |
@@ -5181,7 +5186,7 @@ |
fi |
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" |
-if test "x$ac_cv_type_size_t" = x""yes; then : |
+if test "x$ac_cv_type_size_t" = xyes; then : |
else |
@@ -5197,7 +5202,7 @@ |
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 : |
+if ${ac_cv_header_stdint_t+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -5253,7 +5258,7 @@ |
{ $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 : |
+if ${ac_cv_header_stdint_x+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -5265,7 +5270,7 @@ |
unset ac_cv_type_uint64_t |
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 : |
+if test "x$ac_cv_type_uintptr_t" = xyes; then : |
ac_cv_header_stdint_x=$i |
else |
continue |
@@ -5273,7 +5278,7 @@ |
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 : |
+if test "x$ac_cv_type_uint64_t" = xyes; then : |
and64="/uint64_t" |
else |
and64="" |
@@ -5293,7 +5298,7 @@ |
{ $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 : |
+if ${ac_cv_header_stdint_o+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -5305,7 +5310,7 @@ |
unset ac_cv_type_uint64_t |
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 : |
+if test "x$ac_cv_type_uint32_t" = xyes; then : |
ac_cv_header_stdint_o=$i |
else |
continue |
@@ -5313,7 +5318,7 @@ |
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 : |
+if test "x$ac_cv_type_uint64_t" = xyes; then : |
and64="/uint64_t" |
else |
and64="" |
@@ -5335,7 +5340,7 @@ |
{ $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 : |
+if ${ac_cv_header_stdint_u+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -5347,7 +5352,7 @@ |
unset ac_cv_type_u_int64_t |
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 : |
+if test "x$ac_cv_type_u_int32_t" = xyes; then : |
ac_cv_header_stdint_u=$i |
else |
continue |
@@ -5355,7 +5360,7 @@ |
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 : |
+if test "x$ac_cv_type_u_int64_t" = xyes; then : |
and64="/u_int64_t" |
else |
and64="" |
@@ -5384,7 +5389,7 @@ |
# This bug is HP SR number 8606223364. |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 |
$as_echo_n "checking size of char... " >&6; } |
-if test "${ac_cv_sizeof_char+set}" = set; then : |
+if ${ac_cv_sizeof_char+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : |
@@ -5393,9 +5398,8 @@ |
if test "$ac_cv_type_char" = yes; then |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-{ as_fn_set_status 77 |
-as_fn_error "cannot compute sizeof (char) |
-See \`config.log' for more details." "$LINENO" 5; }; } |
+as_fn_error 77 "cannot compute sizeof (char) |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
ac_cv_sizeof_char=0 |
fi |
@@ -5418,7 +5422,7 @@ |
# This bug is HP SR number 8606223364. |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 |
$as_echo_n "checking size of short... " >&6; } |
-if test "${ac_cv_sizeof_short+set}" = set; then : |
+if ${ac_cv_sizeof_short+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : |
@@ -5427,9 +5431,8 @@ |
if test "$ac_cv_type_short" = yes; then |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-{ as_fn_set_status 77 |
-as_fn_error "cannot compute sizeof (short) |
-See \`config.log' for more details." "$LINENO" 5; }; } |
+as_fn_error 77 "cannot compute sizeof (short) |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
ac_cv_sizeof_short=0 |
fi |
@@ -5452,7 +5455,7 @@ |
# This bug is HP SR number 8606223364. |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 |
$as_echo_n "checking size of int... " >&6; } |
-if test "${ac_cv_sizeof_int+set}" = set; then : |
+if ${ac_cv_sizeof_int+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : |
@@ -5461,9 +5464,8 @@ |
if test "$ac_cv_type_int" = yes; then |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-{ as_fn_set_status 77 |
-as_fn_error "cannot compute sizeof (int) |
-See \`config.log' for more details." "$LINENO" 5; }; } |
+as_fn_error 77 "cannot compute sizeof (int) |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
ac_cv_sizeof_int=0 |
fi |
@@ -5486,7 +5488,7 @@ |
# This bug is HP SR number 8606223364. |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 |
$as_echo_n "checking size of long... " >&6; } |
-if test "${ac_cv_sizeof_long+set}" = set; then : |
+if ${ac_cv_sizeof_long+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : |
@@ -5495,9 +5497,8 @@ |
if test "$ac_cv_type_long" = yes; then |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
-{ as_fn_set_status 77 |
-as_fn_error "cannot compute sizeof (long) |
-See \`config.log' for more details." "$LINENO" 5; }; } |
+as_fn_error 77 "cannot compute sizeof (long) |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
ac_cv_sizeof_long=0 |
fi |
@@ -5520,7 +5521,7 @@ |
# This bug is HP SR number 8606223364. |
{ $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 : |
+if ${ac_cv_sizeof_voidp+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : |
@@ -5529,9 +5530,8 @@ |
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; }; } |
+as_fn_error 77 "cannot compute sizeof (void*) |
+See \`config.log' for more details" "$LINENO" 5; } |
else |
ac_cv_sizeof_voidp=0 |
fi |
@@ -5600,19 +5600,19 @@ |
unset ac_cv_type_int_fast32_t |
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 : |
+if test "x$ac_cv_type_int_least32_t" = xyes; then : |
fi |
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 : |
+if test "x$ac_cv_type_int_fast32_t" = xyes; then : |
fi |
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 : |
+if test "x$ac_cv_type_intmax_t" = xyes; then : |
fi |
@@ -5640,8 +5640,7 @@ |
do : |
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
-eval as_val=\$$as_ac_var |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5653,8 +5652,7 @@ |
do : |
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
-eval as_val=\$$as_ac_var |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5666,8 +5664,7 @@ |
do : |
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
-eval as_val=\$$as_ac_var |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5680,8 +5677,7 @@ |
do : |
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
-eval as_val=\$$as_ac_var |
- if test "x$as_val" = x""yes; then : |
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
cat >>confdefs.h <<_ACEOF |
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
_ACEOF |
@@ -5747,7 +5743,7 @@ |
set dummy msgfmt; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_path_MSGFMT+set}" = set; then : |
+if ${ac_cv_path_MSGFMT+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
case "$MSGFMT" in |
@@ -5788,7 +5784,7 @@ |
set dummy gmsgfmt; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_path_GMSGFMT+set}" = set; then : |
+if ${ac_cv_path_GMSGFMT+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
case $GMSGFMT in |
@@ -5870,7 +5866,7 @@ |
set dummy xgettext; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_path_XGETTEXT+set}" = set; then : |
+if ${ac_cv_path_XGETTEXT+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
case "$XGETTEXT" in |
@@ -5948,7 +5944,7 @@ |
set dummy msgmerge; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_path_MSGMERGE+set}" = set; then : |
+if ${ac_cv_path_MSGMERGE+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
case "$MSGMERGE" in |
@@ -6012,27 +6008,27 @@ |
# Make sure we can run config.sub. |
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
$as_echo_n "checking build system type... " >&6; } |
-if test "${ac_cv_build+set}" = set; then : |
+if ${ac_cv_build+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
ac_build_alias=$build_alias |
test "x$ac_build_alias" = x && |
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
test "x$ac_build_alias" = x && |
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
fi |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
$as_echo "$ac_cv_build" >&6; } |
case $ac_cv_build in |
*-*-*) ;; |
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
esac |
build=$ac_cv_build |
ac_save_IFS=$IFS; IFS='-' |
@@ -6050,14 +6046,14 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
$as_echo_n "checking host system type... " >&6; } |
-if test "${ac_cv_host+set}" = set; then : |
+if ${ac_cv_host+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test "x$host_alias" = x; then |
ac_cv_host=$ac_cv_build |
else |
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
fi |
fi |
@@ -6065,7 +6061,7 @@ |
$as_echo "$ac_cv_host" >&6; } |
case $ac_cv_host in |
*-*-*) ;; |
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
esac |
host=$ac_cv_host |
ac_save_IFS=$IFS; IFS='-' |
@@ -6141,7 +6137,7 @@ |
{ $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 : |
+if ${acl_cv_path_LD+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test -z "$LD"; then |
@@ -6175,10 +6171,10 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
$as_echo "no" >&6; } |
fi |
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
-if test "${acl_cv_prog_gnu_ld+set}" = set; then : |
+if ${acl_cv_prog_gnu_ld+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
@@ -6198,7 +6194,7 @@ |
{ $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 : |
+if ${acl_cv_rpath+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -6709,11 +6705,85 @@ |
- gt_INTL_MACOSX |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 |
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } |
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+else |
+ gt_save_LIBS="$LIBS" |
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
+/* end confdefs.h. */ |
+#include <CoreFoundation/CFPreferences.h> |
+int |
+main () |
+{ |
+CFPreferencesCopyAppValue(NULL, NULL) |
+ ; |
+ return 0; |
+} |
+_ACEOF |
+if ac_fn_c_try_link "$LINENO"; then : |
+ gt_cv_func_CFPreferencesCopyAppValue=yes |
+else |
+ gt_cv_func_CFPreferencesCopyAppValue=no |
+fi |
+rm -f core conftest.err conftest.$ac_objext \ |
+ conftest$ac_exeext conftest.$ac_ext |
+ LIBS="$gt_save_LIBS" |
+fi |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 |
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } |
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h |
+ fi |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 |
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } |
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+else |
+ gt_save_LIBS="$LIBS" |
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
+/* end confdefs.h. */ |
+#include <CoreFoundation/CFLocale.h> |
+int |
+main () |
+{ |
+CFLocaleCopyCurrent(); |
+ ; |
+ return 0; |
+} |
+_ACEOF |
+if ac_fn_c_try_link "$LINENO"; then : |
+ gt_cv_func_CFLocaleCopyCurrent=yes |
+else |
+ gt_cv_func_CFLocaleCopyCurrent=no |
+fi |
+rm -f core conftest.err conftest.$ac_objext \ |
+ conftest$ac_exeext conftest.$ac_ext |
+ LIBS="$gt_save_LIBS" |
+fi |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 |
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } |
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h |
+ |
+ 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= |
@@ -6748,7 +6818,7 @@ |
{ $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 : |
+if eval \${$gt_func_gnugettext_libc+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -6811,7 +6881,7 @@ |
{ $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 : |
+if ${am_cv_func_iconv+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -6868,7 +6938,7 @@ |
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 : |
+if ${am_cv_func_iconv_works+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
@@ -7419,7 +7489,7 @@ |
{ $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 : |
+if eval \${$gt_func_gnugettext_libintl+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
gt_save_CPPFLAGS="$CPPFLAGS" |
@@ -7605,7 +7675,7 @@ |
{ $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 : |
+if ${yasm_cv_header_gnulib+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -7767,7 +7837,7 @@ |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
$as_echo "yes" >&6; } |
else |
- as_fn_error "too old" "$LINENO" 5 |
+ as_fn_error $? "too old" "$LINENO" 5 |
fi |
am_display_PYTHON=$PYTHON |
else |
@@ -7775,11 +7845,11 @@ |
# VERSION. |
{ $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 : |
+if ${am_cv_pathless_PYTHON+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
- 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 |
+ for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do |
test "$am_cv_pathless_PYTHON" = none && break |
prog="import sys |
# split strings by '.' and convert to numeric. Append some zeros |
@@ -7809,7 +7879,7 @@ |
set dummy $am_cv_pathless_PYTHON; ac_word=$2 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
$as_echo_n "checking for $ac_word... " >&6; } |
-if test "${ac_cv_path_PYTHON+set}" = set; then : |
+if ${ac_cv_path_PYTHON+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
case $PYTHON in |
@@ -7858,7 +7928,7 @@ |
{ $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 : |
+if ${am_cv_python_version+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` |
@@ -7877,7 +7947,7 @@ |
{ $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 : |
+if ${am_cv_python_platform+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` |
@@ -7891,7 +7961,7 @@ |
{ $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 : |
+if ${am_cv_python_pythondir+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test "x$prefix" = xNONE |
@@ -7929,7 +7999,7 @@ |
{ $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 : |
+if ${am_cv_python_pyexecdir+:} false; then : |
$as_echo_n "(cached) " >&6 |
else |
if test "x$exec_prefix" = xNONE |
@@ -7978,7 +8048,7 @@ |
if test x$have_python = xno ; then |
if test x$enable_python = xyes ; then |
- as_fn_error "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5 |
+ as_fn_error $? "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5 |
else |
{ $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;} |
@@ -7999,14 +8069,19 @@ |
$as_echo_n "checking for Cython >= 0.11.3... " >&6; } |
prog="import sys |
from Cython.Compiler.Version import version |
+def get_int(arg): |
+ try: |
+ return int(arg) |
+ except ValueError: |
+ return 0 |
# split strings by '.' and convert to numeric. Append some zeros |
# because we need at least 4 digits for the hex conversion. |
-ver = map(int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0] |
+ver = map(get_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] |
+for i in range(0, 4): verhex = (verhex << 8) + ver[i] |
+minver = map(get_int, '0.11.3'.split('.')) + [0, 0, 0] |
minverhex = 0 |
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] |
+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i] |
sys.exit(verhex < minverhex)" |
if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 |
($PYTHON -c "$prog") >&5 2>&5 |
@@ -8047,7 +8122,7 @@ |
$as_echo "not found" >&6; } |
have_python_headers=no |
fi |
-rm -f conftest.err conftest.$ac_ext |
+rm -f conftest.err conftest.i conftest.$ac_ext |
CPPFLAGS="$save_CPPFLAGS" |
@@ -8058,7 +8133,7 @@ |
if test x$have_python_bindings = xno ; then |
if test x$enable_python_bindings = xyes ; then |
- 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 |
+ 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 |
{ $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;} |
@@ -8149,10 +8224,21 @@ |
:end' >>confcache |
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else |
if test -w "$cache_file"; then |
- test "x$cache_file" != "x/dev/null" && |
+ if test "x$cache_file" != "x/dev/null"; then |
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 |
$as_echo "$as_me: updating cache $cache_file" >&6;} |
- cat confcache >$cache_file |
+ if test ! -f "$cache_file" || test -h "$cache_file"; then |
+ cat confcache >"$cache_file" |
+ else |
+ case $cache_file in #( |
+ */* | ?:*) |
+ mv -f confcache "$cache_file"$$ && |
+ mv -f "$cache_file"$$ "$cache_file" ;; #( |
+ *) |
+ mv -f confcache "$cache_file" ;; |
+ esac |
+ fi |
+ fi |
else |
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 |
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
@@ -8168,6 +8254,7 @@ |
ac_libobjs= |
ac_ltlibobjs= |
+U= |
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
# 1. Remove the extension, and $U if already installed. |
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
@@ -8191,31 +8278,31 @@ |
fi |
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. |
+ 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 |
- as_fn_error "conditional \"AMDEP\" was never defined. |
+ as_fn_error $? "conditional \"AMDEP\" was never defined. |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
fi |
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
- as_fn_error "conditional \"am__fastdepCC\" was never defined. |
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
fi |
if test -z "${BUILD_MAN_TRUE}" && test -z "${BUILD_MAN_FALSE}"; then |
- as_fn_error "conditional \"BUILD_MAN\" was never defined. |
+ 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 |
- as_fn_error "conditional \"HAVE_PYTHON\" was never defined. |
+ 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 |
- as_fn_error "conditional \"HAVE_PYTHON_BINDINGS\" was never defined. |
+ 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} |
+: "${CONFIG_STATUS=./config.status}" |
ac_write_fail=0 |
ac_clean_files_save=$ac_clean_files |
ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
@@ -8316,6 +8403,7 @@ |
IFS=" "" $as_nl" |
# Find who we are. Look in the path if we contain no directory separator. |
+as_myself= |
case $0 in #(( |
*[\\/]* ) as_myself=$0 ;; |
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
@@ -8361,19 +8449,19 @@ |
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
-# as_fn_error ERROR [LINENO LOG_FD] |
-# --------------------------------- |
+# as_fn_error STATUS ERROR [LINENO LOG_FD] |
+# ---------------------------------------- |
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
-# script with status $?, using 1 if that was 0. |
+# script with STATUS, using 1 if that was 0. |
as_fn_error () |
{ |
- as_status=$?; test $as_status -eq 0 && as_status=1 |
- if test "$3"; then |
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
+ as_status=$1; test $as_status -eq 0 && as_status=1 |
+ if test "$4"; then |
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
fi |
- $as_echo "$as_me: error: $1" >&2 |
+ $as_echo "$as_me: error: $2" >&2 |
as_fn_exit $as_status |
} # as_fn_error |
@@ -8569,7 +8657,7 @@ |
test -d "$as_dir" && break |
done |
test -z "$as_dirs" || eval "mkdir $as_dirs" |
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
} # as_fn_mkdir_p |
@@ -8622,8 +8710,8 @@ |
# 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 1.1.0, which was |
-generated by GNU Autoconf 2.65. Invocation command line was |
+This file was extended by yasm $as_me 1.2.0, which was |
+generated by GNU Autoconf 2.68. Invocation command line was |
CONFIG_FILES = $CONFIG_FILES |
CONFIG_HEADERS = $CONFIG_HEADERS |
@@ -8647,9 +8735,9 @@ |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
# Files that config.status was made for. |
-config_files="`echo $ac_config_files`" |
-config_headers="`echo $ac_config_headers`" |
-config_commands="`echo $ac_config_commands`" |
+config_files="$ac_config_files" |
+config_headers="$ac_config_headers" |
+config_commands="$ac_config_commands" |
_ACEOF |
@@ -8688,11 +8776,11 @@ |
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 1.1.0 |
-configured by $0, generated by GNU Autoconf 2.65, |
+yasm config.status 1.2.0 |
+configured by $0, generated by GNU Autoconf 2.68, |
with options \\"\$ac_cs_config\\" |
-Copyright (C) 2009 Free Software Foundation, Inc. |
+Copyright (C) 2010 Free Software Foundation, Inc. |
This config.status script is free software; the Free Software Foundation |
gives unlimited permission to copy, distribute and modify it." |
@@ -8710,11 +8798,16 @@ |
while test $# != 0 |
do |
case $1 in |
- --*=*) |
+ --*=?*) |
ac_option=`expr "X$1" : 'X\([^=]*\)='` |
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
ac_shift=: |
;; |
+ --*=) |
+ ac_option=`expr "X$1" : 'X\([^=]*\)='` |
+ ac_optarg= |
+ ac_shift=: |
+ ;; |
*) |
ac_option=$1 |
ac_optarg=$2 |
@@ -8736,6 +8829,7 @@ |
$ac_shift |
case $ac_optarg in |
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
+ '') as_fn_error $? "missing file argument" ;; |
esac |
as_fn_append CONFIG_FILES " '$ac_optarg'" |
ac_need_defaults=false;; |
@@ -8748,7 +8842,7 @@ |
ac_need_defaults=false;; |
--he | --h) |
# Conflict between --help and --header |
- as_fn_error "ambiguous option: \`$1' |
+ as_fn_error $? "ambiguous option: \`$1' |
Try \`$0 --help' for more information.";; |
--help | --hel | -h ) |
$as_echo "$ac_cs_usage"; exit ;; |
@@ -8757,7 +8851,7 @@ |
ac_cs_silent=: ;; |
# This is an error. |
- -*) as_fn_error "unrecognized option: \`$1' |
+ -*) as_fn_error $? "unrecognized option: \`$1' |
Try \`$0 --help' for more information." ;; |
*) as_fn_append ac_config_targets " $1" |
@@ -8843,7 +8937,7 @@ |
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; |
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
esac |
done |
@@ -8866,9 +8960,10 @@ |
# after its creation but before its name has been assigned to `$tmp'. |
$debug || |
{ |
- tmp= |
+ tmp= ac_tmp= |
trap 'exit_status=$? |
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status |
+ : "${ac_tmp:=$tmp}" |
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status |
' 0 |
trap 'as_fn_exit 1' 1 2 13 15 |
} |
@@ -8876,12 +8971,13 @@ |
{ |
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && |
- test -n "$tmp" && test -d "$tmp" |
+ test -d "$tmp" |
} || |
{ |
tmp=./conf$$-$RANDOM |
(umask 077 && mkdir "$tmp") |
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 |
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
+ac_tmp=$tmp |
# Set up the scripts for CONFIG_FILES section. |
# No need to generate them if there are no CONFIG_FILES. |
@@ -8898,12 +8994,12 @@ |
fi |
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
- ac_cs_awk_cr='\r' |
+ ac_cs_awk_cr='\\r' |
else |
ac_cs_awk_cr=$ac_cr |
fi |
-echo 'BEGIN {' >"$tmp/subs1.awk" && |
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && |
_ACEOF |
@@ -8912,18 +9008,18 @@ |
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
echo "_ACEOF" |
} >conf$$subs.sh || |
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` |
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
ac_delim='%!_!# ' |
for ac_last_try in false false false false false :; do |
. ./conf$$subs.sh || |
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
if test $ac_delim_n = $ac_delim_num; then |
break |
elif $ac_last_try; then |
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
else |
ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
fi |
@@ -8931,7 +9027,7 @@ |
rm -f conf$$subs.sh |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && |
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && |
_ACEOF |
sed -n ' |
h |
@@ -8979,7 +9075,7 @@ |
rm -f conf$$subs.awk |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
_ACAWK |
-cat >>"\$tmp/subs1.awk" <<_ACAWK && |
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && |
for (key in S) S_is_set[key] = 1 |
FS = "" |
@@ -9011,21 +9107,29 @@ |
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" |
else |
cat |
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
- || as_fn_error "could not setup config files machinery" "$LINENO" 5 |
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ |
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
_ACEOF |
-# VPATH may cause trouble with some makes, so we remove $(srcdir), |
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
# trailing colons and then remove the whole line if VPATH becomes empty |
# (actually we leave an empty line to preserve line numbers). |
if test "x$srcdir" = x.; then |
- ac_vpsub='/^[ ]*VPATH[ ]*=/{ |
-s/:*\$(srcdir):*/:/ |
-s/:*\${srcdir}:*/:/ |
-s/:*@srcdir@:*/:/ |
-s/^\([^=]*=[ ]*\):*/\1/ |
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
+h |
+s/// |
+s/^/:/ |
+s/[ ]*$/:/ |
+s/:\$(srcdir):/:/g |
+s/:\${srcdir}:/:/g |
+s/:@srcdir@:/:/g |
+s/^:*// |
s/:*$// |
+x |
+s/\(=[ ]*\).*/\1/ |
+G |
+s/\n// |
s/^[^=]*=[ ]*$// |
}' |
fi |
@@ -9037,7 +9141,7 @@ |
# No need to generate them if there are no CONFIG_HEADERS. |
# This happens for instance with `./config.status Makefile'. |
if test -n "$CONFIG_HEADERS"; then |
-cat >"$tmp/defines.awk" <<\_ACAWK || |
+cat >"$ac_tmp/defines.awk" <<\_ACAWK || |
BEGIN { |
_ACEOF |
@@ -9049,11 +9153,11 @@ |
# handling of long lines. |
ac_delim='%!_!# ' |
for ac_last_try in false false :; do |
- ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
- if test -z "$ac_t"; then |
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` |
+ if test -z "$ac_tt"; then |
break |
elif $ac_last_try; then |
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 |
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
else |
ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
fi |
@@ -9138,7 +9242,7 @@ |
_ACAWK |
_ACEOF |
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
- as_fn_error "could not setup config headers machinery" "$LINENO" 5 |
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
fi # test -n "$CONFIG_HEADERS" |
@@ -9151,7 +9255,7 @@ |
esac |
case $ac_mode$ac_tag in |
:[FHL]*:*);; |
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; |
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; |
:[FH]-) ac_tag=-:-;; |
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
esac |
@@ -9170,7 +9274,7 @@ |
for ac_f |
do |
case $ac_f in |
- -) ac_f="$tmp/stdin";; |
+ -) ac_f="$ac_tmp/stdin";; |
*) # Look for the file first in the build tree, then in the source tree |
# (if the path is not absolute). The absolute path cannot be DOS-style, |
# because $ac_f cannot contain `:'. |
@@ -9179,7 +9283,7 @@ |
[\\/$]*) false;; |
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
esac || |
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
esac |
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
as_fn_append ac_file_inputs " '$ac_f'" |
@@ -9205,8 +9309,8 @@ |
esac |
case $ac_tag in |
- *:-:* | *:-) cat >"$tmp/stdin" \ |
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; |
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ |
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
esac |
;; |
esac |
@@ -9342,23 +9446,24 @@ |
s&@MKDIR_P@&$ac_MKDIR_P&;t t |
$ac_datarootdir_hack |
" |
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
- || as_fn_error "could not create $ac_file" "$LINENO" 5 |
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ |
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && |
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ |
+ "$ac_tmp/out"`; test -z "$ac_out"; } && |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
-which seems to be undefined. Please make sure it is defined." >&5 |
+which seems to be undefined. Please make sure it is defined" >&5 |
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
-which seems to be undefined. Please make sure it is defined." >&2;} |
+which seems to be undefined. Please make sure it is defined" >&2;} |
- rm -f "$tmp/stdin" |
+ rm -f "$ac_tmp/stdin" |
case $ac_file in |
- -) cat "$tmp/out" && rm -f "$tmp/out";; |
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; |
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; |
esac \ |
- || as_fn_error "could not create $ac_file" "$LINENO" 5 |
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
;; |
:H) |
# |
@@ -9367,21 +9472,21 @@ |
if test x"$ac_file" != x-; then |
{ |
$as_echo "/* $configure_input */" \ |
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
- } >"$tmp/config.h" \ |
- || as_fn_error "could not create $ac_file" "$LINENO" 5 |
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" |
+ } >"$ac_tmp/config.h" \ |
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then |
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
$as_echo "$as_me: $ac_file is unchanged" >&6;} |
else |
rm -f "$ac_file" |
- mv "$tmp/config.h" "$ac_file" \ |
- || as_fn_error "could not create $ac_file" "$LINENO" 5 |
+ mv "$ac_tmp/config.h" "$ac_file" \ |
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
fi |
else |
$as_echo "/* $configure_input */" \ |
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
- || as_fn_error "could not create -" "$LINENO" 5 |
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ |
+ || as_fn_error $? "could not create -" "$LINENO" 5 |
fi |
# Compute "$ac_file"'s index in $config_headers. |
_am_arg="$ac_file" |
@@ -10108,7 +10213,7 @@ |
ac_clean_files=$ac_clean_files_save |
test $ac_write_fail = 0 || |
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
# configure is writing to config.log, and then calls config.status. |
@@ -10129,7 +10234,7 @@ |
exec 5>>config.log |
# Use ||, not &&, to avoid exiting from the if with $? = 1, which |
# would make configure fail if this is the last instruction. |
- $ac_cs_success || as_fn_exit $? |
+ $ac_cs_success || as_fn_exit 1 |
fi |
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |