6269 lines
212 KiB
Diff
6269 lines
212 KiB
Diff
Only in dmraid/autoconf: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/configure dmraid/configure
|
||
--- /tmp/dmraid/1.0.0.rc16/configure 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/configure 2009-09-17 21:25:57.000000000 +1000
|
||
@@ -1,9 +1,9 @@
|
||
#! /bin/sh
|
||
# Guess values for system-dependent variables and create Makefiles.
|
||
-# Generated by GNU Autoconf 2.61.
|
||
+# Generated by GNU Autoconf 2.63.
|
||
#
|
||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||
# This configure script is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy, distribute and modify it.
|
||
## --------------------- ##
|
||
@@ -15,7 +15,7 @@
|
||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
setopt NO_GLOB_SUBST
|
||
@@ -37,17 +37,45 @@
|
||
as_cr_digits='0123456789'
|
||
as_cr_alnum=$as_cr_Letters$as_cr_digits
|
||
|
||
-# The user is always right.
|
||
-if test "${PATH_SEPARATOR+set}" != set; then
|
||
- echo "#! /bin/sh" >conf$$.sh
|
||
- echo "exit 0" >>conf$$.sh
|
||
- chmod +x conf$$.sh
|
||
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||
- PATH_SEPARATOR=';'
|
||
+as_nl='
|
||
+'
|
||
+export as_nl
|
||
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
||
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='printf %s\n'
|
||
+ as_echo_n='printf %s'
|
||
+else
|
||
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
||
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
||
+ as_echo_n='/usr/ucb/echo -n'
|
||
else
|
||
- PATH_SEPARATOR=:
|
||
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
||
+ as_echo_n_body='eval
|
||
+ arg=$1;
|
||
+ case $arg in
|
||
+ *"$as_nl"*)
|
||
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
||
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
||
+ esac;
|
||
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
||
+ '
|
||
+ export as_echo_n_body
|
||
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
||
fi
|
||
- rm -f conf$$.sh
|
||
+ export as_echo_body
|
||
+ as_echo='sh -c $as_echo_body as_echo'
|
||
+fi
|
||
+
|
||
+# The user is always right.
|
||
+if test "${PATH_SEPARATOR+set}" != set; then
|
||
+ PATH_SEPARATOR=:
|
||
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
||
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
||
+ PATH_SEPARATOR=';'
|
||
+ }
|
||
fi
|
||
|
||
# Support unset when possible.
|
||
@@ -63,8 +91,6 @@
|
||
# there to prevent editors from complaining about space-tab.
|
||
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
||
# splitting by setting IFS to empty value.)
|
||
-as_nl='
|
||
-'
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
@@ -87,7 +113,7 @@
|
||
as_myself=$0
|
||
fi
|
||
if test ! -f "$as_myself"; then
|
||
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
{ (exit 1); exit 1; }
|
||
fi
|
||
|
||
@@ -100,17 +126,10 @@
|
||
PS4='+ '
|
||
|
||
# NLS nuisances.
|
||
-for as_var in \
|
||
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||
- LC_TELEPHONE LC_TIME
|
||
-do
|
||
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||
- eval $as_var=C; export $as_var
|
||
- else
|
||
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||
- fi
|
||
-done
|
||
+LC_ALL=C
|
||
+export LC_ALL
|
||
+LANGUAGE=C
|
||
+export LANGUAGE
|
||
|
||
# Required to use basename.
|
||
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
@@ -132,7 +151,7 @@
|
||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||
X"$0" : 'X\(//\)$' \| \
|
||
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||
-echo X/"$0" |
|
||
+$as_echo X/"$0" |
|
||
sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||
s//\1/
|
||
q
|
||
@@ -158,7 +177,7 @@
|
||
as_have_required=no
|
||
fi
|
||
|
||
- if test $as_have_required = yes && (eval ":
|
||
+ if test $as_have_required = yes && (eval ":
|
||
(as_func_return () {
|
||
(exit \$1)
|
||
}
|
||
@@ -240,7 +259,7 @@
|
||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
setopt NO_GLOB_SUBST
|
||
@@ -261,7 +280,7 @@
|
||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
setopt NO_GLOB_SUBST
|
||
@@ -341,10 +360,10 @@
|
||
|
||
if test "x$CONFIG_SHELL" != x; then
|
||
for as_var in BASH_ENV ENV
|
||
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||
- done
|
||
- export CONFIG_SHELL
|
||
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
||
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||
+ done
|
||
+ export CONFIG_SHELL
|
||
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
||
fi
|
||
|
||
|
||
@@ -413,9 +432,10 @@
|
||
|
||
test \$exitcode = 0") || {
|
||
echo No shell found that supports shell functions.
|
||
- echo Please tell autoconf@gnu.org about your system,
|
||
- echo including any error possibly output before this
|
||
- echo message
|
||
+ echo Please tell bug-autoconf@gnu.org about your system,
|
||
+ echo including any error possibly output before this message.
|
||
+ echo This can help us improve future autoconf versions.
|
||
+ echo Configuration will now proceed without shell functions.
|
||
}
|
||
|
||
|
||
@@ -451,7 +471,7 @@
|
||
s/-\n.*//
|
||
' >$as_me.lineno &&
|
||
chmod +x "$as_me.lineno" ||
|
||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
|
||
# Don't try to exec as it changes $[0], causing all sort of problems
|
||
@@ -479,7 +499,6 @@
|
||
*)
|
||
ECHO_N='-n';;
|
||
esac
|
||
-
|
||
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||
as_expr=expr
|
||
@@ -492,19 +511,22 @@
|
||
rm -f conf$$.dir/conf$$.file
|
||
else
|
||
rm -f conf$$.dir
|
||
- mkdir conf$$.dir
|
||
+ mkdir conf$$.dir 2>/dev/null
|
||
fi
|
||
-echo >conf$$.file
|
||
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s='ln -s'
|
||
- # ... but there are two gotchas:
|
||
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
- # In both cases, we have to default to `cp -p'.
|
||
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+if (echo >conf$$.file) 2>/dev/null; then
|
||
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s='ln -s'
|
||
+ # ... but there are two gotchas:
|
||
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
+ # In both cases, we have to default to `cp -p'.
|
||
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+ as_ln_s='cp -p'
|
||
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s=ln
|
||
+ else
|
||
as_ln_s='cp -p'
|
||
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s=ln
|
||
+ fi
|
||
else
|
||
as_ln_s='cp -p'
|
||
fi
|
||
@@ -529,10 +551,10 @@
|
||
as_test_x='
|
||
eval sh -c '\''
|
||
if test -d "$1"; then
|
||
- test -d "$1/.";
|
||
+ test -d "$1/.";
|
||
else
|
||
case $1 in
|
||
- -*)set "./$1";;
|
||
+ -*)set "./$1";;
|
||
esac;
|
||
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
||
???[sx]*):;;*)false;;esac;fi
|
||
@@ -614,99 +636,117 @@
|
||
#endif"
|
||
|
||
ac_default_prefix=/usr/share
|
||
-ac_subst_vars='SHELL
|
||
-PATH_SEPARATOR
|
||
-PACKAGE_NAME
|
||
-PACKAGE_TARNAME
|
||
-PACKAGE_VERSION
|
||
-PACKAGE_STRING
|
||
-PACKAGE_BUGREPORT
|
||
-exec_prefix
|
||
-prefix
|
||
-program_transform_name
|
||
-bindir
|
||
-sbindir
|
||
-libexecdir
|
||
-datarootdir
|
||
-datadir
|
||
-sysconfdir
|
||
-sharedstatedir
|
||
-localstatedir
|
||
-includedir
|
||
-oldincludedir
|
||
-docdir
|
||
-infodir
|
||
-htmldir
|
||
-dvidir
|
||
-pdfdir
|
||
-psdir
|
||
-libdir
|
||
-localedir
|
||
-mandir
|
||
-DEFS
|
||
-ECHO_C
|
||
-ECHO_N
|
||
-ECHO_T
|
||
-LIBS
|
||
-build_alias
|
||
-host_alias
|
||
-target_alias
|
||
-build
|
||
-build_cpu
|
||
-build_vendor
|
||
-build_os
|
||
-host
|
||
-host_cpu
|
||
-host_vendor
|
||
-host_os
|
||
-target
|
||
-target_cpu
|
||
-target_vendor
|
||
-target_os
|
||
-AWK
|
||
-INSTALL_PROGRAM
|
||
-INSTALL_SCRIPT
|
||
-INSTALL_DATA
|
||
-LN_S
|
||
-SET_MAKE
|
||
-RANLIB
|
||
-KLCC
|
||
-KLIBC
|
||
-KLIBC_PREFIX
|
||
-KLIBC_BIN_DIR
|
||
-KLIBC_SBIN_DIR
|
||
-KLIBC_LIB_DIR
|
||
-KLIBC_INCLUDE_DIR
|
||
-CC
|
||
-CFLAGS
|
||
-LDFLAGS
|
||
-CPPFLAGS
|
||
-ac_ct_CC
|
||
-EXEEXT
|
||
-OBJEXT
|
||
-CPP
|
||
-GREP
|
||
-EGREP
|
||
-CLDFLAGS
|
||
-DEBUG
|
||
-DEBUG_MALLOC
|
||
-DMRAID_TEST
|
||
-DMRAID_VERSION
|
||
-DMRAID_LIB_VERSION
|
||
-DIETLIBC
|
||
-GROUP
|
||
-JOBS
|
||
-LD_DEPS
|
||
-FLAVOUR
|
||
-LIBSELINUX
|
||
-LIBSEPOL
|
||
-LIB_SO
|
||
-OWNER
|
||
-SOFLAG
|
||
-STATIC_LINK
|
||
+ac_subst_vars='LTLIBOBJS
|
||
LIBOBJS
|
||
-LTLIBOBJS'
|
||
+STATIC_LINK
|
||
+SOFLAG
|
||
+OWNER
|
||
+LIB_SO
|
||
+LIBSEPOL
|
||
+LIBSELINUX
|
||
+FLAVOUR
|
||
+LD_DEPS
|
||
+JOBS
|
||
+GROUP
|
||
+DIETLIBC
|
||
+DMRAID_LIB_VERSION
|
||
+DMRAID_VERSION
|
||
+DEBUG_MALLOC
|
||
+DEBUG
|
||
+CLDFLAGS
|
||
+EGREP
|
||
+GREP
|
||
+CPP
|
||
+OBJEXT
|
||
+EXEEXT
|
||
+ac_ct_CC
|
||
+CPPFLAGS
|
||
+LDFLAGS
|
||
+CFLAGS
|
||
+CC
|
||
+KLIBC_INCLUDE_DIR
|
||
+KLIBC_LIB_DIR
|
||
+KLIBC_SBIN_DIR
|
||
+KLIBC_BIN_DIR
|
||
+KLIBC_PREFIX
|
||
+KLIBC
|
||
+KLCC
|
||
+RANLIB
|
||
+SET_MAKE
|
||
+LN_S
|
||
+INSTALL_DATA
|
||
+INSTALL_SCRIPT
|
||
+INSTALL_PROGRAM
|
||
+AWK
|
||
+target_os
|
||
+target_vendor
|
||
+target_cpu
|
||
+target
|
||
+host_os
|
||
+host_vendor
|
||
+host_cpu
|
||
+host
|
||
+build_os
|
||
+build_vendor
|
||
+build_cpu
|
||
+build
|
||
+target_alias
|
||
+host_alias
|
||
+build_alias
|
||
+LIBS
|
||
+ECHO_T
|
||
+ECHO_N
|
||
+ECHO_C
|
||
+DEFS
|
||
+mandir
|
||
+localedir
|
||
+libdir
|
||
+psdir
|
||
+pdfdir
|
||
+dvidir
|
||
+htmldir
|
||
+infodir
|
||
+docdir
|
||
+oldincludedir
|
||
+includedir
|
||
+localstatedir
|
||
+sharedstatedir
|
||
+sysconfdir
|
||
+datadir
|
||
+datarootdir
|
||
+libexecdir
|
||
+sbindir
|
||
+bindir
|
||
+program_transform_name
|
||
+prefix
|
||
+exec_prefix
|
||
+PACKAGE_BUGREPORT
|
||
+PACKAGE_STRING
|
||
+PACKAGE_VERSION
|
||
+PACKAGE_TARNAME
|
||
+PACKAGE_NAME
|
||
+PATH_SEPARATOR
|
||
+SHELL'
|
||
ac_subst_files=''
|
||
+ac_user_opts='
|
||
+enable_option_checking
|
||
+enable_klibc
|
||
+with_user
|
||
+with_group
|
||
+enable_debug
|
||
+enable_debug_malloc
|
||
+enable_dietlibc
|
||
+enable_jobs
|
||
+enable_libselinux
|
||
+enable_libsepol
|
||
+enable_mini
|
||
+enable_led
|
||
+enable_intel_led
|
||
+enable_native_log
|
||
+enable_static_link
|
||
+enable_shared_lib
|
||
+enable_testing
|
||
+'
|
||
ac_precious_vars='build_alias
|
||
host_alias
|
||
target_alias
|
||
@@ -721,6 +761,8 @@
|
||
# Initialize some variables set by options.
|
||
ac_init_help=
|
||
ac_init_version=false
|
||
+ac_unrecognized_opts=
|
||
+ac_unrecognized_sep=
|
||
# The variables have the same names as the options, with
|
||
# dashes changed to underlines.
|
||
cache_file=/dev/null
|
||
@@ -819,13 +861,21 @@
|
||
datarootdir=$ac_optarg ;;
|
||
|
||
-disable-* | --disable-*)
|
||
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
||
- eval enable_$ac_feature=no ;;
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"enable_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval enable_$ac_useropt=no ;;
|
||
|
||
-docdir | --docdir | --docdi | --doc | --do)
|
||
ac_prev=docdir ;;
|
||
@@ -838,13 +888,21 @@
|
||
dvidir=$ac_optarg ;;
|
||
|
||
-enable-* | --enable-*)
|
||
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
||
- eval enable_$ac_feature=\$ac_optarg ;;
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"enable_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval enable_$ac_useropt=\$ac_optarg ;;
|
||
|
||
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
||
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
||
@@ -1035,22 +1093,38 @@
|
||
ac_init_version=: ;;
|
||
|
||
-with-* | --with-*)
|
||
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
||
- eval with_$ac_package=\$ac_optarg ;;
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"with_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval with_$ac_useropt=\$ac_optarg ;;
|
||
|
||
-without-* | --without-*)
|
||
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
||
- eval with_$ac_package=no ;;
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"with_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval with_$ac_useropt=no ;;
|
||
|
||
--x)
|
||
# Obsolete; use --with-x.
|
||
@@ -1070,7 +1144,7 @@
|
||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||
x_libraries=$ac_optarg ;;
|
||
|
||
- -*) { echo "$as_me: error: unrecognized option: $ac_option
|
||
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
|
||
Try \`$0 --help' for more information." >&2
|
||
{ (exit 1); exit 1; }; }
|
||
;;
|
||
@@ -1079,16 +1153,16 @@
|
||
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
||
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
eval $ac_envvar=\$ac_optarg
|
||
export $ac_envvar ;;
|
||
|
||
*)
|
||
# FIXME: should be removed in autoconf 3.0.
|
||
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
||
;;
|
||
|
||
@@ -1097,22 +1171,38 @@
|
||
|
||
if test -n "$ac_prev"; then
|
||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||
- { echo "$as_me: error: missing argument to $ac_option" >&2
|
||
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
-# Be sure to have absolute directory names.
|
||
+if test -n "$ac_unrecognized_opts"; then
|
||
+ case $enable_option_checking in
|
||
+ no) ;;
|
||
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
|
||
+ { (exit 1); exit 1; }; } ;;
|
||
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
||
+ esac
|
||
+fi
|
||
+
|
||
+# Check all directory arguments for consistency.
|
||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||
libdir localedir mandir
|
||
do
|
||
eval ac_val=\$$ac_var
|
||
+ # Remove trailing slashes.
|
||
+ case $ac_val in
|
||
+ */ )
|
||
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
|
||
+ eval $ac_var=\$ac_val;;
|
||
+ esac
|
||
+ # Be sure to have absolute directory names.
|
||
case $ac_val in
|
||
[\\/$]* | ?:[\\/]* ) continue;;
|
||
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
||
esac
|
||
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
||
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
done
|
||
|
||
@@ -1127,7 +1217,7 @@
|
||
if test "x$host_alias" != x; then
|
||
if test "x$build_alias" = x; then
|
||
cross_compiling=maybe
|
||
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
If a cross compiler is detected then cross compile mode will be used." >&2
|
||
elif test "x$build_alias" != "x$host_alias"; then
|
||
cross_compiling=yes
|
||
@@ -1143,10 +1233,10 @@
|
||
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
||
ac_ls_di=`ls -di .` &&
|
||
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
||
- { echo "$as_me: error: Working directory cannot be determined" >&2
|
||
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
|
||
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
|
||
|
||
@@ -1154,12 +1244,12 @@
|
||
if test -z "$srcdir"; then
|
||
ac_srcdir_defaulted=yes
|
||
# Try the directory containing this script, then the parent directory.
|
||
- ac_confdir=`$as_dirname -- "$0" ||
|
||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$0" : 'X\(//\)[^/]' \| \
|
||
- X"$0" : 'X\(//\)$' \| \
|
||
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||
-echo X"$0" |
|
||
+ ac_confdir=`$as_dirname -- "$as_myself" ||
|
||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
+ X"$as_myself" : 'X\(//\)[^/]' \| \
|
||
+ X"$as_myself" : 'X\(//\)$' \| \
|
||
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X"$as_myself" |
|
||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
s//\1/
|
||
q
|
||
@@ -1186,12 +1276,12 @@
|
||
fi
|
||
if test ! -r "$srcdir/$ac_unique_file"; then
|
||
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
||
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
||
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
||
ac_abs_confdir=`(
|
||
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
|
||
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
pwd)`
|
||
# When building in place, set srcdir=.
|
||
@@ -1240,9 +1330,9 @@
|
||
|
||
Installation directories:
|
||
--prefix=PREFIX install architecture-independent files in PREFIX
|
||
- [$ac_default_prefix]
|
||
+ [$ac_default_prefix]
|
||
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
|
||
- [PREFIX]
|
||
+ [PREFIX]
|
||
|
||
By default, \`make install' will install all the files in
|
||
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
|
||
@@ -1252,25 +1342,25 @@
|
||
For better control, use the options below.
|
||
|
||
Fine tuning of the installation directories:
|
||
- --bindir=DIR user executables [EPREFIX/bin]
|
||
- --sbindir=DIR system admin executables [EPREFIX/sbin]
|
||
- --libexecdir=DIR program executables [EPREFIX/libexec]
|
||
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||
- --libdir=DIR object code libraries [EPREFIX/lib]
|
||
- --includedir=DIR C header files [PREFIX/include]
|
||
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
||
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
||
- --infodir=DIR info documentation [DATAROOTDIR/info]
|
||
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
||
- --mandir=DIR man documentation [DATAROOTDIR/man]
|
||
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
||
- --htmldir=DIR html documentation [DOCDIR]
|
||
- --dvidir=DIR dvi documentation [DOCDIR]
|
||
- --pdfdir=DIR pdf documentation [DOCDIR]
|
||
- --psdir=DIR ps documentation [DOCDIR]
|
||
+ --bindir=DIR user executables [EPREFIX/bin]
|
||
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
|
||
+ --libexecdir=DIR program executables [EPREFIX/libexec]
|
||
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||
+ --libdir=DIR object code libraries [EPREFIX/lib]
|
||
+ --includedir=DIR C header files [PREFIX/include]
|
||
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
||
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
||
+ --infodir=DIR info documentation [DATAROOTDIR/info]
|
||
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
||
+ --mandir=DIR man documentation [DATAROOTDIR/man]
|
||
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
||
+ --htmldir=DIR html documentation [DOCDIR]
|
||
+ --dvidir=DIR dvi documentation [DOCDIR]
|
||
+ --pdfdir=DIR pdf documentation [DOCDIR]
|
||
+ --psdir=DIR ps documentation [DOCDIR]
|
||
_ACEOF
|
||
|
||
cat <<\_ACEOF
|
||
@@ -1287,6 +1377,7 @@
|
||
cat <<\_ACEOF
|
||
|
||
Optional Features:
|
||
+ --disable-option-checking ignore unrecognized --enable/--with options
|
||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||
--enable-klibc Use this to link the tools to klibc. Set KLCC to the
|
||
@@ -1306,7 +1397,7 @@
|
||
libraries statically. Default is dynamic linking
|
||
--enable-shared_lib Use this to generate shared libdmraid and link the
|
||
tools to it. Default is static libdmraid
|
||
- --disable-testing Disable testing with mapped devices
|
||
+ --disable-testing Enable testing with mapped devices
|
||
|
||
Optional Packages:
|
||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||
@@ -1334,15 +1425,17 @@
|
||
if test "$ac_init_help" = "recursive"; then
|
||
# If there are subdirs, report their specific --help.
|
||
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
||
- test -d "$ac_dir" || continue
|
||
+ test -d "$ac_dir" ||
|
||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
|
||
+ continue
|
||
ac_builddir=.
|
||
|
||
case "$ac_dir" in
|
||
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
*)
|
||
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
||
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
||
# A ".." for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
||
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
||
case $ac_top_builddir_sub in
|
||
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
||
@@ -1378,7 +1471,7 @@
|
||
echo &&
|
||
$SHELL "$ac_srcdir/configure" --help=recursive
|
||
else
|
||
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||
fi || ac_status=$?
|
||
cd "$ac_pwd" || { ac_status=$?; break; }
|
||
done
|
||
@@ -1388,10 +1481,10 @@
|
||
if $ac_init_version; then
|
||
cat <<\_ACEOF
|
||
configure
|
||
-generated by GNU Autoconf 2.61
|
||
+generated by GNU Autoconf 2.63
|
||
|
||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||
This configure script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it.
|
||
_ACEOF
|
||
@@ -1402,7 +1495,7 @@
|
||
running configure, to aid debugging if configure makes a mistake.
|
||
|
||
It was created by $as_me, which was
|
||
-generated by GNU Autoconf 2.61. Invocation command line was
|
||
+generated by GNU Autoconf 2.63. Invocation command line was
|
||
|
||
$ $0 $@
|
||
|
||
@@ -1438,7 +1531,7 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- echo "PATH: $as_dir"
|
||
+ $as_echo "PATH: $as_dir"
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
@@ -1473,7 +1566,7 @@
|
||
| -silent | --silent | --silen | --sile | --sil)
|
||
continue ;;
|
||
*\'*)
|
||
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
esac
|
||
case $ac_pass in
|
||
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
||
@@ -1525,11 +1618,12 @@
|
||
case $ac_val in #(
|
||
*${as_nl}*)
|
||
case $ac_var in #(
|
||
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
||
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
||
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
||
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
||
esac
|
||
case $ac_var in #(
|
||
_ | IFS | as_nl) ;; #(
|
||
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
||
*) $as_unset $ac_var ;;
|
||
esac ;;
|
||
esac
|
||
@@ -1559,9 +1653,9 @@
|
||
do
|
||
eval ac_val=\$$ac_var
|
||
case $ac_val in
|
||
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
esac
|
||
- echo "$ac_var='\''$ac_val'\''"
|
||
+ $as_echo "$ac_var='\''$ac_val'\''"
|
||
done | sort
|
||
echo
|
||
|
||
@@ -1576,9 +1670,9 @@
|
||
do
|
||
eval ac_val=\$$ac_var
|
||
case $ac_val in
|
||
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
esac
|
||
- echo "$ac_var='\''$ac_val'\''"
|
||
+ $as_echo "$ac_var='\''$ac_val'\''"
|
||
done | sort
|
||
echo
|
||
fi
|
||
@@ -1594,8 +1688,8 @@
|
||
echo
|
||
fi
|
||
test "$ac_signal" != 0 &&
|
||
- echo "$as_me: caught signal $ac_signal"
|
||
- echo "$as_me: exit $exit_status"
|
||
+ $as_echo "$as_me: caught signal $ac_signal"
|
||
+ $as_echo "$as_me: exit $exit_status"
|
||
} >&5
|
||
rm -f core *.core core.conftest.* &&
|
||
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
||
@@ -1637,21 +1731,24 @@
|
||
|
||
|
||
# Let the site file select an alternate cache file if it wants to.
|
||
-# Prefer explicitly selected file to automatically selected ones.
|
||
+# Prefer an explicitly selected file to automatically selected ones.
|
||
+ac_site_file1=NONE
|
||
+ac_site_file2=NONE
|
||
if test -n "$CONFIG_SITE"; then
|
||
- set x "$CONFIG_SITE"
|
||
+ ac_site_file1=$CONFIG_SITE
|
||
elif test "x$prefix" != xNONE; then
|
||
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
||
+ ac_site_file1=$prefix/share/config.site
|
||
+ ac_site_file2=$prefix/etc/config.site
|
||
else
|
||
- set x "$ac_default_prefix/share/config.site" \
|
||
- "$ac_default_prefix/etc/config.site"
|
||
+ ac_site_file1=$ac_default_prefix/share/config.site
|
||
+ ac_site_file2=$ac_default_prefix/etc/config.site
|
||
fi
|
||
-shift
|
||
-for ac_site_file
|
||
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
||
do
|
||
+ test "x$ac_site_file" = xNONE && continue
|
||
if test -r "$ac_site_file"; then
|
||
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
||
-echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
||
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
sed 's/^/| /' "$ac_site_file" >&5
|
||
. "$ac_site_file"
|
||
fi
|
||
@@ -1661,16 +1758,16 @@
|
||
# Some versions of bash will fail to source /dev/null (special
|
||
# files actually), so we avoid doing that.
|
||
if test -f "$cache_file"; then
|
||
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
||
-echo "$as_me: loading cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
||
+$as_echo "$as_me: loading cache $cache_file" >&6;}
|
||
case $cache_file in
|
||
[\\/]* | ?:[\\/]* ) . "$cache_file";;
|
||
*) . "./$cache_file";;
|
||
esac
|
||
fi
|
||
else
|
||
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
||
-echo "$as_me: creating cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
||
+$as_echo "$as_me: creating cache $cache_file" >&6;}
|
||
>$cache_file
|
||
fi
|
||
|
||
@@ -1684,29 +1781,38 @@
|
||
eval ac_new_val=\$ac_env_${ac_var}_value
|
||
case $ac_old_set,$ac_new_set in
|
||
set,)
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
||
ac_cache_corrupted=: ;;
|
||
,set)
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
||
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
||
ac_cache_corrupted=: ;;
|
||
,);;
|
||
*)
|
||
if test "x$ac_old_val" != "x$ac_new_val"; then
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
||
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
||
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
|
||
-echo "$as_me: former value: $ac_old_val" >&2;}
|
||
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
|
||
-echo "$as_me: current value: $ac_new_val" >&2;}
|
||
- ac_cache_corrupted=:
|
||
+ # differences in whitespace do not lead to failure.
|
||
+ ac_old_val_w=`echo x $ac_old_val`
|
||
+ ac_new_val_w=`echo x $ac_new_val`
|
||
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
|
||
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
||
+ ac_cache_corrupted=:
|
||
+ else
|
||
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
||
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
|
||
+ eval $ac_var=\$ac_old_val
|
||
+ fi
|
||
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
|
||
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
|
||
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
||
fi;;
|
||
esac
|
||
# Pass precious variables to config.status.
|
||
if test "$ac_new_set" = set; then
|
||
case $ac_new_val in
|
||
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
*) ac_arg=$ac_var=$ac_new_val ;;
|
||
esac
|
||
case " $ac_configure_args " in
|
||
@@ -1716,10 +1822,12 @@
|
||
fi
|
||
done
|
||
if $ac_cache_corrupted; then
|
||
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
||
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
||
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+ { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
||
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
@@ -1764,8 +1872,8 @@
|
||
fi
|
||
done
|
||
if test -z "$ac_aux_dir"; then
|
||
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf \"$srcdir\"/autoconf" >&5
|
||
-echo "$as_me: error: cannot find install-sh or install.sh in autoconf \"$srcdir\"/autoconf" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf \"$srcdir\"/autoconf" >&5
|
||
+$as_echo "$as_me: error: cannot find install-sh or install.sh in autoconf \"$srcdir\"/autoconf" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
@@ -1781,34 +1889,34 @@
|
||
|
||
# Make sure we can run config.sub.
|
||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
||
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
||
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
|
||
-{ echo "$as_me:$LINENO: checking build system type" >&5
|
||
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
|
||
+$as_echo_n "checking build system type... " >&6; }
|
||
if test "${ac_cv_build+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_build_alias=$build_alias
|
||
test "x$ac_build_alias" = x &&
|
||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||
test "x$ac_build_alias" = x &&
|
||
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
||
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
||
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||
-echo "${ECHO_T}$ac_cv_build" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||
+$as_echo "$ac_cv_build" >&6; }
|
||
case $ac_cv_build in
|
||
*-*-*) ;;
|
||
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
||
-echo "$as_me: error: invalid value of canonical build" >&2;}
|
||
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
||
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
esac
|
||
build=$ac_cv_build
|
||
@@ -1825,27 +1933,27 @@
|
||
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking host system type" >&5
|
||
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
|
||
+$as_echo_n "checking host system type... " >&6; }
|
||
if test "${ac_cv_host+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test "x$host_alias" = x; then
|
||
ac_cv_host=$ac_cv_build
|
||
else
|
||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
||
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
||
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||
-echo "${ECHO_T}$ac_cv_host" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||
+$as_echo "$ac_cv_host" >&6; }
|
||
case $ac_cv_host in
|
||
*-*-*) ;;
|
||
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
||
-echo "$as_me: error: invalid value of canonical host" >&2;}
|
||
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
||
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
esac
|
||
host=$ac_cv_host
|
||
@@ -1862,27 +1970,27 @@
|
||
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking target system type" >&5
|
||
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
|
||
+$as_echo_n "checking target system type... " >&6; }
|
||
if test "${ac_cv_target+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test "x$target_alias" = x; then
|
||
ac_cv_target=$ac_cv_host
|
||
else
|
||
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
|
||
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
|
||
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
||
-echo "${ECHO_T}$ac_cv_target" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
||
+$as_echo "$ac_cv_target" >&6; }
|
||
case $ac_cv_target in
|
||
*-*-*) ;;
|
||
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
|
||
-echo "$as_me: error: invalid value of canonical target" >&2;}
|
||
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
|
||
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
esac
|
||
target=$ac_cv_target
|
||
@@ -1910,10 +2018,10 @@
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_AWK+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$AWK"; then
|
||
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
||
@@ -1926,7 +2034,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_AWK="$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -1937,11 +2045,11 @@
|
||
fi
|
||
AWK=$ac_cv_prog_AWK
|
||
if test -n "$AWK"; then
|
||
- { echo "$as_me:$LINENO: result: $AWK" >&5
|
||
-echo "${ECHO_T}$AWK" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
|
||
+$as_echo "$AWK" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -1961,11 +2069,12 @@
|
||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||
# OS/2's system install, which has a completely different semantic
|
||
# ./install, which can be erroneously created by make from ./install.sh.
|
||
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
||
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
||
+# Reject install programs that cannot install multiple files.
|
||
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
||
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
||
if test -z "$INSTALL"; then
|
||
if test "${ac_cv_path_install+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
for as_dir in $PATH
|
||
@@ -1994,17 +2103,29 @@
|
||
# program-specific install script used by HP pwplus--don't use.
|
||
:
|
||
else
|
||
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||
- break 3
|
||
+ rm -rf conftest.one conftest.two conftest.dir
|
||
+ echo one > conftest.one
|
||
+ echo two > conftest.two
|
||
+ mkdir conftest.dir
|
||
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
||
+ test -s conftest.one && test -s conftest.two &&
|
||
+ test -s conftest.dir/conftest.one &&
|
||
+ test -s conftest.dir/conftest.two
|
||
+ then
|
||
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||
+ break 3
|
||
+ fi
|
||
fi
|
||
fi
|
||
done
|
||
done
|
||
;;
|
||
esac
|
||
+
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
+rm -rf conftest.one conftest.two conftest.dir
|
||
|
||
fi
|
||
if test "${ac_cv_path_install+set}" = set; then
|
||
@@ -2017,8 +2138,8 @@
|
||
INSTALL=$ac_install_sh
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
||
-echo "${ECHO_T}$INSTALL" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
|
||
+$as_echo "$INSTALL" >&6; }
|
||
|
||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||
# It thinks the first close brace ends the variable substitution.
|
||
@@ -2028,22 +2149,23 @@
|
||
|
||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||
|
||
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
||
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
||
+$as_echo_n "checking whether ln -s works... " >&6; }
|
||
LN_S=$as_ln_s
|
||
if test "$LN_S" = "ln -s"; then
|
||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
|
||
+$as_echo "yes" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
||
-echo "${ECHO_T}no, using $LN_S" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
||
+$as_echo "no, using $LN_S" >&6; }
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
||
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
||
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
||
+set x ${MAKE-make}
|
||
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
||
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.make <<\_ACEOF
|
||
SHELL = /bin/sh
|
||
@@ -2060,22 +2182,22 @@
|
||
rm -f conftest.make
|
||
fi
|
||
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
|
||
+$as_echo "yes" >&6; }
|
||
SET_MAKE=
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
SET_MAKE="MAKE=${MAKE-make}"
|
||
fi
|
||
|
||
if test -n "$ac_tool_prefix"; then
|
||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_RANLIB+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$RANLIB"; then
|
||
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
||
@@ -2088,7 +2210,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2099,11 +2221,11 @@
|
||
fi
|
||
RANLIB=$ac_cv_prog_RANLIB
|
||
if test -n "$RANLIB"; then
|
||
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||
-echo "${ECHO_T}$RANLIB" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||
+$as_echo "$RANLIB" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2112,10 +2234,10 @@
|
||
ac_ct_RANLIB=$RANLIB
|
||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||
set dummy ranlib; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_RANLIB"; then
|
||
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
||
@@ -2128,7 +2250,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_RANLIB="ranlib"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2139,11 +2261,11 @@
|
||
fi
|
||
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
||
if test -n "$ac_ct_RANLIB"; then
|
||
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
||
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
||
+$as_echo "$ac_ct_RANLIB" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
if test "x$ac_ct_RANLIB" = x; then
|
||
@@ -2151,12 +2273,8 @@
|
||
else
|
||
case $cross_compiling:$ac_tool_warned in
|
||
yes:)
|
||
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
ac_tool_warned=yes ;;
|
||
esac
|
||
RANLIB=$ac_ct_RANLIB
|
||
@@ -2185,10 +2303,10 @@
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_KLCC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$KLCC"; then
|
||
ac_cv_prog_KLCC="$KLCC" # Let the user override the test.
|
||
@@ -2201,7 +2319,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_KLCC="$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2212,11 +2330,11 @@
|
||
fi
|
||
KLCC=$ac_cv_prog_KLCC
|
||
if test -n "$KLCC"; then
|
||
- { echo "$as_me:$LINENO: result: $KLCC" >&5
|
||
-echo "${ECHO_T}$KLCC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $KLCC" >&5
|
||
+$as_echo "$KLCC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2229,10 +2347,10 @@
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_KLCC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$KLCC"; then
|
||
ac_cv_prog_KLCC="$KLCC" # Let the user override the test.
|
||
@@ -2245,7 +2363,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_KLCC="$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2256,11 +2374,11 @@
|
||
fi
|
||
KLCC=$ac_cv_prog_KLCC
|
||
if test -n "$KLCC"; then
|
||
- { echo "$as_me:$LINENO: result: $KLCC" >&5
|
||
-echo "${ECHO_T}$KLCC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $KLCC" >&5
|
||
+$as_echo "$KLCC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2270,8 +2388,8 @@
|
||
|
||
fi
|
||
if test "X$KLCC" = Xno; then
|
||
- { { echo "$as_me:$LINENO: error: cannot find klibc frontend 'klcc'!" >&5
|
||
-echo "$as_me: error: cannot find klibc frontend 'klcc'!" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: cannot find klibc frontend 'klcc'!" >&5
|
||
+$as_echo "$as_me: error: cannot find klibc frontend 'klcc'!" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
@@ -2287,8 +2405,8 @@
|
||
# At least KLIBC_LIB_DIR should be valid, else klibc is too old or
|
||
# something went wrong
|
||
if test ! -d "$KLIBC_LIB_DIR"; then
|
||
- { { echo "$as_me:$LINENO: error: your klibc installation is too old or not functional!" >&5
|
||
-echo "$as_me: error: your klibc installation is too old or not functional!" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: your klibc installation is too old or not functional!" >&5
|
||
+$as_echo "$as_me: error: your klibc installation is too old or not functional!" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
fi
|
||
@@ -2309,10 +2427,10 @@
|
||
if test -n "$ac_tool_prefix"; then
|
||
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -2325,7 +2443,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2336,11 +2454,11 @@
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2349,10 +2467,10 @@
|
||
ac_ct_CC=$CC
|
||
# Extract the first word of "gcc", so it can be a program name with args.
|
||
set dummy gcc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
@@ -2365,7 +2483,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_CC="gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2376,11 +2494,11 @@
|
||
fi
|
||
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
if test -n "$ac_ct_CC"; then
|
||
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
+$as_echo "$ac_ct_CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
if test "x$ac_ct_CC" = x; then
|
||
@@ -2388,12 +2506,8 @@
|
||
else
|
||
case $cross_compiling:$ac_tool_warned in
|
||
yes:)
|
||
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
ac_tool_warned=yes ;;
|
||
esac
|
||
CC=$ac_ct_CC
|
||
@@ -2406,10 +2520,10 @@
|
||
if test -n "$ac_tool_prefix"; then
|
||
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -2422,7 +2536,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2433,11 +2547,11 @@
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2446,10 +2560,10 @@
|
||
if test -z "$CC"; then
|
||
# Extract the first word of "cc", so it can be a program name with args.
|
||
set dummy cc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -2467,7 +2581,7 @@
|
||
continue
|
||
fi
|
||
ac_cv_prog_CC="cc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2490,11 +2604,11 @@
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2505,10 +2619,10 @@
|
||
do
|
||
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -2521,7 +2635,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2532,11 +2646,11 @@
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2549,10 +2663,10 @@
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
@@ -2565,7 +2679,7 @@
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_CC="$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
@@ -2576,11 +2690,11 @@
|
||
fi
|
||
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
if test -n "$ac_ct_CC"; then
|
||
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
+$as_echo "$ac_ct_CC" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
|
||
@@ -2592,12 +2706,8 @@
|
||
else
|
||
case $cross_compiling:$ac_tool_warned in
|
||
yes:)
|
||
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
ac_tool_warned=yes ;;
|
||
esac
|
||
CC=$ac_ct_CC
|
||
@@ -2607,44 +2717,50 @@
|
||
fi
|
||
|
||
|
||
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { (exit 1); exit 1; }; }; }
|
||
|
||
# Provide some information about the compiler.
|
||
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
||
-ac_compiler=`set X $ac_compile; echo $2`
|
||
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
|
||
+set X $ac_compile
|
||
+ac_compiler=$2
|
||
{ (ac_try="$ac_compiler --version >&5"
|
||
case "(($ac_try" in
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compiler --version >&5") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }
|
||
{ (ac_try="$ac_compiler -v >&5"
|
||
case "(($ac_try" in
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compiler -v >&5") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }
|
||
{ (ac_try="$ac_compiler -V >&5"
|
||
case "(($ac_try" in
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compiler -V >&5") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }
|
||
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -2663,27 +2779,22 @@
|
||
}
|
||
_ACEOF
|
||
ac_clean_files_save=$ac_clean_files
|
||
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
||
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
||
# Try to create an executable without -o first, disregard a.out.
|
||
# It will help us diagnose broken compilers, and finding out an intuition
|
||
# of exeext.
|
||
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
||
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
||
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
-#
|
||
-# List of possible output files, starting from the most likely.
|
||
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
||
-# only as a last resort. b.out is created by i960 compilers.
|
||
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
||
-#
|
||
-# The IRIX 6 linker writes into existing files which may not be
|
||
-# executable, retaining their permissions. Remove them first so a
|
||
-# subsequent execution test works.
|
||
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
||
+$as_echo_n "checking for C compiler default output file name... " >&6; }
|
||
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
+
|
||
+# The possible output files:
|
||
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
|
||
+
|
||
ac_rmfiles=
|
||
for ac_file in $ac_files
|
||
do
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
||
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
||
esac
|
||
done
|
||
@@ -2694,10 +2805,11 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link_default") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }; then
|
||
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
||
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
||
@@ -2708,7 +2820,7 @@
|
||
do
|
||
test -f "$ac_file" || continue
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
|
||
;;
|
||
[ab].out )
|
||
# We found the default executable, but exeext='' is most
|
||
@@ -2735,25 +2847,27 @@
|
||
ac_file=''
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
||
-echo "${ECHO_T}$ac_file" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
|
||
+$as_echo "$ac_file" >&6; }
|
||
if test -z "$ac_file"; then
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: C compiler cannot create executables
|
||
+$as_echo "$as_me: error: C compiler cannot create executables
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 77); exit 77; }; }
|
||
+ { (exit 77); exit 77; }; }; }
|
||
fi
|
||
|
||
ac_exeext=$ac_cv_exeext
|
||
|
||
# Check that the compiler produces executables we can run. If not, either
|
||
# the compiler is broken, or we cross compile.
|
||
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
||
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
||
+$as_echo_n "checking whether the C compiler works... " >&6; }
|
||
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
||
# If not cross compiling, check that we can run a simple program.
|
||
if test "$cross_compiling" != yes; then
|
||
@@ -2762,49 +2876,53 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_try") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }; }; then
|
||
cross_compiling=no
|
||
else
|
||
if test "$cross_compiling" = maybe; then
|
||
cross_compiling=yes
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||
If you meant to cross compile, use \`--host'.
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot run C compiled programs.
|
||
+$as_echo "$as_me: error: cannot run C compiled programs.
|
||
If you meant to cross compile, use \`--host'.
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { (exit 1); exit 1; }; }; }
|
||
fi
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||
+$as_echo "yes" >&6; }
|
||
|
||
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
||
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
||
ac_clean_files=$ac_clean_files_save
|
||
# Check that the compiler produces executables we can run. If not, either
|
||
# the compiler is broken, or we cross compile.
|
||
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
||
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
||
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
||
-echo "${ECHO_T}$cross_compiling" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
||
+$as_echo_n "checking whether we are cross compiling... " >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
||
+$as_echo "$cross_compiling" >&6; }
|
||
|
||
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
||
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
||
+$as_echo_n "checking for suffix of executables... " >&6; }
|
||
if { (ac_try="$ac_link"
|
||
case "(($ac_try" in
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }; then
|
||
# If both `conftest.exe' and `conftest' are `present' (well, observable)
|
||
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
||
@@ -2813,31 +2931,33 @@
|
||
for ac_file in conftest.exe conftest conftest.*; do
|
||
test -f "$ac_file" || continue
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
||
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
break;;
|
||
* ) break;;
|
||
esac
|
||
done
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { (exit 1); exit 1; }; }; }
|
||
fi
|
||
|
||
rm -f conftest$ac_cv_exeext
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
||
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
||
+$as_echo "$ac_cv_exeext" >&6; }
|
||
|
||
rm -f conftest.$ac_ext
|
||
EXEEXT=$ac_cv_exeext
|
||
ac_exeext=$EXEEXT
|
||
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
||
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -2860,40 +2980,43 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }; then
|
||
for ac_file in conftest.o conftest.obj conftest.*; do
|
||
test -f "$ac_file" || continue;
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
|
||
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
||
break;;
|
||
esac
|
||
done
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { (exit 1); exit 1; }; }; }
|
||
fi
|
||
|
||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
||
-echo "${ECHO_T}$ac_cv_objext" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
||
+$as_echo "$ac_cv_objext" >&6; }
|
||
OBJEXT=$ac_cv_objext
|
||
ac_objext=$OBJEXT
|
||
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
||
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -2919,20 +3042,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_compiler_gnu=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_compiler_gnu=no
|
||
@@ -2942,15 +3066,19 @@
|
||
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
||
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
||
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
||
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
||
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
|
||
+if test $ac_compiler_gnu = yes; then
|
||
+ GCC=yes
|
||
+else
|
||
+ GCC=
|
||
+fi
|
||
ac_test_CFLAGS=${CFLAGS+set}
|
||
ac_save_CFLAGS=$CFLAGS
|
||
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_save_c_werror_flag=$ac_c_werror_flag
|
||
ac_c_werror_flag=yes
|
||
@@ -2977,20 +3105,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_prog_cc_g=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
CFLAGS=""
|
||
@@ -3015,20 +3144,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
:
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_c_werror_flag=$ac_save_c_werror_flag
|
||
@@ -3054,20 +3184,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_prog_cc_g=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
@@ -3082,8 +3213,8 @@
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
ac_c_werror_flag=$ac_save_c_werror_flag
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
||
+$as_echo "$ac_cv_prog_cc_g" >&6; }
|
||
if test "$ac_test_CFLAGS" = set; then
|
||
CFLAGS=$ac_save_CFLAGS
|
||
elif test $ac_cv_prog_cc_g = yes; then
|
||
@@ -3099,10 +3230,10 @@
|
||
CFLAGS=
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
||
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_cv_prog_cc_c89=no
|
||
ac_save_CC=$CC
|
||
@@ -3173,20 +3304,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_prog_cc_c89=$ac_arg
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
@@ -3202,15 +3334,15 @@
|
||
# AC_CACHE_VAL
|
||
case "x$ac_cv_prog_cc_c89" in
|
||
x)
|
||
- { echo "$as_me:$LINENO: result: none needed" >&5
|
||
-echo "${ECHO_T}none needed" >&6; } ;;
|
||
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
|
||
+$as_echo "none needed" >&6; } ;;
|
||
xno)
|
||
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
||
-echo "${ECHO_T}unsupported" >&6; } ;;
|
||
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
|
||
+$as_echo "unsupported" >&6; } ;;
|
||
*)
|
||
CC="$CC $ac_cv_prog_cc_c89"
|
||
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
||
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
||
esac
|
||
|
||
|
||
@@ -3229,11 +3361,11 @@
|
||
|
||
ac_header_dirent=no
|
||
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
|
||
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
|
||
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
|
||
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
|
||
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -3259,20 +3391,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
eval "$as_ac_Header=yes"
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
eval "$as_ac_Header=no"
|
||
@@ -3280,12 +3413,15 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+as_val=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
ac_header_dirent=$ac_hdr; break
|
||
@@ -3294,10 +3430,10 @@
|
||
done
|
||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||
if test $ac_header_dirent = dirent.h; then
|
||
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
|
||
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
|
||
+$as_echo_n "checking for library containing opendir... " >&6; }
|
||
if test "${ac_cv_search_opendir+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_func_search_save_LIBS=$LIBS
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -3335,26 +3471,30 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
ac_cv_search_opendir=$ac_res
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext
|
||
if test "${ac_cv_search_opendir+set}" = set; then
|
||
@@ -3369,8 +3509,8 @@
|
||
rm conftest.$ac_ext
|
||
LIBS=$ac_func_search_save_LIBS
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
|
||
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
|
||
+$as_echo "$ac_cv_search_opendir" >&6; }
|
||
ac_res=$ac_cv_search_opendir
|
||
if test "$ac_res" != no; then
|
||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||
@@ -3378,10 +3518,10 @@
|
||
fi
|
||
|
||
else
|
||
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
|
||
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
|
||
+$as_echo_n "checking for library containing opendir... " >&6; }
|
||
if test "${ac_cv_search_opendir+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_func_search_save_LIBS=$LIBS
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -3419,26 +3559,30 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
ac_cv_search_opendir=$ac_res
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext
|
||
if test "${ac_cv_search_opendir+set}" = set; then
|
||
@@ -3453,8 +3597,8 @@
|
||
rm conftest.$ac_ext
|
||
LIBS=$ac_func_search_save_LIBS
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
|
||
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
|
||
+$as_echo "$ac_cv_search_opendir" >&6; }
|
||
ac_res=$ac_cv_search_opendir
|
||
if test "$ac_res" != no; then
|
||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||
@@ -3468,15 +3612,15 @@
|
||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
||
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
||
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
|
||
# On Suns, sometimes $CPP names a directory.
|
||
if test -n "$CPP" && test -d "$CPP"; then
|
||
CPP=
|
||
fi
|
||
if test -z "$CPP"; then
|
||
if test "${ac_cv_prog_CPP+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
# Double quotes because CPP needs to be expanded
|
||
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
||
@@ -3508,20 +3652,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then
|
||
:
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
# Broken: fails on valid input.
|
||
@@ -3545,13 +3690,14 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
@@ -3559,7 +3705,7 @@
|
||
# Broken: success on invalid input.
|
||
continue
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
# Passes both tests.
|
||
@@ -3584,8 +3730,8 @@
|
||
else
|
||
ac_cv_prog_CPP=$CPP
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $CPP" >&5
|
||
-echo "${ECHO_T}$CPP" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
|
||
+$as_echo "$CPP" >&6; }
|
||
ac_preproc_ok=false
|
||
for ac_c_preproc_warn_flag in '' yes
|
||
do
|
||
@@ -3613,20 +3759,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then
|
||
:
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
# Broken: fails on valid input.
|
||
@@ -3650,13 +3797,14 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
@@ -3664,7 +3812,7 @@
|
||
# Broken: success on invalid input.
|
||
continue
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
# Passes both tests.
|
||
@@ -3680,11 +3828,13 @@
|
||
if $ac_preproc_ok; then
|
||
:
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
||
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
||
See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
||
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
||
See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { (exit 1); exit 1; }; }; }
|
||
fi
|
||
|
||
ac_ext=c
|
||
@@ -3694,42 +3844,37 @@
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
||
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_GREP+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- # Extract the first word of "grep ggrep" to use in msg output
|
||
-if test -z "$GREP"; then
|
||
-set dummy grep ggrep; ac_prog_name=$2
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
+ if test -z "$GREP"; then
|
||
ac_path_GREP_found=false
|
||
-# Loop through the user's path and test for each of PROGNAME-LIST
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_prog in grep ggrep; do
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
||
- # Check for GNU ac_path_GREP and select it if it is found.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
||
+# Check for GNU ac_path_GREP and select it if it is found.
|
||
# Check for GNU $ac_path_GREP
|
||
case `"$ac_path_GREP" --version 2>&1` in
|
||
*GNU*)
|
||
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
||
*)
|
||
ac_count=0
|
||
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
||
+ $as_echo_n 0123456789 >"conftest.in"
|
||
while :
|
||
do
|
||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||
mv "conftest.tmp" "conftest.in"
|
||
cp "conftest.in" "conftest.nl"
|
||
- echo 'GREP' >> "conftest.nl"
|
||
+ $as_echo 'GREP' >> "conftest.nl"
|
||
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||
ac_count=`expr $ac_count + 1`
|
||
@@ -3744,74 +3889,60 @@
|
||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||
esac
|
||
|
||
-
|
||
- $ac_path_GREP_found && break 3
|
||
+ $ac_path_GREP_found && break 3
|
||
+ done
|
||
done
|
||
done
|
||
-
|
||
-done
|
||
IFS=$as_save_IFS
|
||
-
|
||
-
|
||
-fi
|
||
-
|
||
-GREP="$ac_cv_path_GREP"
|
||
-if test -z "$GREP"; then
|
||
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
||
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
||
+ if test -z "$ac_cv_path_GREP"; then
|
||
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
||
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
-fi
|
||
-
|
||
+ fi
|
||
else
|
||
ac_cv_path_GREP=$GREP
|
||
fi
|
||
|
||
-
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
||
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
||
+$as_echo "$ac_cv_path_GREP" >&6; }
|
||
GREP="$ac_cv_path_GREP"
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking for egrep" >&5
|
||
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
|
||
+$as_echo_n "checking for egrep... " >&6; }
|
||
if test "${ac_cv_path_EGREP+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||
then ac_cv_path_EGREP="$GREP -E"
|
||
else
|
||
- # Extract the first word of "egrep" to use in msg output
|
||
-if test -z "$EGREP"; then
|
||
-set dummy egrep; ac_prog_name=$2
|
||
-if test "${ac_cv_path_EGREP+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
+ if test -z "$EGREP"; then
|
||
ac_path_EGREP_found=false
|
||
-# Loop through the user's path and test for each of PROGNAME-LIST
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_prog in egrep; do
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
||
- # Check for GNU ac_path_EGREP and select it if it is found.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
||
+# Check for GNU ac_path_EGREP and select it if it is found.
|
||
# Check for GNU $ac_path_EGREP
|
||
case `"$ac_path_EGREP" --version 2>&1` in
|
||
*GNU*)
|
||
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
||
*)
|
||
ac_count=0
|
||
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
||
+ $as_echo_n 0123456789 >"conftest.in"
|
||
while :
|
||
do
|
||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||
mv "conftest.tmp" "conftest.in"
|
||
cp "conftest.in" "conftest.nl"
|
||
- echo 'EGREP' >> "conftest.nl"
|
||
+ $as_echo 'EGREP' >> "conftest.nl"
|
||
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||
ac_count=`expr $ac_count + 1`
|
||
@@ -3826,40 +3957,31 @@
|
||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||
esac
|
||
|
||
-
|
||
- $ac_path_EGREP_found && break 3
|
||
+ $ac_path_EGREP_found && break 3
|
||
+ done
|
||
done
|
||
done
|
||
-
|
||
-done
|
||
IFS=$as_save_IFS
|
||
-
|
||
-
|
||
-fi
|
||
-
|
||
-EGREP="$ac_cv_path_EGREP"
|
||
-if test -z "$EGREP"; then
|
||
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
||
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
||
+ if test -z "$ac_cv_path_EGREP"; then
|
||
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
||
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
-fi
|
||
-
|
||
+ fi
|
||
else
|
||
ac_cv_path_EGREP=$EGREP
|
||
fi
|
||
|
||
-
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
||
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
||
+$as_echo "$ac_cv_path_EGREP" >&6; }
|
||
EGREP="$ac_cv_path_EGREP"
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
||
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -3886,20 +4008,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_header_stdc=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_header_stdc=no
|
||
@@ -3991,37 +4114,40 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||
{ (case "(($ac_try" in
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_try") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); }; }; then
|
||
:
|
||
else
|
||
- echo "$as_me: program exited with status $ac_status" >&5
|
||
-echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
||
+$as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
( exit $ac_status )
|
||
ac_cv_header_stdc=no
|
||
fi
|
||
+rm -rf conftest.dSYM
|
||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
|
||
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
||
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
||
+$as_echo "$ac_cv_header_stdc" >&6; }
|
||
if test $ac_cv_header_stdc = yes; then
|
||
|
||
cat >>confdefs.h <<\_ACEOF
|
||
@@ -4043,11 +4169,11 @@
|
||
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
||
inttypes.h stdint.h unistd.h
|
||
do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -4065,20 +4191,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
eval "$as_ac_Header=yes"
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
eval "$as_ac_Header=no"
|
||
@@ -4086,12 +4213,15 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+as_val=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -4104,20 +4234,21 @@
|
||
|
||
for ac_header in fcntl.h sys/ioctl.h unistd.h
|
||
do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
else
|
||
# Is the header compilable?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
+$as_echo_n "checking $ac_header usability... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -4133,32 +4264,33 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_header_compiler=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_compiler=no
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
+$as_echo "$ac_header_compiler" >&6; }
|
||
|
||
# Is the header present?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
+$as_echo_n "checking $ac_header presence... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -4172,69 +4304,73 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then
|
||
ac_header_preproc=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_preproc=no
|
||
fi
|
||
|
||
rm -f conftest.err conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
+$as_echo "$ac_header_preproc" >&6; }
|
||
|
||
# So? What about this header?
|
||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
ac_header_preproc=yes
|
||
;;
|
||
no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
|
||
;;
|
||
esac
|
||
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
eval "$as_ac_Header=\$ac_header_preproc"
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
|
||
fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+as_val=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -4245,20 +4381,21 @@
|
||
|
||
for ac_header in malloc.h
|
||
do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
else
|
||
# Is the header compilable?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
+$as_echo_n "checking $ac_header usability... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -4274,32 +4411,33 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_header_compiler=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_compiler=no
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
+$as_echo "$ac_header_compiler" >&6; }
|
||
|
||
# Is the header present?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
+$as_echo_n "checking $ac_header presence... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -4313,69 +4451,73 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then
|
||
ac_header_preproc=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_preproc=no
|
||
fi
|
||
|
||
rm -f conftest.err conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
+$as_echo "$ac_header_preproc" >&6; }
|
||
|
||
# So? What about this header?
|
||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
ac_header_preproc=yes
|
||
;;
|
||
no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
|
||
;;
|
||
esac
|
||
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
eval "$as_ac_Header=\$ac_header_preproc"
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
|
||
fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+as_val=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -4384,10 +4526,10 @@
|
||
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
|
||
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -4459,20 +4601,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_c_const=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_c_const=no
|
||
@@ -4480,20 +4623,20 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
|
||
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
|
||
+$as_echo "$ac_cv_c_const" >&6; }
|
||
if test $ac_cv_c_const = no; then
|
||
|
||
cat >>confdefs.h <<\_ACEOF
|
||
-#define const
|
||
+#define const /**/
|
||
_ACEOF
|
||
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking for inline" >&5
|
||
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
|
||
+$as_echo_n "checking for inline... " >&6; }
|
||
if test "${ac_cv_c_inline+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_cv_c_inline=no
|
||
for ac_kw in inline __inline__ __inline; do
|
||
@@ -4516,20 +4659,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_c_inline=$ac_kw
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
@@ -4540,8 +4684,8 @@
|
||
done
|
||
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
||
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
|
||
+$as_echo "$ac_cv_c_inline" >&6; }
|
||
|
||
|
||
case $ac_cv_c_inline in
|
||
@@ -4559,26 +4703,58 @@
|
||
;;
|
||
esac
|
||
|
||
-{ echo "$as_me:$LINENO: checking for off_t" >&5
|
||
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
|
||
+$as_echo_n "checking for off_t... " >&6; }
|
||
if test "${ac_cv_type_off_t+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
+ ac_cv_type_off_t=no
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
cat confdefs.h >>conftest.$ac_ext
|
||
cat >>conftest.$ac_ext <<_ACEOF
|
||
/* end confdefs.h. */
|
||
$ac_includes_default
|
||
-typedef off_t ac__type_new_;
|
||
int
|
||
main ()
|
||
{
|
||
-if ((ac__type_new_ *) 0)
|
||
- return 0;
|
||
-if (sizeof (ac__type_new_))
|
||
+if (sizeof (off_t))
|
||
+ return 0;
|
||
+ ;
|
||
return 0;
|
||
+}
|
||
+_ACEOF
|
||
+rm -f conftest.$ac_objext
|
||
+if { (ac_try="$ac_compile"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
+ (eval "$ac_compile") 2>conftest.er1
|
||
+ ac_status=$?
|
||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||
+ rm -f conftest.er1
|
||
+ cat conftest.err >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && {
|
||
+ test -z "$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ } && test -s conftest.$ac_objext; then
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+$ac_includes_default
|
||
+int
|
||
+main ()
|
||
+{
|
||
+if (sizeof ((off_t)))
|
||
+ return 0;
|
||
;
|
||
return 0;
|
||
}
|
||
@@ -4589,30 +4765,39 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
- ac_cv_type_off_t=yes
|
||
+ :
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ ac_cv_type_off_t=yes
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
- ac_cv_type_off_t=no
|
||
+
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
|
||
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
|
||
-if test $ac_cv_type_off_t = yes; then
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
|
||
+$as_echo "$ac_cv_type_off_t" >&6; }
|
||
+if test "x$ac_cv_type_off_t" = x""yes; then
|
||
:
|
||
else
|
||
|
||
@@ -4622,26 +4807,58 @@
|
||
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking for pid_t" >&5
|
||
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
|
||
+$as_echo_n "checking for pid_t... " >&6; }
|
||
if test "${ac_cv_type_pid_t+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
+ ac_cv_type_pid_t=no
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
cat confdefs.h >>conftest.$ac_ext
|
||
cat >>conftest.$ac_ext <<_ACEOF
|
||
/* end confdefs.h. */
|
||
$ac_includes_default
|
||
-typedef pid_t ac__type_new_;
|
||
int
|
||
main ()
|
||
{
|
||
-if ((ac__type_new_ *) 0)
|
||
- return 0;
|
||
-if (sizeof (ac__type_new_))
|
||
+if (sizeof (pid_t))
|
||
+ return 0;
|
||
+ ;
|
||
return 0;
|
||
+}
|
||
+_ACEOF
|
||
+rm -f conftest.$ac_objext
|
||
+if { (ac_try="$ac_compile"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
+ (eval "$ac_compile") 2>conftest.er1
|
||
+ ac_status=$?
|
||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||
+ rm -f conftest.er1
|
||
+ cat conftest.err >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && {
|
||
+ test -z "$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ } && test -s conftest.$ac_objext; then
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+$ac_includes_default
|
||
+int
|
||
+main ()
|
||
+{
|
||
+if (sizeof ((pid_t)))
|
||
+ return 0;
|
||
;
|
||
return 0;
|
||
}
|
||
@@ -4652,30 +4869,39 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
- ac_cv_type_pid_t=yes
|
||
+ :
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
- ac_cv_type_pid_t=no
|
||
+ ac_cv_type_pid_t=yes
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
|
||
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
|
||
-if test $ac_cv_type_pid_t = yes; then
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
|
||
+$as_echo "$ac_cv_type_pid_t" >&6; }
|
||
+if test "x$ac_cv_type_pid_t" = x""yes; then
|
||
:
|
||
else
|
||
|
||
@@ -4685,26 +4911,58 @@
|
||
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking for size_t" >&5
|
||
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
|
||
+$as_echo_n "checking for size_t... " >&6; }
|
||
if test "${ac_cv_type_size_t+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
+ ac_cv_type_size_t=no
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
cat confdefs.h >>conftest.$ac_ext
|
||
cat >>conftest.$ac_ext <<_ACEOF
|
||
/* end confdefs.h. */
|
||
$ac_includes_default
|
||
-typedef size_t ac__type_new_;
|
||
int
|
||
main ()
|
||
{
|
||
-if ((ac__type_new_ *) 0)
|
||
- return 0;
|
||
-if (sizeof (ac__type_new_))
|
||
+if (sizeof (size_t))
|
||
+ return 0;
|
||
+ ;
|
||
return 0;
|
||
+}
|
||
+_ACEOF
|
||
+rm -f conftest.$ac_objext
|
||
+if { (ac_try="$ac_compile"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
+ (eval "$ac_compile") 2>conftest.er1
|
||
+ ac_status=$?
|
||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||
+ rm -f conftest.er1
|
||
+ cat conftest.err >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && {
|
||
+ test -z "$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ } && test -s conftest.$ac_objext; then
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+$ac_includes_default
|
||
+int
|
||
+main ()
|
||
+{
|
||
+if (sizeof ((size_t)))
|
||
+ return 0;
|
||
;
|
||
return 0;
|
||
}
|
||
@@ -4715,30 +4973,39 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
- ac_cv_type_size_t=yes
|
||
+ :
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ ac_cv_type_size_t=yes
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
- ac_cv_type_size_t=no
|
||
+
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
|
||
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
|
||
-if test $ac_cv_type_size_t = yes; then
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
|
||
+$as_echo "$ac_cv_type_size_t" >&6; }
|
||
+if test "x$ac_cv_type_size_t" = x""yes; then
|
||
:
|
||
else
|
||
|
||
@@ -4748,10 +5015,10 @@
|
||
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
|
||
-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
|
||
+$as_echo_n "checking for struct stat.st_rdev... " >&6; }
|
||
if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -4776,20 +5043,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_member_struct_stat_st_rdev=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -4815,20 +5083,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_member_struct_stat_st_rdev=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_member_struct_stat_st_rdev=no
|
||
@@ -4839,9 +5108,9 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
|
||
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
|
||
-if test $ac_cv_member_struct_stat_st_rdev = yes; then
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
|
||
+$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
|
||
+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
|
||
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_STRUCT_STAT_ST_RDEV 1
|
||
@@ -4855,10 +5124,10 @@
|
||
fi
|
||
|
||
|
||
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
|
||
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -4885,20 +5154,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_header_time=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_header_time=no
|
||
@@ -4906,8 +5176,8 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
|
||
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
|
||
+$as_echo "$ac_cv_header_time" >&6; }
|
||
if test $ac_cv_header_time = yes; then
|
||
|
||
cat >>confdefs.h <<\_ACEOF
|
||
@@ -4979,8 +5249,8 @@
|
||
|
||
if test x$DIETLIBC = xyes; then
|
||
if test x$KLIBC = xyes; then
|
||
- { { echo "$as_me:$LINENO: error: You can' enable both dietlibc and klibc!" >&5
|
||
-echo "$as_me: error: You can' enable both dietlibc and klibc!" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: You can' enable both dietlibc and klibc!" >&5
|
||
+$as_echo "$as_me: error: You can' enable both dietlibc and klibc!" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
exit 1
|
||
fi
|
||
@@ -5067,12 +5337,13 @@
|
||
# Check whether --enable-testing was given.
|
||
if test "${enable_testing+set}" = set; then
|
||
enableval=$enable_testing; \
|
||
-DMRAID_TEST=no
|
||
+DMRAID_TEST=$enableval
|
||
else
|
||
DMRAID_TEST=yes
|
||
fi
|
||
|
||
|
||
+
|
||
echo "$ac_t""$DEBUG" 1>&6
|
||
|
||
if test x$LIB_SO = xyes; then
|
||
@@ -5082,8 +5353,8 @@
|
||
if test x$STATIC_LINK = xyes; then
|
||
FLAVOUR="static "
|
||
if test x$LIB_SO = xyes; then
|
||
- { { echo "$as_me:$LINENO: error: You can' enable both shared_lib and static_link!" >&5
|
||
-echo "$as_me: error: You can' enable both shared_lib and static_link!" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: You can' enable both shared_lib and static_link!" >&5
|
||
+$as_echo "$as_me: error: You can' enable both shared_lib and static_link!" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
exit 1
|
||
fi
|
||
@@ -5104,6 +5375,10 @@
|
||
CFLAGS="$CFLAGS -DDMRAID_LED"
|
||
fi
|
||
|
||
+if test x$DMRAID_TEST = xyes; then
|
||
+ CFLAGS="$CFLAGS -DDMRAID_TEST"
|
||
+fi
|
||
+
|
||
if test x$DMRAID_INTEL_LED = xyes; then
|
||
CFLAGS="$CFLAGS -DDMRAID_LED -DDMRAID_INTEL_LED"
|
||
fi
|
||
@@ -5121,10 +5396,10 @@
|
||
fi;
|
||
|
||
if test $ac_cv_c_compiler_gnu = yes; then
|
||
- { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
|
||
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_pattern="Autoconf.*'x'"
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -5163,17 +5438,17 @@
|
||
|
||
fi
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
|
||
+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
|
||
if test $ac_cv_prog_gcc_traditional = yes; then
|
||
CC="$CC -traditional"
|
||
fi
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
|
||
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$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
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -5198,20 +5473,21 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_cv_type_signal=int
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_type_signal=void
|
||
@@ -5219,8 +5495,8 @@
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
|
||
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
|
||
+$as_echo "$ac_cv_type_signal" >&6; }
|
||
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define RETSIGTYPE $ac_cv_type_signal
|
||
@@ -5230,11 +5506,11 @@
|
||
|
||
for ac_func in vprintf
|
||
do
|
||
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
||
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||
+$as_echo_n "checking for $ac_func... " >&6; }
|
||
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -5287,41 +5563,48 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
eval "$as_ac_var=yes"
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
eval "$as_ac_var=no"
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext conftest.$ac_ext
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_var'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||
+ac_res=`eval 'as_val=${'$as_ac_var'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+as_val=`eval 'as_val=${'$as_ac_var'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
|
||
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
|
||
+$as_echo_n "checking for _doprnt... " >&6; }
|
||
if test "${ac_cv_func__doprnt+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -5374,32 +5657,36 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
ac_cv_func__doprnt=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_cv_func__doprnt=no
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext conftest.$ac_ext
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
|
||
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
|
||
-if test $ac_cv_func__doprnt = yes; then
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
|
||
+$as_echo "$ac_cv_func__doprnt" >&6; }
|
||
+if test "x$ac_cv_func__doprnt" = x""yes; then
|
||
|
||
cat >>confdefs.h <<\_ACEOF
|
||
#define HAVE_DOPRNT 1
|
||
@@ -5416,11 +5703,11 @@
|
||
|
||
for ac_func in mkdir rmdir uname
|
||
do
|
||
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
||
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||
+$as_echo_n "checking for $ac_func... " >&6; }
|
||
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
@@ -5473,35 +5760,42 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
eval "$as_ac_var=yes"
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
eval "$as_ac_var=no"
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext conftest.$ac_ext
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_var'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||
+ac_res=`eval 'as_val=${'$as_ac_var'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+as_val=`eval 'as_val=${'$as_ac_var'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -5509,10 +5803,10 @@
|
||
|
||
|
||
if test x$READLINE = xyes; then
|
||
- { echo "$as_me:$LINENO: checking for library containing tgetent" >&5
|
||
-echo $ECHO_N "checking for library containing tgetent... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for library containing tgetent" >&5
|
||
+$as_echo_n "checking for library containing tgetent... " >&6; }
|
||
if test "${ac_cv_search_tgetent+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_func_search_save_LIBS=$LIBS
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
@@ -5550,26 +5844,30 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_link") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
- } && test -s conftest$ac_exeext &&
|
||
- $as_test_x conftest$ac_exeext; then
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then
|
||
ac_cv_search_tgetent=$ac_res
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
|
||
fi
|
||
|
||
+rm -rf conftest.dSYM
|
||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
conftest$ac_exeext
|
||
if test "${ac_cv_search_tgetent+set}" = set; then
|
||
@@ -5584,14 +5882,14 @@
|
||
rm conftest.$ac_ext
|
||
LIBS=$ac_func_search_save_LIBS
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_search_tgetent" >&5
|
||
-echo "${ECHO_T}$ac_cv_search_tgetent" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_tgetent" >&5
|
||
+$as_echo "$ac_cv_search_tgetent" >&6; }
|
||
ac_res=$ac_cv_search_tgetent
|
||
if test "$ac_res" != no; then
|
||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: termcap could not be found which is required for the
|
||
+ { { $as_echo "$as_me:$LINENO: error: termcap could not be found which is required for the
|
||
--enable-readline option (which is enabled by default). Either disable readline
|
||
support with --disable-readline or download and install termcap from:
|
||
ftp.gnu.org/gnu/termcap
|
||
@@ -5600,7 +5898,7 @@
|
||
Note: (n)curses also seems to work as a substitute for termcap. This was
|
||
not found either - but you could try installing that as well.
|
||
" >&5
|
||
-echo "$as_me: error: termcap could not be found which is required for the
|
||
+$as_echo "$as_me: error: termcap could not be found which is required for the
|
||
--enable-readline option (which is enabled by default). Either disable readline
|
||
support with --disable-readline or download and install termcap from:
|
||
ftp.gnu.org/gnu/termcap
|
||
@@ -5620,20 +5918,21 @@
|
||
|
||
for ac_header in getopt.h
|
||
do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
else
|
||
# Is the header compilable?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
+$as_echo_n "checking $ac_header usability... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -5649,32 +5948,33 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_compile") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } && {
|
||
test -z "$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
} && test -s conftest.$ac_objext; then
|
||
ac_header_compiler=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_compiler=no
|
||
fi
|
||
|
||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
+$as_echo "$ac_header_compiler" >&6; }
|
||
|
||
# Is the header present?
|
||
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
+$as_echo_n "checking $ac_header presence... " >&6; }
|
||
cat >conftest.$ac_ext <<_ACEOF
|
||
/* confdefs.h. */
|
||
_ACEOF
|
||
@@ -5688,69 +5988,73 @@
|
||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
*) ac_try_echo=$ac_try;;
|
||
esac
|
||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo") >&5
|
||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||
ac_status=$?
|
||
grep -v '^ *+' conftest.er1 >conftest.err
|
||
rm -f conftest.er1
|
||
cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
(exit $ac_status); } >/dev/null && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then
|
||
ac_header_preproc=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
ac_header_preproc=no
|
||
fi
|
||
|
||
rm -f conftest.err conftest.$ac_ext
|
||
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
+$as_echo "$ac_header_preproc" >&6; }
|
||
|
||
# So? What about this header?
|
||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
ac_header_preproc=yes
|
||
;;
|
||
no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
|
||
;;
|
||
esac
|
||
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
||
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
+$as_echo_n "checking for $ac_header... " >&6; }
|
||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
eval "$as_ac_Header=\$ac_header_preproc"
|
||
fi
|
||
-ac_res=`eval echo '${'$as_ac_Header'}'`
|
||
- { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
-echo "${ECHO_T}$ac_res" >&6; }
|
||
+ac_res=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
|
||
fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+as_val=`eval 'as_val=${'$as_ac_Header'}
|
||
+ $as_echo "$as_val"'`
|
||
+ if test "x$as_val" = x""yes; then
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
CFLAGS="$CFLAGS -DHAVE_GETOPTLONG"
|
||
fi
|
||
@@ -5791,7 +6095,6 @@
|
||
|
||
|
||
|
||
-
|
||
ac_config_files="$ac_config_files include/Makefile lib/Makefile man/Makefile tools/Makefile tools/version.h Makefile make.tmpl"
|
||
|
||
cat >confcache <<\_ACEOF
|
||
@@ -5821,11 +6124,12 @@
|
||
case $ac_val in #(
|
||
*${as_nl}*)
|
||
case $ac_var in #(
|
||
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
||
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
||
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
||
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
||
esac
|
||
case $ac_var in #(
|
||
_ | IFS | as_nl) ;; #(
|
||
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
||
*) $as_unset $ac_var ;;
|
||
esac ;;
|
||
esac
|
||
@@ -5858,12 +6162,12 @@
|
||
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
||
if test -w "$cache_file"; then
|
||
test "x$cache_file" != "x/dev/null" &&
|
||
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
||
-echo "$as_me: updating cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
||
+$as_echo "$as_me: updating cache $cache_file" >&6;}
|
||
cat confcache >$cache_file
|
||
else
|
||
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
||
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
||
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
||
fi
|
||
fi
|
||
rm -f confcache
|
||
@@ -5880,6 +6184,12 @@
|
||
# take arguments), then branch to the quote section. Otherwise,
|
||
# look for a macro that doesn't take arguments.
|
||
ac_script='
|
||
+:mline
|
||
+/\\$/{
|
||
+ N
|
||
+ s,\\\n,,
|
||
+ b mline
|
||
+}
|
||
t clear
|
||
:clear
|
||
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
|
||
@@ -5909,7 +6219,7 @@
|
||
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
||
# 1. Remove the extension, and $U if already installed.
|
||
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
||
- ac_i=`echo "$ac_i" | sed "$ac_script"`
|
||
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
|
||
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
||
# will be set to the directory where LIBOBJS objects are built.
|
||
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
||
@@ -5922,11 +6232,12 @@
|
||
|
||
|
||
: ${CONFIG_STATUS=./config.status}
|
||
+ac_write_fail=0
|
||
ac_clean_files_save=$ac_clean_files
|
||
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
||
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
||
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||
-cat >$CONFIG_STATUS <<_ACEOF
|
||
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
#! $SHELL
|
||
# Generated by $as_me.
|
||
# Run this file to recreate the current configuration.
|
||
@@ -5939,7 +6250,7 @@
|
||
SHELL=\${CONFIG_SHELL-$SHELL}
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
## --------------------- ##
|
||
## M4sh Initialization. ##
|
||
## --------------------- ##
|
||
@@ -5949,7 +6260,7 @@
|
||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
setopt NO_GLOB_SUBST
|
||
@@ -5971,17 +6282,45 @@
|
||
as_cr_digits='0123456789'
|
||
as_cr_alnum=$as_cr_Letters$as_cr_digits
|
||
|
||
-# The user is always right.
|
||
-if test "${PATH_SEPARATOR+set}" != set; then
|
||
- echo "#! /bin/sh" >conf$$.sh
|
||
- echo "exit 0" >>conf$$.sh
|
||
- chmod +x conf$$.sh
|
||
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||
- PATH_SEPARATOR=';'
|
||
+as_nl='
|
||
+'
|
||
+export as_nl
|
||
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
||
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='printf %s\n'
|
||
+ as_echo_n='printf %s'
|
||
+else
|
||
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
||
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
||
+ as_echo_n='/usr/ucb/echo -n'
|
||
else
|
||
- PATH_SEPARATOR=:
|
||
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
||
+ as_echo_n_body='eval
|
||
+ arg=$1;
|
||
+ case $arg in
|
||
+ *"$as_nl"*)
|
||
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
||
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
||
+ esac;
|
||
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
||
+ '
|
||
+ export as_echo_n_body
|
||
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
||
fi
|
||
- rm -f conf$$.sh
|
||
+ export as_echo_body
|
||
+ as_echo='sh -c $as_echo_body as_echo'
|
||
+fi
|
||
+
|
||
+# The user is always right.
|
||
+if test "${PATH_SEPARATOR+set}" != set; then
|
||
+ PATH_SEPARATOR=:
|
||
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
||
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
||
+ PATH_SEPARATOR=';'
|
||
+ }
|
||
fi
|
||
|
||
# Support unset when possible.
|
||
@@ -5997,8 +6336,6 @@
|
||
# there to prevent editors from complaining about space-tab.
|
||
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
||
# splitting by setting IFS to empty value.)
|
||
-as_nl='
|
||
-'
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
@@ -6021,7 +6358,7 @@
|
||
as_myself=$0
|
||
fi
|
||
if test ! -f "$as_myself"; then
|
||
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
{ (exit 1); exit 1; }
|
||
fi
|
||
|
||
@@ -6034,17 +6371,10 @@
|
||
PS4='+ '
|
||
|
||
# NLS nuisances.
|
||
-for as_var in \
|
||
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||
- LC_TELEPHONE LC_TIME
|
||
-do
|
||
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||
- eval $as_var=C; export $as_var
|
||
- else
|
||
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||
- fi
|
||
-done
|
||
+LC_ALL=C
|
||
+export LC_ALL
|
||
+LANGUAGE=C
|
||
+export LANGUAGE
|
||
|
||
# Required to use basename.
|
||
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
@@ -6066,7 +6396,7 @@
|
||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||
X"$0" : 'X\(//\)$' \| \
|
||
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||
-echo X/"$0" |
|
||
+$as_echo X/"$0" |
|
||
sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||
s//\1/
|
||
q
|
||
@@ -6117,7 +6447,7 @@
|
||
s/-\n.*//
|
||
' >$as_me.lineno &&
|
||
chmod +x "$as_me.lineno" ||
|
||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
||
{ (exit 1); exit 1; }; }
|
||
|
||
# Don't try to exec as it changes $[0], causing all sort of problems
|
||
@@ -6145,7 +6475,6 @@
|
||
*)
|
||
ECHO_N='-n';;
|
||
esac
|
||
-
|
||
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||
as_expr=expr
|
||
@@ -6158,19 +6487,22 @@
|
||
rm -f conf$$.dir/conf$$.file
|
||
else
|
||
rm -f conf$$.dir
|
||
- mkdir conf$$.dir
|
||
+ mkdir conf$$.dir 2>/dev/null
|
||
fi
|
||
-echo >conf$$.file
|
||
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s='ln -s'
|
||
- # ... but there are two gotchas:
|
||
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
- # In both cases, we have to default to `cp -p'.
|
||
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+if (echo >conf$$.file) 2>/dev/null; then
|
||
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s='ln -s'
|
||
+ # ... but there are two gotchas:
|
||
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
+ # In both cases, we have to default to `cp -p'.
|
||
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+ as_ln_s='cp -p'
|
||
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s=ln
|
||
+ else
|
||
as_ln_s='cp -p'
|
||
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s=ln
|
||
+ fi
|
||
else
|
||
as_ln_s='cp -p'
|
||
fi
|
||
@@ -6195,10 +6527,10 @@
|
||
as_test_x='
|
||
eval sh -c '\''
|
||
if test -d "$1"; then
|
||
- test -d "$1/.";
|
||
+ test -d "$1/.";
|
||
else
|
||
case $1 in
|
||
- -*)set "./$1";;
|
||
+ -*)set "./$1";;
|
||
esac;
|
||
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
||
???[sx]*):;;*)false;;esac;fi
|
||
@@ -6221,7 +6553,7 @@
|
||
# values after options handling.
|
||
ac_log="
|
||
This file was extended by $as_me, which was
|
||
-generated by GNU Autoconf 2.61. Invocation command line was
|
||
+generated by GNU Autoconf 2.63. Invocation command line was
|
||
|
||
CONFIG_FILES = $CONFIG_FILES
|
||
CONFIG_HEADERS = $CONFIG_HEADERS
|
||
@@ -6234,26 +6566,33 @@
|
||
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+case $ac_config_files in *"
|
||
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
||
+esac
|
||
+
|
||
+
|
||
+
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
# Files that config.status was made for.
|
||
config_files="$ac_config_files"
|
||
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
ac_cs_usage="\
|
||
\`$as_me' instantiates files from templates according to the
|
||
current configuration.
|
||
|
||
-Usage: $0 [OPTIONS] [FILE]...
|
||
+Usage: $0 [OPTION]... [FILE]...
|
||
|
||
-h, --help print this help, then exit
|
||
-V, --version print version number and configuration settings, then exit
|
||
- -q, --quiet do not print progress messages
|
||
+ -q, --quiet, --silent
|
||
+ do not print progress messages
|
||
-d, --debug don't remove temporary files
|
||
--recheck update $as_me by reconfiguring in the same conditions
|
||
- --file=FILE[:TEMPLATE]
|
||
- instantiate the configuration file FILE
|
||
+ --file=FILE[:TEMPLATE]
|
||
+ instantiate the configuration file FILE
|
||
|
||
Configuration files:
|
||
$config_files
|
||
@@ -6261,24 +6600,25 @@
|
||
Report bugs to <bug-autoconf@gnu.org>."
|
||
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
ac_cs_version="\\
|
||
config.status
|
||
-configured by $0, generated by GNU Autoconf 2.61,
|
||
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||
+configured by $0, generated by GNU Autoconf 2.63,
|
||
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||
|
||
-Copyright (C) 2006 Free Software Foundation, Inc.
|
||
+Copyright (C) 2008 Free Software Foundation, Inc.
|
||
This config.status script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it."
|
||
|
||
ac_pwd='$ac_pwd'
|
||
srcdir='$srcdir'
|
||
INSTALL='$INSTALL'
|
||
+AWK='$AWK'
|
||
+test -n "\$AWK" || AWK=awk
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-# If no file are specified by the user, then we need to provide default
|
||
-# value. By we need to know if files were specified by the user.
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+# The default lists apply if the user does not specify any file.
|
||
ac_need_defaults=:
|
||
while test $# != 0
|
||
do
|
||
@@ -6300,21 +6640,24 @@
|
||
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
||
ac_cs_recheck=: ;;
|
||
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
||
- echo "$ac_cs_version"; exit ;;
|
||
+ $as_echo "$ac_cs_version"; exit ;;
|
||
--debug | --debu | --deb | --de | --d | -d )
|
||
debug=: ;;
|
||
--file | --fil | --fi | --f )
|
||
$ac_shift
|
||
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
||
+ case $ac_optarg in
|
||
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ esac
|
||
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
|
||
ac_need_defaults=false;;
|
||
--he | --h | --help | --hel | -h )
|
||
- echo "$ac_cs_usage"; exit ;;
|
||
+ $as_echo "$ac_cs_usage"; exit ;;
|
||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
||
ac_cs_silent=: ;;
|
||
|
||
# This is an error.
|
||
- -*) { echo "$as_me: error: unrecognized option: $1
|
||
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
|
||
Try \`$0 --help' for more information." >&2
|
||
{ (exit 1); exit 1; }; } ;;
|
||
|
||
@@ -6333,30 +6676,32 @@
|
||
fi
|
||
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
if \$ac_cs_recheck; then
|
||
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
||
- CONFIG_SHELL=$SHELL
|
||
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
||
+ shift
|
||
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
||
+ CONFIG_SHELL='$SHELL'
|
||
export CONFIG_SHELL
|
||
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
||
+ exec "\$@"
|
||
fi
|
||
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
exec 5>>config.log
|
||
{
|
||
echo
|
||
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
||
## Running $as_me. ##
|
||
_ASBOX
|
||
- echo "$ac_log"
|
||
+ $as_echo "$ac_log"
|
||
} >&5
|
||
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
|
||
# Handling of arguments.
|
||
for ac_config_target in $ac_config_targets
|
||
@@ -6370,8 +6715,8 @@
|
||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||
"make.tmpl") CONFIG_FILES="$CONFIG_FILES make.tmpl" ;;
|
||
|
||
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
esac
|
||
done
|
||
@@ -6410,156 +6755,143 @@
|
||
(umask 077 && mkdir "$tmp")
|
||
} ||
|
||
{
|
||
- echo "$me: cannot create a temporary directory in ." >&2
|
||
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
|
||
{ (exit 1); exit 1; }
|
||
}
|
||
|
||
-#
|
||
-# Set up the sed scripts for CONFIG_FILES section.
|
||
-#
|
||
-
|
||
-# No need to generate the scripts if there are no CONFIG_FILES.
|
||
-# This happens for instance when ./config.status config.h
|
||
+# Set up the scripts for CONFIG_FILES section.
|
||
+# No need to generate them if there are no CONFIG_FILES.
|
||
+# This happens for instance with `./config.status config.h'.
|
||
if test -n "$CONFIG_FILES"; then
|
||
|
||
-_ACEOF
|
||
|
||
+ac_cr='
|
||
'
|
||
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||
+ ac_cs_awk_cr='\\r'
|
||
+else
|
||
+ ac_cs_awk_cr=$ac_cr
|
||
+fi
|
||
+
|
||
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
||
+_ACEOF
|
||
|
||
|
||
+{
|
||
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
|
||
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
||
+ echo "_ACEOF"
|
||
+} >conf$$subs.sh ||
|
||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
||
ac_delim='%!_!# '
|
||
for ac_last_try in false false false false false :; do
|
||
- cat >conf$$subs.sed <<_ACEOF
|
||
-SHELL!$SHELL$ac_delim
|
||
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
||
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
||
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
||
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
||
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
||
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
||
-exec_prefix!$exec_prefix$ac_delim
|
||
-prefix!$prefix$ac_delim
|
||
-program_transform_name!$program_transform_name$ac_delim
|
||
-bindir!$bindir$ac_delim
|
||
-sbindir!$sbindir$ac_delim
|
||
-libexecdir!$libexecdir$ac_delim
|
||
-datarootdir!$datarootdir$ac_delim
|
||
-datadir!$datadir$ac_delim
|
||
-sysconfdir!$sysconfdir$ac_delim
|
||
-sharedstatedir!$sharedstatedir$ac_delim
|
||
-localstatedir!$localstatedir$ac_delim
|
||
-includedir!$includedir$ac_delim
|
||
-oldincludedir!$oldincludedir$ac_delim
|
||
-docdir!$docdir$ac_delim
|
||
-infodir!$infodir$ac_delim
|
||
-htmldir!$htmldir$ac_delim
|
||
-dvidir!$dvidir$ac_delim
|
||
-pdfdir!$pdfdir$ac_delim
|
||
-psdir!$psdir$ac_delim
|
||
-libdir!$libdir$ac_delim
|
||
-localedir!$localedir$ac_delim
|
||
-mandir!$mandir$ac_delim
|
||
-DEFS!$DEFS$ac_delim
|
||
-ECHO_C!$ECHO_C$ac_delim
|
||
-ECHO_N!$ECHO_N$ac_delim
|
||
-ECHO_T!$ECHO_T$ac_delim
|
||
-LIBS!$LIBS$ac_delim
|
||
-build_alias!$build_alias$ac_delim
|
||
-host_alias!$host_alias$ac_delim
|
||
-target_alias!$target_alias$ac_delim
|
||
-build!$build$ac_delim
|
||
-build_cpu!$build_cpu$ac_delim
|
||
-build_vendor!$build_vendor$ac_delim
|
||
-build_os!$build_os$ac_delim
|
||
-host!$host$ac_delim
|
||
-host_cpu!$host_cpu$ac_delim
|
||
-host_vendor!$host_vendor$ac_delim
|
||
-host_os!$host_os$ac_delim
|
||
-target!$target$ac_delim
|
||
-target_cpu!$target_cpu$ac_delim
|
||
-target_vendor!$target_vendor$ac_delim
|
||
-target_os!$target_os$ac_delim
|
||
-AWK!$AWK$ac_delim
|
||
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
||
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
||
-INSTALL_DATA!$INSTALL_DATA$ac_delim
|
||
-LN_S!$LN_S$ac_delim
|
||
-SET_MAKE!$SET_MAKE$ac_delim
|
||
-RANLIB!$RANLIB$ac_delim
|
||
-KLCC!$KLCC$ac_delim
|
||
-KLIBC!$KLIBC$ac_delim
|
||
-KLIBC_PREFIX!$KLIBC_PREFIX$ac_delim
|
||
-KLIBC_BIN_DIR!$KLIBC_BIN_DIR$ac_delim
|
||
-KLIBC_SBIN_DIR!$KLIBC_SBIN_DIR$ac_delim
|
||
-KLIBC_LIB_DIR!$KLIBC_LIB_DIR$ac_delim
|
||
-KLIBC_INCLUDE_DIR!$KLIBC_INCLUDE_DIR$ac_delim
|
||
-CC!$CC$ac_delim
|
||
-CFLAGS!$CFLAGS$ac_delim
|
||
-LDFLAGS!$LDFLAGS$ac_delim
|
||
-CPPFLAGS!$CPPFLAGS$ac_delim
|
||
-ac_ct_CC!$ac_ct_CC$ac_delim
|
||
-EXEEXT!$EXEEXT$ac_delim
|
||
-OBJEXT!$OBJEXT$ac_delim
|
||
-CPP!$CPP$ac_delim
|
||
-GREP!$GREP$ac_delim
|
||
-EGREP!$EGREP$ac_delim
|
||
-CLDFLAGS!$CLDFLAGS$ac_delim
|
||
-DEBUG!$DEBUG$ac_delim
|
||
-DEBUG_MALLOC!$DEBUG_MALLOC$ac_delim
|
||
-DMRAID_TEST!$DMRAID_TEST$ac_delim
|
||
-DMRAID_VERSION!$DMRAID_VERSION$ac_delim
|
||
-DMRAID_LIB_VERSION!$DMRAID_LIB_VERSION$ac_delim
|
||
-DIETLIBC!$DIETLIBC$ac_delim
|
||
-GROUP!$GROUP$ac_delim
|
||
-JOBS!$JOBS$ac_delim
|
||
-LD_DEPS!$LD_DEPS$ac_delim
|
||
-FLAVOUR!$FLAVOUR$ac_delim
|
||
-LIBSELINUX!$LIBSELINUX$ac_delim
|
||
-LIBSEPOL!$LIBSEPOL$ac_delim
|
||
-LIB_SO!$LIB_SO$ac_delim
|
||
-OWNER!$OWNER$ac_delim
|
||
-SOFLAG!$SOFLAG$ac_delim
|
||
-STATIC_LINK!$STATIC_LINK$ac_delim
|
||
-LIBOBJS!$LIBOBJS$ac_delim
|
||
-LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||
-_ACEOF
|
||
+ . ./conf$$subs.sh ||
|
||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
|
||
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
|
||
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
||
+ if test $ac_delim_n = $ac_delim_num; then
|
||
break
|
||
elif $ac_last_try; then
|
||
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
else
|
||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
fi
|
||
done
|
||
+rm -f conf$$subs.sh
|
||
|
||
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
||
-if test -n "$ac_eof"; then
|
||
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
||
- ac_eof=`expr $ac_eof + 1`
|
||
-fi
|
||
-
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
||
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
||
-_ACEOF
|
||
-sed '
|
||
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
||
-s/^/s,@/; s/!/@,|#_!!_#|/
|
||
-:n
|
||
-t n
|
||
-s/'"$ac_delim"'$/,g/; t
|
||
-s/$/\\/; p
|
||
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
||
-' >>$CONFIG_STATUS <conf$$subs.sed
|
||
-rm -f conf$$subs.sed
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
-:end
|
||
-s/|#_!!_#|//g
|
||
-CEOF$ac_eof
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
||
_ACEOF
|
||
+sed -n '
|
||
+h
|
||
+s/^/S["/; s/!.*/"]=/
|
||
+p
|
||
+g
|
||
+s/^[^!]*!//
|
||
+:repl
|
||
+t repl
|
||
+s/'"$ac_delim"'$//
|
||
+t delim
|
||
+:nl
|
||
+h
|
||
+s/\(.\{148\}\).*/\1/
|
||
+t more1
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
||
+p
|
||
+n
|
||
+b repl
|
||
+:more1
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
||
+p
|
||
+g
|
||
+s/.\{148\}//
|
||
+t nl
|
||
+:delim
|
||
+h
|
||
+s/\(.\{148\}\).*/\1/
|
||
+t more2
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"/
|
||
+p
|
||
+b
|
||
+:more2
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
||
+p
|
||
+g
|
||
+s/.\{148\}//
|
||
+t delim
|
||
+' <conf$$subs.awk | sed '
|
||
+/^[^""]/{
|
||
+ N
|
||
+ s/\n//
|
||
+}
|
||
+' >>$CONFIG_STATUS || ac_write_fail=1
|
||
+rm -f conf$$subs.awk
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+_ACAWK
|
||
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
||
+ for (key in S) S_is_set[key] = 1
|
||
+ FS = ""
|
||
+
|
||
+}
|
||
+{
|
||
+ line = $ 0
|
||
+ nfields = split(line, field, "@")
|
||
+ substed = 0
|
||
+ len = length(field[1])
|
||
+ for (i = 2; i < nfields; i++) {
|
||
+ key = field[i]
|
||
+ keylen = length(key)
|
||
+ if (S_is_set[key]) {
|
||
+ value = S[key]
|
||
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
|
||
+ len += length(value) + length(field[++i])
|
||
+ substed = 1
|
||
+ } else
|
||
+ len += 1 + keylen
|
||
+ }
|
||
|
||
+ print line
|
||
+}
|
||
+
|
||
+_ACAWK
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
||
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
||
+else
|
||
+ cat
|
||
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
||
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
|
||
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
+_ACEOF
|
||
|
||
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||
@@ -6576,19 +6908,21 @@
|
||
}'
|
||
fi
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
fi # test -n "$CONFIG_FILES"
|
||
|
||
|
||
-for ac_tag in :F $CONFIG_FILES
|
||
+eval set X " :F $CONFIG_FILES "
|
||
+shift
|
||
+for ac_tag
|
||
do
|
||
case $ac_tag in
|
||
:[FHLC]) ac_mode=$ac_tag; continue;;
|
||
esac
|
||
case $ac_mode$ac_tag in
|
||
:[FHL]*:*);;
|
||
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
||
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
||
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
|
||
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
:[FH]-) ac_tag=-:-;;
|
||
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
||
@@ -6617,26 +6951,38 @@
|
||
[\\/$]*) false;;
|
||
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
||
esac ||
|
||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
||
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
||
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
||
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
||
{ (exit 1); exit 1; }; };;
|
||
esac
|
||
- ac_file_inputs="$ac_file_inputs $ac_f"
|
||
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
||
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
|
||
done
|
||
|
||
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
||
# use $as_me), people would be surprised to read:
|
||
# /* config.h. Generated by config.status. */
|
||
- configure_input="Generated from "`IFS=:
|
||
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
||
+ configure_input='Generated from '`
|
||
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
|
||
+ `' by configure.'
|
||
if test x"$ac_file" != x-; then
|
||
configure_input="$ac_file. $configure_input"
|
||
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
||
-echo "$as_me: creating $ac_file" >&6;}
|
||
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
|
||
+$as_echo "$as_me: creating $ac_file" >&6;}
|
||
fi
|
||
+ # Neutralize special characters interpreted by sed in replacement strings.
|
||
+ case $configure_input in #(
|
||
+ *\&* | *\|* | *\\* )
|
||
+ ac_sed_conf_input=`$as_echo "$configure_input" |
|
||
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
|
||
+ *) ac_sed_conf_input=$configure_input;;
|
||
+ esac
|
||
|
||
case $ac_tag in
|
||
- *:-:* | *:-) cat >"$tmp/stdin";;
|
||
+ *:-:* | *:-) cat >"$tmp/stdin" \
|
||
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
||
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
||
+ { (exit 1); exit 1; }; } ;;
|
||
esac
|
||
;;
|
||
esac
|
||
@@ -6646,7 +6992,7 @@
|
||
X"$ac_file" : 'X\(//\)[^/]' \| \
|
||
X"$ac_file" : 'X\(//\)$' \| \
|
||
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
||
-echo X"$ac_file" |
|
||
+$as_echo X"$ac_file" |
|
||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
s//\1/
|
||
q
|
||
@@ -6672,7 +7018,7 @@
|
||
as_dirs=
|
||
while :; do
|
||
case $as_dir in #(
|
||
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
||
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
||
*) as_qdir=$as_dir;;
|
||
esac
|
||
as_dirs="'$as_qdir' $as_dirs"
|
||
@@ -6681,7 +7027,7 @@
|
||
X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
X"$as_dir" : 'X\(//\)$' \| \
|
||
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
||
-echo X"$as_dir" |
|
||
+$as_echo X"$as_dir" |
|
||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
s//\1/
|
||
q
|
||
@@ -6702,17 +7048,17 @@
|
||
test -d "$as_dir" && break
|
||
done
|
||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
||
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
||
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
||
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
||
{ (exit 1); exit 1; }; }; }
|
||
ac_builddir=.
|
||
|
||
case "$ac_dir" in
|
||
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
*)
|
||
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
||
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
||
# A ".." for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
||
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
||
case $ac_top_builddir_sub in
|
||
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
||
@@ -6752,12 +7098,13 @@
|
||
esac
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
# If the template does not know about datarootdir, expand it.
|
||
# FIXME: This hack should be removed a few years after 2.60.
|
||
ac_datarootdir_hack=; ac_datarootdir_seen=
|
||
|
||
-case `sed -n '/datarootdir/ {
|
||
+ac_sed_dataroot='
|
||
+/datarootdir/ {
|
||
p
|
||
q
|
||
}
|
||
@@ -6766,13 +7113,14 @@
|
||
/@infodir@/p
|
||
/@localedir@/p
|
||
/@mandir@/p
|
||
-' $ac_file_inputs` in
|
||
+'
|
||
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
||
*datarootdir*) ac_datarootdir_seen=yes;;
|
||
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
||
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
ac_datarootdir_hack='
|
||
s&@datadir@&$datadir&g
|
||
s&@docdir@&$docdir&g
|
||
@@ -6786,15 +7134,16 @@
|
||
# Neutralize VPATH when `$srcdir' = `.'.
|
||
# Shell code in configure.ac might set extrasub.
|
||
# FIXME: do we really want to maintain this feature?
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
- sed "$ac_vpsub
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+ac_sed_extra="$ac_vpsub
|
||
$extrasub
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
:t
|
||
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
||
-s&@configure_input@&$configure_input&;t t
|
||
+s|@configure_input@|$ac_sed_conf_input|;t t
|
||
s&@top_builddir@&$ac_top_builddir_sub&;t t
|
||
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
|
||
s&@srcdir@&$ac_srcdir&;t t
|
||
s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
||
s&@top_srcdir@&$ac_top_srcdir&;t t
|
||
@@ -6804,21 +7153,28 @@
|
||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||
s&@INSTALL@&$ac_INSTALL&;t t
|
||
$ac_datarootdir_hack
|
||
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
|
||
+"
|
||
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
||
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
||
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
|
||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
which seems to be undefined. Please make sure it is defined." >&5
|
||
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
which seems to be undefined. Please make sure it is defined." >&2;}
|
||
|
||
rm -f "$tmp/stdin"
|
||
case $ac_file in
|
||
- -) cat "$tmp/out"; rm -f "$tmp/out";;
|
||
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
||
- esac
|
||
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
|
||
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
||
+ esac \
|
||
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
||
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
;;
|
||
|
||
|
||
@@ -6833,6 +7189,11 @@
|
||
chmod +x $CONFIG_STATUS
|
||
ac_clean_files=$ac_clean_files_save
|
||
|
||
+test $ac_write_fail = 0 ||
|
||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
+
|
||
|
||
# configure is writing to config.log, and then calls config.status.
|
||
# config.status does its own redirection, appending to config.log.
|
||
@@ -6854,4 +7215,8 @@
|
||
# would make configure fail if this is the last instruction.
|
||
$ac_cs_success || { (exit 1); exit 1; }
|
||
fi
|
||
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
||
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
||
+fi
|
||
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/configure.in dmraid/configure.in
|
||
--- /tmp/dmraid/1.0.0.rc16/configure.in 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/configure.in 2009-09-17 21:25:57.000000000 +1000
|
||
@@ -133,8 +133,9 @@
|
||
|
||
echo $ac_n "checking whether to disable testing with mapped devices""... $ac_c" 1>&6
|
||
dnl Disable testing with mapped devices
|
||
-AC_ARG_ENABLE(testing, [ --disable-testing Disable testing with mapped devices], \
|
||
-DMRAID_TEST=no, DMRAID_TEST=yes)
|
||
+AC_ARG_ENABLE(testing, [ --disable-testing Enable testing with mapped devices], \
|
||
+DMRAID_TEST=$enableval, DMRAID_TEST=yes)
|
||
+
|
||
|
||
echo "$ac_t""$DEBUG" 1>&6
|
||
|
||
@@ -165,6 +166,10 @@
|
||
CFLAGS="$CFLAGS -DDMRAID_LED"
|
||
fi
|
||
|
||
+if test x$DMRAID_TEST = xyes; then
|
||
+ CFLAGS="$CFLAGS -DDMRAID_TEST"
|
||
+fi
|
||
+
|
||
if test x$DMRAID_INTEL_LED = xyes; then
|
||
CFLAGS="$CFLAGS -DDMRAID_LED -DDMRAID_INTEL_LED"
|
||
fi
|
||
@@ -229,7 +234,6 @@
|
||
AC_SUBST(CLDFLAGS)
|
||
AC_SUBST(DEBUG)
|
||
AC_SUBST(DEBUG_MALLOC)
|
||
-AC_SUBST(DMRAID_TEST)
|
||
AC_SUBST(DMRAID_VERSION)
|
||
AC_SUBST(DMRAID_LIB_VERSION)
|
||
AC_SUBST(DIETLIBC)
|
||
Only in dmraid/: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/dmraid.spec dmraid/dmraid.spec
|
||
--- /tmp/dmraid/1.0.0.rc16/dmraid.spec 2009-09-16 19:20:21.000000000 +1000
|
||
+++ dmraid/dmraid.spec 2010-02-01 13:17:21.000000000 +1100
|
||
@@ -7,17 +7,26 @@
|
||
Summary: dmraid (Device-mapper RAID tool and library)
|
||
Name: dmraid
|
||
Version: 1.0.0.rc16
|
||
-Release: 1%{?dist}
|
||
+Release: 3%{?dist}
|
||
License: GPLv2+
|
||
Group: System Environment/Base
|
||
URL: http://people.redhat.com/heinzm/sw/dmraid
|
||
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||
-BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
|
||
-Requires: dmraid-events kpartx
|
||
-Requires(postun): ldconfig
|
||
-Requires(post): ldconfig
|
||
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||
+BuildRequires: device-mapper-devel >= 1.02.02-2
|
||
+BuildRequires: device-mapper-event-devel
|
||
+BuildRequires: libselinux-devel
|
||
+BuildRequires: libsepol-devel
|
||
+Requires: device-mapper >= 1.02.02-2
|
||
+Requires: dmraid-events
|
||
+Requires: kpartx
|
||
+Obsoletes: dmraid-libs < %{version}-%{release}
|
||
+Provides: dmraid-libs = %{version}-%{release}
|
||
Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
|
||
|
||
+Patch0: dmraid-1.0.0.rc16-test_devices.patch
|
||
+Patch1: ddf1_lsi_persistent_name.patch
|
||
+Patch2: pdc_raid10_failure.patch
|
||
+
|
||
%description
|
||
DMRAID supports RAID device discovery, RAID set activation, creation,
|
||
removal, rebuild and display of properties for ATARAID/DDF1 metadata on
|
||
@@ -26,9 +35,7 @@
|
||
%package -n dmraid-devel
|
||
Summary: Development libraries and headers for dmraid.
|
||
Group: Development/Libraries
|
||
-License: GPLv2+
|
||
-Requires: %{name} = %{version}-%{release}
|
||
-Requires: %{name}-libs = %{version}-%{release}
|
||
+Requires: dmraid = %{version}-%{release}, sgpio
|
||
|
||
%description -n dmraid-devel
|
||
dmraid-devel provides a library interface for RAID device discovery,
|
||
@@ -38,6 +45,7 @@
|
||
Summary: dmevent_tool (Device-mapper event tool) and DSO
|
||
Group: System Environment/Base
|
||
Requires: dmraid = %{version}-%{release}, sgpio
|
||
+Requires: device-mapper-event
|
||
|
||
%description -n dmraid-events
|
||
Provides a dmeventd DSO and the dmevent_tool to register devices with it
|
||
@@ -57,25 +65,26 @@
|
||
|
||
%prep
|
||
%setup -q -n dmraid/%{version}
|
||
+%patch0 -p1
|
||
+%patch1 -p1
|
||
+%patch2 -p1
|
||
|
||
%build
|
||
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
|
||
-make DESTDIR=$RPM_BUILD_ROOT
|
||
-mv tools/dmraid tools/dmraid.static
|
||
-make clean
|
||
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_linko --enable-led --enable-intel_led
|
||
+%define _libdir /%{_lib}
|
||
+
|
||
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
|
||
make DESTDIR=$RPM_BUILD_ROOT
|
||
|
||
%install
|
||
rm -rf $RPM_BUILD_ROOT
|
||
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
|
||
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/,/var/cache/logwatch/dmeventd/}
|
||
make DESTDIR=$RPM_BUILD_ROOT install
|
||
-
|
||
-# Install static dmraid binary
|
||
-install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
|
||
+ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
|
||
|
||
# Provide convenience link from dmevent_tool
|
||
(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
|
||
+(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
|
||
+
|
||
install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
|
||
|
||
# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
|
||
@@ -90,7 +99,7 @@
|
||
install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
|
||
install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
|
||
install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
|
||
-install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
|
||
+install -m 0700 /dev/null $RPM_BUILD_ROOT/var/cache/logwatch/dmeventd/syslogpattern.txt
|
||
|
||
rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
|
||
|
||
@@ -119,6 +128,7 @@
|
||
%files -n dmraid-events
|
||
%defattr(-,root,root)
|
||
/%{_mandir}/man8/dmevent_tool*
|
||
+/%{_mandir}/man8/dm_dso_reg_tool*
|
||
/sbin/dmevent_tool
|
||
/sbin/dm_dso_reg_tool
|
||
|
||
@@ -126,63 +136,76 @@
|
||
%defattr(-,root,root)
|
||
%config(noreplace) /etc/logwatch/*
|
||
%config(noreplace) /etc/cron.d/dmeventd-logwatch
|
||
-%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
|
||
+%dir /var/cache/logwatch/dmeventd
|
||
+%ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
|
||
|
||
%changelog
|
||
-* Thu Sep 16 2009 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc16
|
||
-- Update to version 1.0.0.rc16
|
||
-
|
||
-* Fri Apr 17 2009 Hans de Goede <hdegoede@redhat.com> - 1.0.0.rc15-7
|
||
-- Fix activation of isw raid sets when the disks have serialnumber longer
|
||
- then 16 characters (#490121)
|
||
-
|
||
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0.rc15-6
|
||
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||
-
|
||
-* Fri Feb 13 2009 Hans de Goede <hdegoede@redhat.com> - 1.0.0.rc15-5
|
||
-- Make --rm_partitions work with older kernels which return EINVAL when trying
|
||
- to remove a partition with a number > 16
|
||
-- Document --rm_partitions in the man page
|
||
-
|
||
-* Thu Feb 12 2009 Hans de Goede <hdegoede@redhat.com> - 1.0.0.rc15-4
|
||
-- Add patch adding --rm_partitions cmdline option and functionality (#484845)
|
||
-
|
||
-* Thu Feb 5 2009 Hans de Goede <hdegoede@redhat.com> - 1.0.0.rc15-3
|
||
-- Fix mismatch between BIOS and dmraid's view of ISW raid 10 sets
|
||
-
|
||
-* Tue Nov 18 2008 Bill Nottingham <notting@redhat.com> - 1.0.0.rc15-2
|
||
-- Re-add upstream whitespace removal patch (#468649, #470634)
|
||
-
|
||
-* Thu Sep 25 2008 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc15-1
|
||
-- Update to version 1.0.0.rc15
|
||
-
|
||
-* Thu Jul 03 2008 Alasdair Kergon <agk@redhat.com> - 1.0.0.rc14-8
|
||
-- Move library into libs subpackage.
|
||
-- Fix summary and licence tags.
|
||
-- Replace static build with symlink.
|
||
-
|
||
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.0.rc14-7
|
||
-- Autorebuild for GCC 4.3
|
||
-
|
||
-* Wed Nov 21 2007 Ian Kent <ikent@redhat.com> - 1.0.0.rc14-6
|
||
-- Bug 379911: dmraid needs to generate UUIDs for lib device-mapper
|
||
+* Tue Jan 12 2010 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc16-3
|
||
+- Add logwatch files and move pattern file to /var/cache
|
||
+- Fix multiple options (eg. "-ccc") not recognized properly
|
||
+
|
||
+* Mon Nov 2 2009 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc16-2
|
||
+- Fix manual path in specfile
|
||
+- fix manual pages for dmraid.static and dm_dso_reg_tool
|
||
+- ddf1 metadata format handler LSI persistent name fix
|
||
+- fix pdc metadata format handler to report the correct number
|
||
+ of devices in a RAID10 subset
|
||
+- move libraries to /lib* in order to avoid catch22
|
||
+ with unmountable /usr
|
||
+
|
||
+* Wed Sep 09 2008 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc16-1
|
||
+- Updated
|
||
+
|
||
+* Wed Sep 17 2008 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc15
|
||
+- Added support for RAID set create/delete/rebuild and event handling
|
||
+ (Intel contributions)
|
||
+- Resolves: rhbz#437169 rhbz#437173 rhbz#437177 rhbz#439088
|
||
+
|
||
+* Fri Feb 08 2008 Ian Kent <ikent@redhat.com> - 1.0.0.rc15
|
||
+- Bug 427550: dmraid segfaults on boot resulting in broken mirror
|
||
+ - patch to fix SEGV when requesting activation of invalid raid set.
|
||
+ the feature.
|
||
+ Related: rhbz#427550
|
||
+
|
||
+* Wed Feb 06 2008 Peter Jones <pjones@redhat.com> - 1.0.0.rc13-8
|
||
+- Revert fix for 381501, since the RHEL kernel doesn't currently support
|
||
+ the feature.
|
||
+ Related: rhbz#381501
|
||
+
|
||
+* Fri Jan 18 2008 Ian Kent <ikent@redhat.com> - 1.0.0.rc13-7
|
||
+- fix incorrectly applied patch in spec file.
|
||
+- Related: rhbz#236891
|
||
+
|
||
+* Wed Nov 21 2007 Ian Kent <ikent@redhat.com> - 1.0.0.rc13-6
|
||
+- Bug 381511: dmraid needs to generate UUIDs for lib device-mapper
|
||
+ - add patch to set UUID.
|
||
- add "DMRAID-" prefix to dmraid UUID string.
|
||
+- Bug 381501: dmraid needs to activate device-mapper mirror resynchronization error handling
|
||
+- Resolves: rhbz#381511 rhbz#381501
|
||
|
||
-* Wed Nov 14 2007 Ian Kent <ikent@redhat.com> - 1.0.0.rc14-5
|
||
-- Bug 379911: dmraid needs to generate UUIDs for lib device-mapper
|
||
-- Bug 379951: dmraid needs to activate device-mapper mirror resynchronization error handling
|
||
-
|
||
-* Mon Oct 22 2007 Ian Kent <ikent@redhat.com> - 1.0.0.rc14-4
|
||
-- Fix SEGV on "dmraid -r -E" (bz 236891).
|
||
-
|
||
-* Wed Apr 18 2007 Peter Jones <pjones@redhat.com> - 1.0.0.rc14-3
|
||
-- Fix jmicron name parsing (#219058)
|
||
-
|
||
-* Mon Feb 05 2007 Alasdair Kergon <agk@redhat.com> - 1.0.0.rc14-2
|
||
-- Add build dependency on new device-mapper-devel package.
|
||
-- Add dependency on device-mapper.
|
||
-- Add post and postun ldconfig.
|
||
-- Update BuildRoot and Summary.
|
||
+* Fri Nov 2 2007 Ian Kent <ikent@redhat.com> - 1.0.0.rc13-5
|
||
+- Fix SEGV on "dmraid -r -E" (bz 236891)
|
||
+- Resolves: rhbz#236891
|
||
+
|
||
+* Mon Sep 10 2007 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc13-4
|
||
+- Adjusted %dist to rebuild
|
||
+- Resolves: #211012
|
||
+
|
||
+* Mon Sep 10 2007 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc13-4
|
||
+- Missed a bug with dm map names
|
||
+- Resolves: #211012
|
||
+
|
||
+* Tue Jun 26 2007 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc13-3
|
||
+- Fix dmraid map names
|
||
+- Resolves: #211012
|
||
+- Fix unaligned access messages
|
||
+ Resolves: #210361, #211150
|
||
+- Fix jmicron name parsing (bz#219058)
|
||
+
|
||
+* Wed Nov 8 2006 Peter Jones <pjones@redhat.com> - 1.0.0.rc13-2
|
||
+- We didn't change the API or ABI, so don't change the version number
|
||
+ because it'll change the SONAME, which means we have to needlessly rebuild
|
||
+ other packages.
|
||
|
||
* Wed Nov 08 2006 Heinz Mauelshagen <heinzm@redhat.com> - 1.0.0.rc14-1
|
||
- asr.c: fixed Adaptec HostRAID DDF1 metadata discovery (bz#211016)
|
||
Only in dmraid/doc: CVS
|
||
Only in dmraid/include: CVS
|
||
Only in dmraid/include/dmraid: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/activate/activate.c dmraid/lib/activate/activate.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/activate/activate.c 2009-09-16 19:03:57.000000000 +1000
|
||
+++ dmraid/lib/activate/activate.c 2009-12-08 03:05:46.000000000 +1100
|
||
@@ -964,11 +964,13 @@
|
||
{
|
||
int ret = 0;
|
||
char *table = NULL;
|
||
+ struct dmraid_format *fmt = get_format(rs);
|
||
|
||
if (T_GROUP(rs))
|
||
return 1;
|
||
|
||
- if (what == DM_REGISTER)
|
||
+ if (what == DM_REGISTER &&
|
||
+ fmt->metadata_handler)
|
||
return register_devices(lc, rs);
|
||
|
||
/* Call type handler */
|
||
@@ -1053,8 +1055,10 @@
|
||
enum dm_what what)
|
||
{
|
||
int ret = 1, status;
|
||
+ struct dmraid_format *fmt = get_format(rs);
|
||
|
||
- if (what == DM_REGISTER)
|
||
+ if (what == DM_REGISTER &&
|
||
+ fmt->metadata_handler)
|
||
return unregister_devices(lc, rs);
|
||
|
||
status = dm_status(lc, rs);
|
||
Only in /tmp/dmraid/1.0.0.rc16/lib/activate: activate.c.orig
|
||
Only in dmraid/lib/activate: CVS
|
||
Only in dmraid/lib: CVS
|
||
Only in dmraid/lib/datastruct: CVS
|
||
Only in dmraid/lib/device: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/device/partition.c dmraid/lib/device/partition.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/device/partition.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/device/partition.c 2010-02-01 13:19:37.000000000 +1100
|
||
@@ -23,20 +23,27 @@
|
||
|
||
list_for_each_entry(rd, &rs->devs, devs) {
|
||
int fd = open(rd->di->path, O_RDWR);
|
||
+
|
||
if (fd < 0)
|
||
LOG_ERR(lc, 0, "opening %s: %s\n", rd->di->path,
|
||
strerror(errno));
|
||
|
||
/* There is no way to enumerate partitions */
|
||
for (part.pno = 1; part.pno <= 256; part.pno++) {
|
||
- if (ioctl(fd, BLKPG, &io) < 0 && errno != ENXIO &&
|
||
- (part.pno < 16 || errno != EINVAL))
|
||
+ if (ioctl(fd, BLKPG, &io) < 0 &&
|
||
+ errno != ENXIO &&
|
||
+ (part.pno < 16 || errno != EINVAL)) {
|
||
+ close(fd);
|
||
LOG_ERR(lc, 0,
|
||
"removing part %d from %s: %s\n",
|
||
part.pno, rd->di->path,
|
||
strerror(errno));
|
||
+ }
|
||
}
|
||
+
|
||
+ close(fd);
|
||
}
|
||
+
|
||
return 1;
|
||
}
|
||
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/device/scan.c dmraid/lib/device/scan.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/device/scan.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/device/scan.c 2009-09-17 21:25:57.000000000 +1000
|
||
@@ -87,7 +87,7 @@
|
||
struct stat s;
|
||
|
||
return !lstat(path, &s) &&
|
||
- S_ISLNK(s.st_mode) &&
|
||
+/* S_ISLNK(s.st_mode) && */ /* No symlinks any more. */
|
||
!strncmp(get_basename(lc, path), "dm-", 3);
|
||
}
|
||
|
||
Only in dmraid/lib/display: CVS
|
||
Only in dmraid/lib/events: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/events/libdmraid-events-isw.c dmraid/lib/events/libdmraid-events-isw.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/events/libdmraid-events-isw.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/events/libdmraid-events-isw.c 2009-11-19 22:37:25.000000000 +1100
|
||
@@ -729,7 +729,7 @@
|
||
_dso_perform(lc, lib_argv + lib_argc, action);
|
||
|
||
if (!ret &&
|
||
- action == GET_MEMBERS)
|
||
+ action == GET_MEMBERS)
|
||
ret = _repopulate(device, (char *)OPT_STR(lc, LC_REBUILD_SET));
|
||
}
|
||
|
||
@@ -1034,14 +1034,16 @@
|
||
break;
|
||
|
||
case REBUILD_END:
|
||
- if (!_lib_main('F', dev_name) ||
|
||
- !_lib_main('r', dev_name))
|
||
+ if (!_lib_main('F', dev_name)) {
|
||
syslog(LOG_NOTICE, "Rebuild of RAID set %s complete",
|
||
- dev_name);
|
||
-
|
||
+ dev_name);
|
||
+ _lib_main('r', dev_name);
|
||
+ }
|
||
+
|
||
/* Turn all RAID set LEDs off anyway, since it's in-sync.*/
|
||
/* Used also for manual rebuild. */
|
||
_dev_led_all(DSO_LED_OFF, rs);
|
||
+ break;
|
||
}
|
||
|
||
return ret;
|
||
Only in dmraid/lib/format/ataraid: CVS
|
||
Only in /tmp/dmraid/1.0.0.rc16/lib/format/ataraid: .isw.c.swp
|
||
Only in /tmp/dmraid/1.0.0.rc16/lib/format/ataraid: .jm.c.swp
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/pdc.c dmraid/lib/format/ataraid/pdc.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/pdc.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/format/ataraid/pdc.c 2009-12-15 01:33:13.000000000 +1100
|
||
@@ -202,8 +202,11 @@
|
||
break;
|
||
|
||
/* Memorize main metadata sector. */
|
||
- } else if (!info->u32)
|
||
+ } else if (!info->u32) {
|
||
info->u32 = *s;
|
||
+ *offset = sub ? di->sectors - *s :
|
||
+ *s;
|
||
+ }
|
||
}
|
||
}
|
||
}
|
||
@@ -490,7 +493,9 @@
|
||
if (context && pdc->raid.type != PDC_T_SPAN)
|
||
*((uint64_t *) context) += rd->sectors;
|
||
|
||
- return pdc->raid.total_disks;
|
||
+ return is_raid10(pdc) ?
|
||
+ pdc->raid.total_disks / 2 :
|
||
+ pdc->raid.total_disks;
|
||
}
|
||
|
||
static int
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/pdc.h dmraid/lib/format/ataraid/pdc.h
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/pdc.h 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/format/ataraid/pdc.h 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -1,5 +1,5 @@
|
||
/*
|
||
- * Copyright (C) 2004,2005 Heinz Mauelshagen, Red Hat GmbH.
|
||
+ * Copyright (C) 2004-2010 Heinz Mauelshagen, Red Hat GmbH.
|
||
* All rights reserved.
|
||
*
|
||
* See file LICENSE at the top of this source tree for license information.
|
||
@@ -13,7 +13,7 @@
|
||
|
||
#include <stdint.h>
|
||
|
||
-#define PDC_CONFIGOFFSETS 63,255,256,16,399,591,675,735,974,991
|
||
+#define PDC_CONFIGOFFSETS 63,255,256,16,399,591,675,735,911,974,991,3087
|
||
#define PDC_DATAOFFSET 0
|
||
|
||
/*
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/sil.c dmraid/lib/format/ataraid/sil.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/format/ataraid/sil.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/format/ataraid/sil.c 2009-12-02 00:26:04.000000000 +1100
|
||
@@ -1,8 +1,8 @@
|
||
/*
|
||
* Silicon Image Medley ATARAID metadata format handler.
|
||
*
|
||
- * Copyright (C) 2004,2005 Heinz Mauelshagen, Red Hat GmbH.
|
||
- * All rights reserved.
|
||
+ * Copyright (C) 2004,2005,2009 Heinz Mauelshagen, Red Hat GmbH.
|
||
+ * All rights reserved.
|
||
*
|
||
* See file LICENSE at the top of this source tree for license information.
|
||
*/
|
||
@@ -166,6 +166,16 @@
|
||
return 1;
|
||
}
|
||
|
||
+/* Return number of array sectors. */
|
||
+static uint64_t
|
||
+array_size(struct raid_dev *rd)
|
||
+{
|
||
+ struct sil *sil = META(rd, sil);
|
||
+
|
||
+ return (((uint64_t) sil->array_sectors_high) << 32) +
|
||
+ sil->array_sectors_low;
|
||
+}
|
||
+
|
||
static void
|
||
free_sils(struct sil **sils, unsigned int i)
|
||
{
|
||
@@ -381,6 +391,10 @@
|
||
struct sil *sil = META(rd, sil);
|
||
|
||
switch (sil->type) {
|
||
+ case SIL_T_JBOD:
|
||
+ ret = array_size(rd) < rd->sectors ?
|
||
+ 1 : sil->drives_per_striped_set;
|
||
+ break;
|
||
case SIL_T_RAID0:
|
||
case SIL_T_RAID10:
|
||
ret = sil->drives_per_striped_set;
|
||
@@ -519,12 +533,9 @@
|
||
static uint64_t
|
||
sectors(struct raid_dev *rd)
|
||
{
|
||
- uint64_t array_sectors, ret = 0;
|
||
+ uint64_t array_sectors = array_size(rd), ret = 0;
|
||
struct sil *sil = META(rd, sil);
|
||
|
||
- array_sectors = (((uint64_t) sil->array_sectors_high) << 32) +
|
||
- sil->array_sectors_low;
|
||
-
|
||
switch (sil->type) {
|
||
case SIL_T_SPARE:
|
||
/* Cook them up... */
|
||
Only in dmraid/lib/format: CVS
|
||
Only in dmraid/lib/format/ddf: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/format/ddf/ddf1.c dmraid/lib/format/ddf/ddf1.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/format/ddf/ddf1.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/format/ddf/ddf1.c 2009-11-03 00:20:41.000000000 +1100
|
||
@@ -696,6 +696,16 @@
|
||
sprintf(b, "%02x%02x%02x%02x",
|
||
vd->guid[i], vd->guid[i + 1],
|
||
vd->guid[i + 2], vd->guid[i + 3]);
|
||
+
|
||
+ /*
|
||
+ * Because the LSI bios changes the timestamp in the
|
||
+ * metadata on every boot, we have to neutralize it
|
||
+ * in order to allow for persistent names.
|
||
+ *
|
||
+ * Using a dummy string "47114711" for that.
|
||
+ */
|
||
+ if (!strncmp((char *) vd->guid, "LSI", 3))
|
||
+ strncpy(buf + prefix + 32, "47114711", 8);
|
||
}
|
||
|
||
out:
|
||
Only in /tmp/dmraid/1.0.0.rc16/lib/format/ddf: ddf1.c.name
|
||
Only in dmraid/lib/format/ddf: ddf1.c.orig
|
||
Only in dmraid/lib/format/partition: CVS
|
||
Only in dmraid/lib/format/template: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/internal.h dmraid/lib/internal.h
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/internal.h 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/internal.h 2010-02-01 13:17:21.000000000 +1100
|
||
@@ -50,8 +50,8 @@
|
||
#define u_int64_t uint64_t
|
||
#endif
|
||
|
||
-#define min(a, b) (a) < (b) ? (a) : (b)
|
||
-#define max(a, b) (a) > (b) ? (a) : (b)
|
||
+#define min(a, b) ((a) < (b) ? (a) : (b))
|
||
+#define max(a, b) ((a) > (b) ? (a) : (b))
|
||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
|
||
#define ARRAY_END(a) (a + ARRAY_SIZE(a))
|
||
|
||
Only in dmraid/lib/locking: CVS
|
||
Only in dmraid/lib/log: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/Makefile.in dmraid/lib/Makefile.in
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/Makefile.in 2009-09-17 08:32:35.000000000 +1000
|
||
+++ dmraid/lib/Makefile.in 2010-02-02 08:51:55.000000000 +1100
|
||
@@ -8,7 +8,7 @@
|
||
top_srcdir = @top_srcdir@
|
||
VPATH = @srcdir@
|
||
|
||
-SOURCES=\
|
||
+SOURCES = \
|
||
activate/activate.c \
|
||
activate/devmapper.c \
|
||
device/ata.c \
|
||
Only in dmraid/lib/metadata: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/metadata/metadata.c dmraid/lib/metadata/metadata.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/metadata/metadata.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/metadata/metadata.c 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -82,8 +82,8 @@
|
||
enum args args; /* Arguments allowed ? */
|
||
|
||
/* Function to call on hit or NULL */
|
||
- int (*f_set) (struct lib_context * lc, int arg);
|
||
- int arg; /* Argument for above function call */
|
||
+ int (*f_set) (struct lib_context * lc, struct actions *action);
|
||
+ int arg; /* Argument for above function call. */
|
||
};
|
||
|
||
/*************************************/
|
||
@@ -2096,7 +2096,7 @@
|
||
|
||
if (!count_devices(lc, DEVICE)) {
|
||
log_print(lc, "no block devices found");
|
||
- return 1;
|
||
+ return 0;
|
||
}
|
||
|
||
if (!(M_RAID & p->metadata))
|
||
@@ -2118,7 +2118,7 @@
|
||
if (!OPT_HOT_SPARE_SET(lc) && !OPT_CREATE(lc)
|
||
&& !count_devices(lc, RAID)) {
|
||
format_error(lc, "disks", argv);
|
||
- return 1;
|
||
+ return 0;
|
||
}
|
||
|
||
if (M_SET & p->metadata) {
|
||
Only in dmraid/lib/misc: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/misc/file.c dmraid/lib/misc/file.c
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/misc/file.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/lib/misc/file.c 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -32,7 +32,6 @@
|
||
} while (s);
|
||
|
||
dbg_free(orig);
|
||
-
|
||
return ret;
|
||
}
|
||
|
||
@@ -62,9 +61,9 @@
|
||
ssize_t(*func) ();
|
||
const char *what;
|
||
} rw_spec[] = {
|
||
- {
|
||
- read, "read"}, {
|
||
- write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
|
||
+ { read, "read"},
|
||
+ { write, "writ"},
|
||
+ }, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
|
||
|
||
if ((fd = open(path, flags, lc->mode)) == -1)
|
||
LOG_ERR(lc, 0, "opening \"%s\"", path);
|
||
@@ -84,7 +83,6 @@
|
||
ret = 1;
|
||
|
||
close(fd);
|
||
-
|
||
return ret;
|
||
}
|
||
|
||
Only in dmraid/lib/mm: CVS
|
||
Only in dmraid/lib/register: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/lib/version.h dmraid/lib/version.h
|
||
--- /tmp/dmraid/1.0.0.rc16/lib/version.h 2009-09-16 19:22:03.000000000 +1000
|
||
+++ dmraid/lib/version.h 2010-02-01 13:17:21.000000000 +1100
|
||
@@ -1,12 +1,12 @@
|
||
#ifndef DMRAID_LIB_VERSION
|
||
|
||
-#define DMRAID_LIB_VERSION "1.0.0.rc16"
|
||
+#define DMRAID_LIB_VERSION "1.0.0.rc16-3"
|
||
|
||
#define DMRAID_LIB_MAJOR_VERSION 1
|
||
#define DMRAID_LIB_MINOR_VERSION 0
|
||
#define DMRAID_LIB_SUBMINOR_VERSION 0
|
||
-#define DMRAID_LIB_VERSION_SUFFIX "rc16"
|
||
+#define DMRAID_LIB_VERSION_SUFFIX "rc16-3"
|
||
|
||
-#define DMRAID_LIB_DATE "(2009.09.16)"
|
||
+#define DMRAID_LIB_DATE "(2010.01.12)"
|
||
|
||
#endif
|
||
Only in dmraid/logwatch: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/logwatch/dmeventd dmraid/logwatch/dmeventd
|
||
--- /tmp/dmraid/1.0.0.rc16/logwatch/dmeventd 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/logwatch/dmeventd 2010-01-12 23:15:59.000000000 +1100
|
||
@@ -36,8 +36,7 @@
|
||
# Set the location of the folder to store last time stamp
|
||
# (This is used to record the last log sent out so repeats
|
||
# are not mailed in error.)
|
||
-$syslogpattern_file =
|
||
- "/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt";
|
||
+$syslogpattern_file = "/var/cache/logwatch/dmeventd/syslogpattern.txt";
|
||
|
||
if (-e $syslogpattern_file) {
|
||
open(FD, "+<", $syslogpattern_file) or die $!;
|
||
Only in dmraid/man: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/tools/commands.c dmraid/tools/commands.c
|
||
--- /tmp/dmraid/1.0.0.rc16/tools/commands.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/tools/commands.c 2010-02-01 13:20:49.000000000 +1100
|
||
@@ -1,5 +1,5 @@
|
||
/*
|
||
- * Copyright (C) 2004-2008 Heinz Mauelshagen, Red Hat GmbH.
|
||
+ * Copyright (C) 2004-2010 Heinz Mauelshagen, Red Hat GmbH.
|
||
* All rights reserved.
|
||
*
|
||
* Copyright (C) 2007 Intel Corporation. All rights reserved.
|
||
@@ -108,7 +108,7 @@
|
||
|
||
/* Check activate/deactivate option arguments. */
|
||
static int
|
||
-check_activate(struct lib_context *lc, int arg)
|
||
+check_activate(struct lib_context *lc, struct actions *a)
|
||
{
|
||
struct optarg_def def[] = {
|
||
{ "yes", ACTIVATE},
|
||
@@ -122,7 +122,7 @@
|
||
#ifndef DMRAID_MINI
|
||
/* Check active/inactive option arguments. */
|
||
static int
|
||
-check_active(struct lib_context *lc, int arg)
|
||
+check_active(struct lib_context *lc, struct actions *a)
|
||
{
|
||
struct optarg_def def[] = {
|
||
{ "active", ACTIVE},
|
||
@@ -134,9 +134,8 @@
|
||
return check_optarg(lc, 's', def);
|
||
}
|
||
|
||
-/* Check and store option arguments. */
|
||
-static int
|
||
-check_identifiers(struct lib_context *lc, int o)
|
||
+/* lc_inc_opt wrapper to allow for (struct actions) call interface. */
|
||
+static int _lc_inc_opt(struct lib_context *lc, struct actions *a)
|
||
{
|
||
if (optarg) {
|
||
const char delim = *OPT_STR_SEPARATOR(lc);
|
||
@@ -144,17 +143,40 @@
|
||
|
||
p = remove_white_space(lc, p, strlen(p));
|
||
p = collapse_delimiter(lc, p, strlen(p), delim);
|
||
- if (!lc_strcat_opt(lc, o, p, delim))
|
||
+
|
||
+ /* Hack to handle eg. "-cc". */
|
||
+ while (*p == a->option) {
|
||
+ lc_inc_opt(lc, a->arg);
|
||
+ p++;
|
||
+ }
|
||
+ }
|
||
+
|
||
+ lc_inc_opt(lc, a->arg);
|
||
+ return 1;
|
||
+}
|
||
+
|
||
+/* Check and store option arguments. */
|
||
+static int
|
||
+check_identifiers(struct lib_context *lc, struct actions *a)
|
||
+{
|
||
+ if (optarg) {
|
||
+ char *p = optarg;
|
||
+
|
||
+ _lc_inc_opt(lc, a);
|
||
+ p += lc_opt(lc, a->arg) - 1;
|
||
+ if (*p && !lc_strcat_opt(lc, a->arg, p, *OPT_STR_SEPARATOR(lc)))
|
||
return 0;
|
||
+
|
||
+ return 1;
|
||
}
|
||
|
||
- lc_inc_opt(lc, o);
|
||
+ lc_inc_opt(lc, a->arg);
|
||
return 1;
|
||
}
|
||
|
||
/* Check and store option argument/output field separator. */
|
||
static int
|
||
-check_separator(struct lib_context *lc, int arg)
|
||
+check_separator(struct lib_context *lc, struct actions *a)
|
||
{
|
||
if (strlen(optarg) != 1)
|
||
LOG_ERR(lc, 0, "invalid separator \"%s\"", optarg);
|
||
@@ -164,7 +186,7 @@
|
||
|
||
/* Check create option arguments. */
|
||
static int
|
||
-check_create_argument(struct lib_context *lc, int arg)
|
||
+check_create_argument(struct lib_context *lc, struct actions *a)
|
||
{
|
||
size_t len;
|
||
|
||
@@ -175,31 +197,32 @@
|
||
if (*optarg == '-')
|
||
LOG_ERR(lc, 0, "the raid set name is missing");
|
||
|
||
- lc_inc_opt(lc, arg);
|
||
+ lc_inc_opt(lc, a->arg);
|
||
return 1;
|
||
}
|
||
|
||
/* 'Check' spare option argument. */
|
||
static int
|
||
-check_spare_argument(struct lib_context *lc, int arg)
|
||
+check_spare_argument(struct lib_context *lc, struct actions *a)
|
||
{
|
||
- lc_inc_opt(lc, arg);
|
||
+ lc_inc_opt(lc, a->arg);
|
||
return 1;
|
||
}
|
||
#endif
|
||
|
||
/* Check and store option for partition separator. */
|
||
static int
|
||
-check_part_separator(struct lib_context *lc, int arg)
|
||
+check_part_separator(struct lib_context *lc, struct actions *a)
|
||
{
|
||
/* We're not actually checking that it's only one character... if
|
||
somebody wants to use more, it shouldn't hurt anything. */
|
||
return lc_stralloc_opt(lc, LC_PARTCHAR, optarg) ? 1 : 0;
|
||
}
|
||
|
||
+
|
||
/* Display help information */
|
||
static int
|
||
-help(struct lib_context *lc, int arg)
|
||
+help(struct lib_context *lc, struct actions *a)
|
||
{
|
||
char *c = lc->cmd;
|
||
|
||
@@ -342,7 +365,7 @@
|
||
UNDEF,
|
||
COLUMN | DBG | HELP | IGNORELOCKING | SEPARATOR | VERBOSE,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_DEVICES,
|
||
},
|
||
|
||
@@ -363,7 +386,7 @@
|
||
ALL_FLAGS,
|
||
ALL_FLAGS,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_DEBUG,
|
||
},
|
||
|
||
@@ -373,7 +396,7 @@
|
||
RAID_DEVICES,
|
||
COLUMN | DBG | FORMAT | HELP | IGNORELOCKING | SEPARATOR | VERBOSE,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_DUMP,
|
||
},
|
||
|
||
@@ -394,7 +417,7 @@
|
||
ACTIVE | INACTIVE | DBG | COLUMN | FORMAT | HELP | IGNORELOCKING
|
||
| SEPARATOR | VERBOSE,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_GROUP,
|
||
},
|
||
|
||
@@ -415,7 +438,7 @@
|
||
UNDEF,
|
||
ALL_FLAGS,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_IGNORELOCKING,
|
||
},
|
||
|
||
@@ -529,7 +552,7 @@
|
||
ACTIVATE | DEACTIVATE | DBG | FORMAT | HELP | IGNORELOCKING |
|
||
NOPARTITIONS | VERBOSE,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_TEST,
|
||
},
|
||
|
||
@@ -539,7 +562,7 @@
|
||
ALL_FLAGS,
|
||
ALL_FLAGS,
|
||
ARGS,
|
||
- lc_inc_opt,
|
||
+ _lc_inc_opt,
|
||
LC_VERBOSE,
|
||
},
|
||
#endif /* #ifndef DMRAID_MINI */
|
||
@@ -602,7 +625,7 @@
|
||
a->allowed |= a->needed;
|
||
|
||
if (a->f_set) /* Optionally call function. */
|
||
- return a->f_set(lc, a->arg);
|
||
+ return a->f_set(lc, a);
|
||
|
||
break;
|
||
}
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/tools/commands.h dmraid/tools/commands.h
|
||
--- /tmp/dmraid/1.0.0.rc16/tools/commands.h 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/tools/commands.h 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -1,5 +1,5 @@
|
||
/*
|
||
- * Copyright (C) 2004,2005 Heinz Mauelshagen, Red Hat GmbH.
|
||
+ * Copyright (C) 2004-2010 Heinz Mauelshagen, Red Hat GmbH.
|
||
* All rights reserved.
|
||
*
|
||
* Copyright (C) 2007 Intel Corporation. All rights reserved.
|
||
@@ -33,8 +33,8 @@
|
||
enum args args; /* Arguments allowed ? */
|
||
|
||
/* Function to call on hit or NULL */
|
||
- int (*f_set) (struct lib_context * lc, int arg);
|
||
- int arg; /* Argument for above function call */
|
||
+ int (*f_set) (struct lib_context * lc, struct actions *action);
|
||
+ int arg; /* Argument for above function call. */
|
||
};
|
||
|
||
int handle_args(struct lib_context *lc, int argc, char ***argv);
|
||
Only in dmraid/tools: CVS
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/tools/dmraid.c dmraid/tools/dmraid.c
|
||
--- /tmp/dmraid/1.0.0.rc16/tools/dmraid.c 2009-09-16 18:55:23.000000000 +1000
|
||
+++ dmraid/tools/dmraid.c 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -33,7 +33,8 @@
|
||
* If both are ok -> perform the required action.
|
||
*/
|
||
ret = handle_args(lc, argc, &argv) &&
|
||
- init_locking(lc) && perform(lc, argv);
|
||
+ init_locking(lc) &&
|
||
+ perform(lc, argv);
|
||
|
||
/* Cleanup the library context. */
|
||
libdmraid_exit(lc);
|
||
Only in /tmp/dmraid/1.0.0.rc16/tools: dmraid.static
|
||
diff -ru /tmp/dmraid/1.0.0.rc16/tools/VERSION dmraid/tools/VERSION
|
||
--- /tmp/dmraid/1.0.0.rc16/tools/VERSION 2009-09-16 19:21:43.000000000 +1000
|
||
+++ dmraid/tools/VERSION 2010-02-01 13:17:23.000000000 +1100
|
||
@@ -1 +1 @@
|
||
-1.0.0.rc16 (2009.09.16)
|
||
+1.0.0.rc16-3 (2010.01.12)
|