1488 lines
54 KiB
Diff
1488 lines
54 KiB
Diff
diff -Naupr keepalived-1.2.3.orig/configure keepalived-1.2.3/configure
|
||
--- keepalived-1.2.3.orig/configure 2012-07-12 08:09:22.000000000 -0500
|
||
+++ keepalived-1.2.3/configure 2012-07-23 20:19:38.338710461 -0500
|
||
@@ -1,11 +1,11 @@
|
||
#! /bin/sh
|
||
# Guess values for system-dependent variables and create Makefiles.
|
||
-# Generated by GNU Autoconf 2.65.
|
||
+# Generated by GNU Autoconf 2.68.
|
||
#
|
||
#
|
||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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
|
||
@@ -89,6 +89,7 @@ fi
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
+as_myself=
|
||
case $0 in #((
|
||
*[\\/]* ) as_myself=$0 ;;
|
||
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -214,11 +215,18 @@ IFS=$as_save_IFS
|
||
# We cannot yet assume a decent shell, so we have to provide a
|
||
# neutralization value for shells without unset; and this also
|
||
# works around shells that cannot unset nonexistent variables.
|
||
+ # Preserve -v and -x to the replacement shell.
|
||
BASH_ENV=/dev/null
|
||
ENV=/dev/null
|
||
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
||
export CONFIG_SHELL
|
||
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
||
+ case $- in # ((((
|
||
+ *v*x* | *x*v* ) as_opts=-vx ;;
|
||
+ *v* ) as_opts=-v ;;
|
||
+ *x* ) as_opts=-x ;;
|
||
+ * ) as_opts= ;;
|
||
+ esac
|
||
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
||
fi
|
||
|
||
if test x$as_have_required = xno; then :
|
||
@@ -316,7 +324,7 @@ $as_echo X"$as_dir" |
|
||
test -d "$as_dir" && break
|
||
done
|
||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||
|
||
|
||
} # as_fn_mkdir_p
|
||
@@ -356,19 +364,19 @@ else
|
||
fi # as_fn_arith
|
||
|
||
|
||
-# as_fn_error ERROR [LINENO LOG_FD]
|
||
-# ---------------------------------
|
||
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||
+# ----------------------------------------
|
||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
-# script with status $?, using 1 if that was 0.
|
||
+# script with STATUS, using 1 if that was 0.
|
||
as_fn_error ()
|
||
{
|
||
- as_status=$?; test $as_status -eq 0 && as_status=1
|
||
- if test "$3"; then
|
||
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
||
+ if test "$4"; then
|
||
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||
fi
|
||
- $as_echo "$as_me: error: $1" >&2
|
||
+ $as_echo "$as_me: error: $2" >&2
|
||
as_fn_exit $as_status
|
||
} # as_fn_error
|
||
|
||
@@ -530,7 +538,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
|
||
exec 6>&1
|
||
|
||
# Name of the host.
|
||
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
||
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
|
||
# so uname gets run too.
|
||
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
|
||
@@ -735,8 +743,9 @@ do
|
||
fi
|
||
|
||
case $ac_option in
|
||
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||
- *) ac_optarg=yes ;;
|
||
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||
+ *=) ac_optarg= ;;
|
||
+ *) ac_optarg=yes ;;
|
||
esac
|
||
|
||
# Accept the important Cygnus configure options, so we can diagnose typos.
|
||
@@ -781,7 +790,7 @@ do
|
||
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid feature name: $ac_useropt"
|
||
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -807,7 +816,7 @@ do
|
||
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid feature name: $ac_useropt"
|
||
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1011,7 +1020,7 @@ do
|
||
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid package name: $ac_useropt"
|
||
+ as_fn_error $? "invalid package name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1027,7 +1036,7 @@ do
|
||
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid package name: $ac_useropt"
|
||
+ as_fn_error $? "invalid package name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1057,8 +1066,8 @@ do
|
||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||
x_libraries=$ac_optarg ;;
|
||
|
||
- -*) as_fn_error "unrecognized option: \`$ac_option'
|
||
-Try \`$0 --help' for more information."
|
||
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
|
||
+Try \`$0 --help' for more information"
|
||
;;
|
||
|
||
*=*)
|
||
@@ -1066,7 +1075,7 @@ Try \`$0 --help' for more information."
|
||
# Reject names that are not valid shell variable names.
|
||
case $ac_envvar in #(
|
||
'' | [0-9]* | *[!_$as_cr_alnum]* )
|
||
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
||
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
|
||
esac
|
||
eval $ac_envvar=\$ac_optarg
|
||
export $ac_envvar ;;
|
||
@@ -1076,7 +1085,7 @@ Try \`$0 --help' for more information."
|
||
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
||
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
|
||
;;
|
||
|
||
esac
|
||
@@ -1084,13 +1093,13 @@ done
|
||
|
||
if test -n "$ac_prev"; then
|
||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||
- as_fn_error "missing argument to $ac_option"
|
||
+ as_fn_error $? "missing argument to $ac_option"
|
||
fi
|
||
|
||
if test -n "$ac_unrecognized_opts"; then
|
||
case $enable_option_checking in
|
||
no) ;;
|
||
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
||
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
|
||
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
||
esac
|
||
fi
|
||
@@ -1113,7 +1122,7 @@ do
|
||
[\\/$]* | ?:[\\/]* ) continue;;
|
||
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
||
esac
|
||
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
||
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
|
||
done
|
||
|
||
# There might be people who depend on the old broken behavior: `$host'
|
||
@@ -1127,8 +1136,8 @@ target=$target_alias
|
||
if test "x$host_alias" != x; then
|
||
if test "x$build_alias" = x; then
|
||
cross_compiling=maybe
|
||
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
- If a cross compiler is detected then cross compile mode will be used." >&2
|
||
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
||
+ If a cross compiler is detected then cross compile mode will be used" >&2
|
||
elif test "x$build_alias" != "x$host_alias"; then
|
||
cross_compiling=yes
|
||
fi
|
||
@@ -1143,9 +1152,9 @@ test "$silent" = yes && exec 6>/dev/null
|
||
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
||
ac_ls_di=`ls -di .` &&
|
||
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
||
- as_fn_error "working directory cannot be determined"
|
||
+ as_fn_error $? "working directory cannot be determined"
|
||
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
||
- as_fn_error "pwd does not report name of working directory"
|
||
+ as_fn_error $? "pwd does not report name of working directory"
|
||
|
||
|
||
# Find the source files, if location was not specified.
|
||
@@ -1184,11 +1193,11 @@ else
|
||
fi
|
||
if test ! -r "$srcdir/$ac_unique_file"; then
|
||
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
||
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
||
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
|
||
fi
|
||
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
||
ac_abs_confdir=`(
|
||
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
||
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
|
||
pwd)`
|
||
# When building in place, set srcdir=.
|
||
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
||
@@ -1228,7 +1237,7 @@ Configuration:
|
||
--help=short display options specific to this package
|
||
--help=recursive display the short help of all the included packages
|
||
-V, --version display version information and exit
|
||
- -q, --quiet, --silent do not print \`checking...' messages
|
||
+ -q, --quiet, --silent do not print \`checking ...' messages
|
||
--cache-file=FILE cache test results in FILE [disabled]
|
||
-C, --config-cache alias for \`--cache-file=config.cache'
|
||
-n, --no-create do not create output files
|
||
@@ -1370,9 +1379,9 @@ test -n "$ac_init_help" && exit $ac_stat
|
||
if $ac_init_version; then
|
||
cat <<\_ACEOF
|
||
configure
|
||
-generated by GNU Autoconf 2.65
|
||
+generated by GNU Autoconf 2.68
|
||
|
||
-Copyright (C) 2009 Free Software Foundation, Inc.
|
||
+Copyright (C) 2010 Free Software Foundation, Inc.
|
||
This configure script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it.
|
||
_ACEOF
|
||
@@ -1416,7 +1425,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_retval=1
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_compile
|
||
@@ -1442,7 +1451,7 @@ $as_echo "$ac_try_echo"; } >&5
|
||
mv -f conftest.er1 conftest.err
|
||
fi
|
||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
- test $ac_status = 0; } >/dev/null && {
|
||
+ test $ac_status = 0; } > conftest.i && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then :
|
||
@@ -1453,7 +1462,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_retval=1
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_cpp
|
||
@@ -1495,7 +1504,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||
ac_retval=$ac_status
|
||
fi
|
||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_run
|
||
@@ -1508,10 +1517,10 @@ fi
|
||
ac_fn_c_check_header_mongrel ()
|
||
{
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ if eval \${$3+:} false; then :
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
fi
|
||
eval ac_res=\$$3
|
||
@@ -1547,7 +1556,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
|
||
else
|
||
ac_header_preproc=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
||
$as_echo "$ac_header_preproc" >&6; }
|
||
|
||
@@ -1574,7 +1583,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
|
||
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"
|
||
@@ -1583,7 +1592,7 @@ eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_header_mongrel
|
||
|
||
@@ -1596,7 +1605,7 @@ ac_fn_c_check_header_compile ()
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -1614,19 +1623,22 @@ fi
|
||
eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_header_compile
|
||
|
||
-# ac_fn_c_check_decl LINENO SYMBOL VAR
|
||
-# ------------------------------------
|
||
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
|
||
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
|
||
+# ---------------------------------------------
|
||
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
|
||
+# accordingly.
|
||
ac_fn_c_check_decl ()
|
||
{
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
|
||
-$as_echo_n "checking whether $2 is declared... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
|
||
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
|
||
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -1635,8 +1647,12 @@ $4
|
||
int
|
||
main ()
|
||
{
|
||
-#ifndef $2
|
||
- (void) $2;
|
||
+#ifndef $as_decl_name
|
||
+#ifdef __cplusplus
|
||
+ (void) $as_decl_use;
|
||
+#else
|
||
+ (void) $as_decl_name;
|
||
+#endif
|
||
#endif
|
||
|
||
;
|
||
@@ -1653,7 +1669,7 @@ fi
|
||
eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_decl
|
||
|
||
@@ -1698,7 +1714,7 @@ fi
|
||
# interfere with the next link command; also delete a directory that is
|
||
# left behind by Apple's compiler. We do this before executing the actions.
|
||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_link
|
||
@@ -1712,7 +1728,7 @@ ac_fn_c_check_type ()
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
eval "$3=no"
|
||
@@ -1753,7 +1769,7 @@ fi
|
||
eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_type
|
||
|
||
@@ -1765,7 +1781,7 @@ ac_fn_c_check_func ()
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -1820,7 +1836,7 @@ fi
|
||
eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_func
|
||
cat >config.log <<_ACEOF
|
||
@@ -1828,7 +1844,7 @@ This file contains any messages produced
|
||
running configure, to aid debugging if configure makes a mistake.
|
||
|
||
It was created by $as_me, which was
|
||
-generated by GNU Autoconf 2.65. Invocation command line was
|
||
+generated by GNU Autoconf 2.68. Invocation command line was
|
||
|
||
$ $0 $@
|
||
|
||
@@ -1938,11 +1954,9 @@ trap 'exit_status=$?
|
||
{
|
||
echo
|
||
|
||
- cat <<\_ASBOX
|
||
-## ---------------- ##
|
||
+ $as_echo "## ---------------- ##
|
||
## Cache variables. ##
|
||
-## ---------------- ##
|
||
-_ASBOX
|
||
+## ---------------- ##"
|
||
echo
|
||
# The following way of writing the cache mishandles newlines in values,
|
||
(
|
||
@@ -1976,11 +1990,9 @@ $as_echo "$as_me: WARNING: cache variabl
|
||
)
|
||
echo
|
||
|
||
- cat <<\_ASBOX
|
||
-## ----------------- ##
|
||
+ $as_echo "## ----------------- ##
|
||
## Output variables. ##
|
||
-## ----------------- ##
|
||
-_ASBOX
|
||
+## ----------------- ##"
|
||
echo
|
||
for ac_var in $ac_subst_vars
|
||
do
|
||
@@ -1993,11 +2005,9 @@ _ASBOX
|
||
echo
|
||
|
||
if test -n "$ac_subst_files"; then
|
||
- cat <<\_ASBOX
|
||
-## ------------------- ##
|
||
+ $as_echo "## ------------------- ##
|
||
## File substitutions. ##
|
||
-## ------------------- ##
|
||
-_ASBOX
|
||
+## ------------------- ##"
|
||
echo
|
||
for ac_var in $ac_subst_files
|
||
do
|
||
@@ -2011,11 +2021,9 @@ _ASBOX
|
||
fi
|
||
|
||
if test -s confdefs.h; then
|
||
- cat <<\_ASBOX
|
||
-## ----------- ##
|
||
+ $as_echo "## ----------- ##
|
||
## confdefs.h. ##
|
||
-## ----------- ##
|
||
-_ASBOX
|
||
+## ----------- ##"
|
||
echo
|
||
cat confdefs.h
|
||
echo
|
||
@@ -2070,7 +2078,12 @@ _ACEOF
|
||
ac_site_file1=NONE
|
||
ac_site_file2=NONE
|
||
if test -n "$CONFIG_SITE"; then
|
||
- ac_site_file1=$CONFIG_SITE
|
||
+ # We do not want a PATH search for config.site.
|
||
+ case $CONFIG_SITE in #((
|
||
+ -*) ac_site_file1=./$CONFIG_SITE;;
|
||
+ */*) ac_site_file1=$CONFIG_SITE;;
|
||
+ *) ac_site_file1=./$CONFIG_SITE;;
|
||
+ esac
|
||
elif test "x$prefix" != xNONE; then
|
||
ac_site_file1=$prefix/share/config.site
|
||
ac_site_file2=$prefix/etc/config.site
|
||
@@ -2085,7 +2098,11 @@ do
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
||
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
sed 's/^/| /' "$ac_site_file" >&5
|
||
- . "$ac_site_file"
|
||
+ . "$ac_site_file" \
|
||
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error $? "failed to load site script $ac_site_file
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
done
|
||
|
||
@@ -2161,7 +2178,7 @@ if $ac_cache_corrupted; then
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
||
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||
fi
|
||
## -------------------- ##
|
||
## Main body of script. ##
|
||
@@ -2188,7 +2205,7 @@ if test -n "$ac_tool_prefix"; then
|
||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2228,7 +2245,7 @@ if test -z "$ac_cv_prog_CC"; then
|
||
set dummy gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -2281,7 +2298,7 @@ if test -z "$CC"; then
|
||
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2321,7 +2338,7 @@ if test -z "$CC"; then
|
||
set dummy cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2380,7 +2397,7 @@ if test -z "$CC"; then
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2424,7 +2441,7 @@ do
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -2478,8 +2495,8 @@ fi
|
||
|
||
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
|
||
# Provide some information about the compiler.
|
||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||
@@ -2593,9 +2610,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-{ as_fn_set_status 77
|
||
-as_fn_error "C compiler cannot create executables
|
||
-See \`config.log' for more details." "$LINENO" 5; }; }
|
||
+as_fn_error 77 "C compiler cannot create executables
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
else
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
$as_echo "yes" >&6; }
|
||
@@ -2637,8 +2653,8 @@ done
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
rm -f conftest conftest$ac_cv_exeext
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
||
@@ -2695,9 +2711,9 @@ $as_echo "$ac_try_echo"; } >&5
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot run C compiled programs.
|
||
+as_fn_error $? "cannot run C compiled programs.
|
||
If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
fi
|
||
fi
|
||
@@ -2708,7 +2724,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
|
||
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
|
||
@@ -2748,8 +2764,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "cannot compute suffix of object files: cannot compile
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
fi
|
||
@@ -2759,7 +2775,7 @@ OBJEXT=$ac_cv_objext
|
||
ac_objext=$OBJEXT
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
||
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
||
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
||
+if ${ac_cv_c_compiler_gnu+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -2796,7 +2812,7 @@ ac_test_CFLAGS=${CFLAGS+set}
|
||
ac_save_CFLAGS=$CFLAGS
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
||
$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
||
-if test "${ac_cv_prog_cc_g+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_g+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_save_c_werror_flag=$ac_c_werror_flag
|
||
@@ -2874,7 +2890,7 @@ else
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
||
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
||
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_c89+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_cv_prog_cc_c89=no
|
||
@@ -2971,16 +2987,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
|
||
ac_aux_dir=
|
||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||
- for ac_t in install-sh install.sh shtool; do
|
||
- if test -f "$ac_dir/$ac_t"; then
|
||
- ac_aux_dir=$ac_dir
|
||
- ac_install_sh="$ac_aux_dir/$ac_t -c"
|
||
- break 2
|
||
- fi
|
||
- done
|
||
+ if test -f "$ac_dir/install-sh"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/install-sh -c"
|
||
+ break
|
||
+ elif test -f "$ac_dir/install.sh"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/install.sh -c"
|
||
+ break
|
||
+ elif test -f "$ac_dir/shtool"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/shtool install -c"
|
||
+ break
|
||
+ fi
|
||
done
|
||
if test -z "$ac_aux_dir"; then
|
||
- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
||
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
||
fi
|
||
|
||
# These three variables are undocumented and unsupported,
|
||
@@ -3009,7 +3031,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
|
||
{ $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
|
||
@@ -3090,7 +3112,7 @@ if test -n "$ac_tool_prefix"; then
|
||
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_STRIP+set}" = set; then :
|
||
+if ${ac_cv_prog_STRIP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$STRIP"; then
|
||
@@ -3130,7 +3152,7 @@ if test -z "$ac_cv_prog_STRIP"; then
|
||
set dummy strip; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_STRIP"; then
|
||
@@ -3233,7 +3255,7 @@ if test -n "$CPP" && test -d "$CPP"; the
|
||
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
|
||
@@ -3263,7 +3285,7 @@ else
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
# OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
@@ -3279,11 +3301,11 @@ else
|
||
ac_preproc_ok=:
|
||
break
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.i conftest.err conftest.$ac_ext
|
||
if $ac_preproc_ok; then :
|
||
break
|
||
fi
|
||
@@ -3322,7 +3344,7 @@ else
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
# OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
@@ -3338,18 +3360,18 @@ else
|
||
ac_preproc_ok=:
|
||
break
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.i conftest.err conftest.$ac_ext
|
||
if $ac_preproc_ok; then :
|
||
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
|
||
ac_ext=c
|
||
@@ -3361,7 +3383,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||
-if test "${ac_cv_path_GREP+set}" = set; then :
|
||
+if ${ac_cv_path_GREP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$GREP"; then
|
||
@@ -3410,7 +3432,7 @@ esac
|
||
done
|
||
IFS=$as_save_IFS
|
||
if test -z "$ac_cv_path_GREP"; then
|
||
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
fi
|
||
else
|
||
ac_cv_path_GREP=$GREP
|
||
@@ -3424,7 +3446,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
||
$as_echo_n "checking for egrep... " >&6; }
|
||
-if test "${ac_cv_path_EGREP+set}" = set; then :
|
||
+if ${ac_cv_path_EGREP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||
@@ -3476,7 +3498,7 @@ esac
|
||
done
|
||
IFS=$as_save_IFS
|
||
if test -z "$ac_cv_path_EGREP"; then
|
||
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
fi
|
||
else
|
||
ac_cv_path_EGREP=$EGREP
|
||
@@ -3491,7 +3513,7 @@ $as_echo "$ac_cv_path_EGREP" >&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 :
|
||
+if ${ac_cv_header_stdc+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -3603,7 +3625,7 @@ fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
||
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
|
||
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
|
||
+if ${ac_cv_header_sys_wait_h+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -3649,8 +3671,7 @@ do :
|
||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
||
"
|
||
-eval as_val=\$$as_ac_Header
|
||
- if test "x$as_val" = x""yes; then :
|
||
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
@@ -3664,8 +3685,7 @@ for ac_header in fcntl.h syslog.h unistd
|
||
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
|
||
@@ -3678,14 +3698,13 @@ for ac_header in openssl/ssl.h openssl/m
|
||
do :
|
||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
-eval as_val=\$$as_ac_Header
|
||
- if test "x$as_val" = x""yes; then :
|
||
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
else
|
||
- as_fn_error "
|
||
+ as_fn_error $? "
|
||
!!! OpenSSL is not properly installed on your system. !!!
|
||
!!! Can not include OpenSSL headers files. !!!" "$LINENO" 5
|
||
fi
|
||
@@ -3694,7 +3713,7 @@ done
|
||
|
||
ac_fn_c_check_decl "$LINENO" "ETHERTYPE_IPV6" "ac_cv_have_decl_ETHERTYPE_IPV6" "#include <net/ethernet.h>
|
||
"
|
||
-if test "x$ac_cv_have_decl_ETHERTYPE_IPV6" = x""yes; then :
|
||
+if test "x$ac_cv_have_decl_ETHERTYPE_IPV6" = xyes; then :
|
||
|
||
else
|
||
CFLAGS="$CFLAGS -DETHERTYPE_IPV6=0x86dd"
|
||
@@ -3703,7 +3722,7 @@ fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5_Init in -lcrypto" >&5
|
||
$as_echo_n "checking for MD5_Init in -lcrypto... " >&6; }
|
||
-if test "${ac_cv_lib_crypto_MD5_Init+set}" = set; then :
|
||
+if ${ac_cv_lib_crypto_MD5_Init+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
@@ -3737,7 +3756,7 @@ LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5_Init" >&5
|
||
$as_echo "$ac_cv_lib_crypto_MD5_Init" >&6; }
|
||
-if test "x$ac_cv_lib_crypto_MD5_Init" = x""yes; then :
|
||
+if test "x$ac_cv_lib_crypto_MD5_Init" = xyes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_LIBCRYPTO 1
|
||
_ACEOF
|
||
@@ -3745,12 +3764,12 @@ _ACEOF
|
||
LIBS="-lcrypto $LIBS"
|
||
|
||
else
|
||
- as_fn_error "OpenSSL libraries are required" "$LINENO" 5
|
||
+ as_fn_error $? "OpenSSL libraries are required" "$LINENO" 5
|
||
fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
|
||
$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
|
||
-if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then :
|
||
+if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
@@ -3784,7 +3803,7 @@ LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
|
||
$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
|
||
-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then :
|
||
+if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_LIBSSL 1
|
||
_ACEOF
|
||
@@ -3792,12 +3811,12 @@ _ACEOF
|
||
LIBS="-lssl $LIBS"
|
||
|
||
else
|
||
- as_fn_error "OpenSSL libraries are required" "$LINENO" 5
|
||
+ as_fn_error $? "OpenSSL libraries are required" "$LINENO" 5
|
||
fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5
|
||
$as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
|
||
-if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then :
|
||
+if ${ac_cv_lib_popt_poptGetContext+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
@@ -3831,7 +3850,7 @@ LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5
|
||
$as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
|
||
-if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then :
|
||
+if test "x$ac_cv_lib_popt_poptGetContext" = xyes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_LIBPOPT 1
|
||
_ACEOF
|
||
@@ -3839,12 +3858,12 @@ _ACEOF
|
||
LIBS="-lpopt $LIBS"
|
||
|
||
else
|
||
- as_fn_error "Popt libraries is required" "$LINENO" 5
|
||
+ as_fn_error $? "Popt libraries is required" "$LINENO" 5
|
||
fi
|
||
|
||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_handle_alloc in -lnl" >&5
|
||
-$as_echo_n "checking for nl_handle_alloc in -lnl... " >&6; }
|
||
-if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then :
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_socket_modify_cb in -lnl" >&5
|
||
+$as_echo_n "checking for nl_socket_modify_cb in -lnl... " >&6; }
|
||
+if ${ac_cv_lib_nl_nl_socket_modify_cb+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
@@ -3858,27 +3877,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
||
#ifdef __cplusplus
|
||
extern "C"
|
||
#endif
|
||
-char nl_handle_alloc ();
|
||
+char nl_socket_modify_cb ();
|
||
int
|
||
main ()
|
||
{
|
||
-return nl_handle_alloc ();
|
||
+return nl_socket_modify_cb ();
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
if ac_fn_c_try_link "$LINENO"; then :
|
||
- ac_cv_lib_nl_nl_handle_alloc=yes
|
||
+ ac_cv_lib_nl_nl_socket_modify_cb=yes
|
||
else
|
||
- ac_cv_lib_nl_nl_handle_alloc=no
|
||
+ ac_cv_lib_nl_nl_socket_modify_cb=no
|
||
fi
|
||
rm -f core conftest.err conftest.$ac_objext \
|
||
conftest$ac_exeext conftest.$ac_ext
|
||
LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_handle_alloc" >&5
|
||
-$as_echo "$ac_cv_lib_nl_nl_handle_alloc" >&6; }
|
||
-if test "x$ac_cv_lib_nl_nl_handle_alloc" = x""yes; then :
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_nl_socket_modify_cb" >&5
|
||
+$as_echo "$ac_cv_lib_nl_nl_socket_modify_cb" >&6; }
|
||
+if test "x$ac_cv_lib_nl_nl_socket_modify_cb" = xyes; then :
|
||
|
||
USE_NL="LIBIPVS_USE_NL"
|
||
LIBS="$LIBS -lnl"
|
||
@@ -3973,22 +3992,26 @@ $as_echo "$as_me: WARNING: Cannot determ
|
||
|
||
IPVS_SUPPORT="_WITHOUT_LVS_"
|
||
if test "$enable_lvs" != "no"; then
|
||
- ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
|
||
-if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then :
|
||
+ if test "$KERN" = "_KRNL_2_6_"; then
|
||
+ IPVS_SUPPORT="_WITH_LVS_"
|
||
+ else
|
||
+ ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
|
||
+if test "x$ac_cv_header_net_ip_vs_h" = xyes; then :
|
||
IPVS_SUPPORT="_WITH_LVS_"
|
||
else
|
||
|
||
- IPVS_SUPPORT="_WITHOUT_LVS_"
|
||
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: keepalived will be built without LVS support." >&5
|
||
+ IPVS_SUPPORT="_WITHOUT_LVS_"
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: keepalived will be built without LVS support." >&5
|
||
$as_echo "$as_me: WARNING: keepalived will be built without LVS support." >&2;}
|
||
|
||
fi
|
||
|
||
|
||
+ fi
|
||
fi
|
||
|
||
if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
|
||
- as_fn_error "keepalived MUST be compiled at least with LVS or VRRP framework" "$LINENO" 5
|
||
+ as_fn_error $? "keepalived MUST be compiled at least with LVS or VRRP framework" "$LINENO" 5
|
||
fi
|
||
|
||
IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
|
||
@@ -4040,7 +4063,7 @@ fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
||
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
||
-if test "${ac_cv_c_const+set}" = set; then :
|
||
+if ${ac_cv_c_const+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -4119,7 +4142,7 @@ $as_echo "#define const /**/" >>confdefs
|
||
fi
|
||
|
||
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
|
||
-if test "x$ac_cv_type_pid_t" = x""yes; then :
|
||
+if test "x$ac_cv_type_pid_t" = xyes; then :
|
||
|
||
else
|
||
|
||
@@ -4131,7 +4154,7 @@ fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
|
||
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
|
||
-if test "${ac_cv_header_time+set}" = set; then :
|
||
+if ${ac_cv_header_time+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -4168,7 +4191,7 @@ fi
|
||
if test $ac_cv_c_compiler_gnu = yes; then
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
|
||
$as_echo_n "checking whether $CC needs -traditional... " >&6; }
|
||
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
|
||
+if ${ac_cv_prog_gcc_traditional+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_pattern="Autoconf.*'x'"
|
||
@@ -4209,7 +4232,7 @@ fi
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
|
||
$as_echo_n "checking for working memcmp... " >&6; }
|
||
-if test "${ac_cv_func_memcmp_working+set}" = set; then :
|
||
+if ${ac_cv_func_memcmp_working+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test "$cross_compiling" = yes; then :
|
||
@@ -4271,7 +4294,7 @@ esac
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
|
||
$as_echo_n "checking return type of signal handlers... " >&6; }
|
||
-if test "${ac_cv_type_signal+set}" = set; then :
|
||
+if ${ac_cv_type_signal+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -4306,8 +4329,7 @@ for ac_func in gettimeofday select socke
|
||
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
|
||
@@ -4394,10 +4416,21 @@ $as_echo "$as_me: WARNING: cache variabl
|
||
: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;}
|
||
@@ -4449,6 +4482,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
|
||
|
||
ac_libobjs=
|
||
ac_ltlibobjs=
|
||
+U=
|
||
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
||
# 1. Remove the extension, and $U if already installed.
|
||
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
||
@@ -4464,7 +4498,7 @@ LTLIBOBJS=$ac_ltlibobjs
|
||
|
||
|
||
|
||
-: ${CONFIG_STATUS=./config.status}
|
||
+: "${CONFIG_STATUS=./config.status}"
|
||
ac_write_fail=0
|
||
ac_clean_files_save=$ac_clean_files
|
||
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
||
@@ -4565,6 +4599,7 @@ fi
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
+as_myself=
|
||
case $0 in #((
|
||
*[\\/]* ) as_myself=$0 ;;
|
||
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -4610,19 +4645,19 @@ export LANGUAGE
|
||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||
|
||
|
||
-# as_fn_error ERROR [LINENO LOG_FD]
|
||
-# ---------------------------------
|
||
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||
+# ----------------------------------------
|
||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
-# script with status $?, using 1 if that was 0.
|
||
+# script with STATUS, using 1 if that was 0.
|
||
as_fn_error ()
|
||
{
|
||
- as_status=$?; test $as_status -eq 0 && as_status=1
|
||
- if test "$3"; then
|
||
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
||
+ if test "$4"; then
|
||
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||
fi
|
||
- $as_echo "$as_me: error: $1" >&2
|
||
+ $as_echo "$as_me: error: $2" >&2
|
||
as_fn_exit $as_status
|
||
} # as_fn_error
|
||
|
||
@@ -4818,7 +4853,7 @@ $as_echo X"$as_dir" |
|
||
test -d "$as_dir" && break
|
||
done
|
||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||
|
||
|
||
} # as_fn_mkdir_p
|
||
@@ -4872,7 +4907,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
||
# values after options handling.
|
||
ac_log="
|
||
This file was extended by $as_me, which was
|
||
-generated by GNU Autoconf 2.65. Invocation command line was
|
||
+generated by GNU Autoconf 2.68. Invocation command line was
|
||
|
||
CONFIG_FILES = $CONFIG_FILES
|
||
CONFIG_HEADERS = $CONFIG_HEADERS
|
||
@@ -4925,10 +4960,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
|
||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||
ac_cs_version="\\
|
||
config.status
|
||
-configured by $0, generated by GNU Autoconf 2.65,
|
||
+configured by $0, generated by GNU Autoconf 2.68,
|
||
with options \\"\$ac_cs_config\\"
|
||
|
||
-Copyright (C) 2009 Free Software Foundation, Inc.
|
||
+Copyright (C) 2010 Free Software Foundation, Inc.
|
||
This config.status script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it."
|
||
|
||
@@ -4944,11 +4979,16 @@ ac_need_defaults=:
|
||
while test $# != 0
|
||
do
|
||
case $1 in
|
||
- --*=*)
|
||
+ --*=?*)
|
||
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
||
ac_shift=:
|
||
;;
|
||
+ --*=)
|
||
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||
+ ac_optarg=
|
||
+ ac_shift=:
|
||
+ ;;
|
||
*)
|
||
ac_option=$1
|
||
ac_optarg=$2
|
||
@@ -4970,6 +5010,7 @@ do
|
||
$ac_shift
|
||
case $ac_optarg in
|
||
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ '') as_fn_error $? "missing file argument" ;;
|
||
esac
|
||
as_fn_append CONFIG_FILES " '$ac_optarg'"
|
||
ac_need_defaults=false;;
|
||
@@ -4980,7 +5021,7 @@ do
|
||
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"
|
||
@@ -5031,7 +5072,7 @@ do
|
||
case $ac_config_target in
|
||
"$OUTPUT_TARGET") CONFIG_FILES="$CONFIG_FILES $OUTPUT_TARGET" ;;
|
||
|
||
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||
esac
|
||
done
|
||
|
||
@@ -5052,9 +5093,10 @@ fi
|
||
# after its creation but before its name has been assigned to `$tmp'.
|
||
$debug ||
|
||
{
|
||
- tmp=
|
||
+ tmp= ac_tmp=
|
||
trap 'exit_status=$?
|
||
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
||
+ : "${ac_tmp:=$tmp}"
|
||
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
|
||
' 0
|
||
trap 'as_fn_exit 1' 1 2 13 15
|
||
}
|
||
@@ -5062,12 +5104,13 @@ $debug ||
|
||
|
||
{
|
||
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
||
- test -n "$tmp" && test -d "$tmp"
|
||
+ test -d "$tmp"
|
||
} ||
|
||
{
|
||
tmp=./conf$$-$RANDOM
|
||
(umask 077 && mkdir "$tmp")
|
||
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
||
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
||
+ac_tmp=$tmp
|
||
|
||
# Set up the scripts for CONFIG_FILES section.
|
||
# No need to generate them if there are no CONFIG_FILES.
|
||
@@ -5084,12 +5127,12 @@ if test "x$ac_cr" = x; then
|
||
fi
|
||
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||
- ac_cs_awk_cr='\r'
|
||
+ ac_cs_awk_cr='\\r'
|
||
else
|
||
ac_cs_awk_cr=$ac_cr
|
||
fi
|
||
|
||
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
||
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
|
||
_ACEOF
|
||
|
||
|
||
@@ -5098,18 +5141,18 @@ _ACEOF
|
||
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
||
echo "_ACEOF"
|
||
} >conf$$subs.sh ||
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
||
ac_delim='%!_!# '
|
||
for ac_last_try in false false false false false :; do
|
||
. ./conf$$subs.sh ||
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
|
||
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
||
if test $ac_delim_n = $ac_delim_num; then
|
||
break
|
||
elif $ac_last_try; then
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
else
|
||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
fi
|
||
@@ -5117,7 +5160,7 @@ done
|
||
rm -f conf$$subs.sh
|
||
|
||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
||
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
|
||
_ACEOF
|
||
sed -n '
|
||
h
|
||
@@ -5165,7 +5208,7 @@ t delim
|
||
rm -f conf$$subs.awk
|
||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
_ACAWK
|
||
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
||
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
|
||
for (key in S) S_is_set[key] = 1
|
||
FS = ""
|
||
|
||
@@ -5197,21 +5240,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
|
||
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
|
||
@@ -5229,7 +5280,7 @@ do
|
||
esac
|
||
case $ac_mode$ac_tag in
|
||
:[FHL]*:*);;
|
||
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
||
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
||
:[FH]-) ac_tag=-:-;;
|
||
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
||
esac
|
||
@@ -5248,7 +5299,7 @@ do
|
||
for ac_f
|
||
do
|
||
case $ac_f in
|
||
- -) ac_f="$tmp/stdin";;
|
||
+ -) ac_f="$ac_tmp/stdin";;
|
||
*) # Look for the file first in the build tree, then in the source tree
|
||
# (if the path is not absolute). The absolute path cannot be DOS-style,
|
||
# because $ac_f cannot contain `:'.
|
||
@@ -5257,7 +5308,7 @@ do
|
||
[\\/$]*) false;;
|
||
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
||
esac ||
|
||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
||
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
||
esac
|
||
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
||
as_fn_append ac_file_inputs " '$ac_f'"
|
||
@@ -5283,8 +5334,8 @@ $as_echo "$as_me: creating $ac_file" >&6
|
||
esac
|
||
|
||
case $ac_tag in
|
||
- *:-:* | *:-) cat >"$tmp/stdin" \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
||
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
|
||
esac
|
||
;;
|
||
esac
|
||
@@ -5414,23 +5465,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
|
||
s&@INSTALL@&$ac_INSTALL&;t t
|
||
$ac_datarootdir_hack
|
||
"
|
||
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
|
||
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
|
||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
||
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
|
||
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
|
||
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
-which seems to be undefined. Please make sure it is defined." >&5
|
||
+which seems to be undefined. Please make sure it is defined" >&5
|
||
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
-which seems to be undefined. Please make sure it is defined." >&2;}
|
||
+which seems to be undefined. Please make sure it is defined" >&2;}
|
||
|
||
- rm -f "$tmp/stdin"
|
||
+ rm -f "$ac_tmp/stdin"
|
||
case $ac_file in
|
||
- -) cat "$tmp/out" && rm -f "$tmp/out";;
|
||
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
||
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
|
||
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
|
||
esac \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
;;
|
||
|
||
|
||
@@ -5445,7 +5497,7 @@ _ACEOF
|
||
ac_clean_files=$ac_clean_files_save
|
||
|
||
test $ac_write_fail = 0 ||
|
||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||
|
||
|
||
# configure is writing to config.log, and then calls config.status.
|
||
@@ -5466,7 +5518,7 @@ if test "$no_create" != yes; then
|
||
exec 5>>config.log
|
||
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
||
# would make configure fail if this is the last instruction.
|
||
- $ac_cs_success || as_fn_exit $?
|
||
+ $ac_cs_success || as_fn_exit 1
|
||
fi
|
||
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|