configure.ac: Detect awk and sed.
2009-08-30 Paolo Bonzini <bonzini@gnu.org> * configure.ac: Detect awk and sed. * Makefile.def (flags_to_pass): Add AWK and SED. * Makefile.tpl (AWK, SED): New. (BASE_FLAGS_TO_PASS): Add AWK and SED. * configure: Regenerate. * Makefile.in: Regenerate. From-SVN: r151228
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
c390c36118
commit
872642768c
@ -1,3 +1,12 @@
|
||||
2009-08-30 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.ac: Detect awk and sed.
|
||||
* Makefile.def (flags_to_pass): Add AWK and SED.
|
||||
* Makefile.tpl (AWK, SED): New.
|
||||
(BASE_FLAGS_TO_PASS): Add AWK and SED.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2009-08-26 Dave Korn <dave.korn.cygwin@gmail.com>
|
||||
|
||||
* ltmain.sh (removedotparts): Don't use comma as 's' separator.
|
||||
|
||||
@ -231,6 +231,7 @@ flags_to_pass = { flag= build_tooldir ; };
|
||||
flags_to_pass = { flag= target_alias ; };
|
||||
|
||||
// Build tools
|
||||
flags_to_pass = { flag= AWK ; };
|
||||
flags_to_pass = { flag= BISON ; };
|
||||
flags_to_pass = { flag= CC_FOR_BUILD ; };
|
||||
flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
|
||||
@ -247,6 +248,7 @@ flags_to_pass = { flag= M4 ; };
|
||||
flags_to_pass = { flag= MAKE ; };
|
||||
flags_to_pass = { flag= RUNTEST ; };
|
||||
flags_to_pass = { flag= RUNTESTFLAGS ; };
|
||||
flags_to_pass = { flag= SED ; };
|
||||
flags_to_pass = { flag= SHELL ; };
|
||||
flags_to_pass = { flag= YACC ; };
|
||||
|
||||
|
||||
@ -140,6 +140,8 @@ BASE_EXPORTS = \
|
||||
BISON="$(BISON)"; export BISON; \
|
||||
YACC="$(YACC)"; export YACC; \
|
||||
M4="$(M4)"; export M4; \
|
||||
SED="$(SED)"; export SED; \
|
||||
AWK="$(AWK)"; export SED; \
|
||||
MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
|
||||
|
||||
# This is the list of variables to export in the environment when
|
||||
@ -334,6 +336,8 @@ BOOT_CFLAGS= -g -O2
|
||||
BOOT_LDFLAGS=
|
||||
BOOT_ADAFLAGS=-gnatpg -gnata
|
||||
|
||||
AWK = @AWK@
|
||||
SED = @SED@
|
||||
BISON = @BISON@
|
||||
YACC = @YACC@
|
||||
FLEX = @FLEX@
|
||||
@ -599,6 +603,7 @@ BASE_FLAGS_TO_PASS = \
|
||||
"tooldir=$(tooldir)" \
|
||||
"build_tooldir=$(build_tooldir)" \
|
||||
"target_alias=$(target_alias)" \
|
||||
"AWK=$(AWK)" \
|
||||
"BISON=$(BISON)" \
|
||||
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||
@ -615,6 +620,7 @@ BASE_FLAGS_TO_PASS = \
|
||||
"MAKE=$(MAKE)" \
|
||||
"RUNTEST=$(RUNTEST)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"SED=$(SED)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"YACC=$(YACC)" \
|
||||
"`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
|
||||
|
||||
@ -143,6 +143,8 @@ BASE_EXPORTS = \
|
||||
BISON="$(BISON)"; export BISON; \
|
||||
YACC="$(YACC)"; export YACC; \
|
||||
M4="$(M4)"; export M4; \
|
||||
SED="$(SED)"; export SED; \
|
||||
AWK="$(AWK)"; export SED; \
|
||||
MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
|
||||
|
||||
# This is the list of variables to export in the environment when
|
||||
@ -337,6 +339,8 @@ BOOT_CFLAGS= -g -O2
|
||||
BOOT_LDFLAGS=
|
||||
BOOT_ADAFLAGS=-gnatpg -gnata
|
||||
|
||||
AWK = @AWK@
|
||||
SED = @SED@
|
||||
BISON = @BISON@
|
||||
YACC = @YACC@
|
||||
FLEX = @FLEX@
|
||||
|
||||
117
configure
vendored
117
configure
vendored
@ -168,7 +168,8 @@ test x\$exitcode = x0 || exit 1"
|
||||
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
||||
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
||||
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
||||
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
|
||||
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
|
||||
test \$(( 1 + 1 )) = 2 || exit 1"
|
||||
if (eval "$as_required") 2>/dev/null; then :
|
||||
as_have_required=yes
|
||||
else
|
||||
@ -665,6 +666,8 @@ target_subdir
|
||||
host_subdir
|
||||
build_subdir
|
||||
build_libsubdir
|
||||
AWK
|
||||
SED
|
||||
LN_S
|
||||
LN
|
||||
INSTALL_DATA
|
||||
@ -2444,6 +2447,117 @@ else
|
||||
$as_echo "no, using $LN_S" >&6; }
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
||||
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
||||
if test "${ac_cv_path_SED+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
||||
for ac_i in 1 2 3 4 5 6 7; do
|
||||
ac_script="$ac_script$as_nl$ac_script"
|
||||
done
|
||||
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
||||
{ ac_script=; unset ac_script;}
|
||||
if test -z "$SED"; then
|
||||
ac_path_SED_found=false
|
||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_prog in sed gsed; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
||||
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
||||
# Check for GNU ac_path_SED and select it if it is found.
|
||||
# Check for GNU $ac_path_SED
|
||||
case `"$ac_path_SED" --version 2>&1` in
|
||||
*GNU*)
|
||||
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
||||
*)
|
||||
ac_count=0
|
||||
$as_echo_n 0123456789 >"conftest.in"
|
||||
while :
|
||||
do
|
||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||
mv "conftest.tmp" "conftest.in"
|
||||
cp "conftest.in" "conftest.nl"
|
||||
$as_echo '' >> "conftest.nl"
|
||||
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||||
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
||||
# Best one so far, save it but keep looking for a better one
|
||||
ac_cv_path_SED="$ac_path_SED"
|
||||
ac_path_SED_max=$ac_count
|
||||
fi
|
||||
# 10*(2^10) chars as input seems more than enough
|
||||
test $ac_count -gt 10 && break
|
||||
done
|
||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||
esac
|
||||
|
||||
$ac_path_SED_found && break 3
|
||||
done
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
if test -z "$ac_cv_path_SED"; then
|
||||
as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
||||
fi
|
||||
else
|
||||
ac_cv_path_SED=$SED
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
|
||||
$as_echo "$ac_cv_path_SED" >&6; }
|
||||
SED="$ac_cv_path_SED"
|
||||
rm -f conftest.sed
|
||||
|
||||
for ac_prog in gawk mawk nawk awk
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_prog_AWK+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$AWK"; then
|
||||
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_AWK="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
AWK=$ac_cv_prog_AWK
|
||||
if test -n "$AWK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
||||
$as_echo "$AWK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$AWK" && break
|
||||
done
|
||||
|
||||
|
||||
### we might need to use some other shell than /bin/sh for running subshells
|
||||
### If we are on Windows, search for the shell. This will permit people
|
||||
@ -13793,6 +13907,7 @@ 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
|
||||
|
||||
|
||||
@ -79,6 +79,8 @@ m4_pattern_allow([^AS_FOR_BUILD$])dnl
|
||||
AC_PROG_INSTALL
|
||||
ACX_PROG_LN
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_SED
|
||||
AC_PROG_AWK
|
||||
|
||||
### we might need to use some other shell than /bin/sh for running subshells
|
||||
### If we are on Windows, search for the shell. This will permit people
|
||||
|
||||
Loading…
Reference in New Issue
Block a user