mirror of
git://git.sv.gnu.org/autoconf
synced 2025-04-12 15:20:26 +08:00
* m4/atconfig.m4 (AT_CONFIG): s/AT_TESTPATH/AUTOTEST_PATH/
because AT_TESTPATH looks like a macro.
* tests/atconfig.in: Likewise.
This commit is contained in:
Pavel Roskin
parent
5b4f860940
commit
7bb9bdc360
@ -1,3 +1,9 @@
|
||||
2000-11-02 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* m4/atconfig.m4 (AT_CONFIG): s/AT_TESTPATH/AUTOTEST_PATH/
|
||||
because AT_TESTPATH looks like a macro.
|
||||
* tests/atconfig.in: Likewise.
|
||||
|
||||
2000-11-02 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* autoconf.sh (trace.m4): Move all the M4 builtins into `at_'.
|
||||
@ -6,7 +12,7 @@
|
||||
2000-11-02 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* tests/tools.at (Tracing M4 builtins): New test.
|
||||
* autoconh.sh (trace_format): Fix its computation.
|
||||
* autoconf.sh (trace_format): Fix its computation.
|
||||
|
||||
2000-11-02 Akim Demaille <akim@epita.fr>
|
||||
|
||||
@ -19,7 +25,6 @@
|
||||
* autoconf.sh (task trace) [debug]: Instead of a long pipe, extend
|
||||
trace.m4.
|
||||
|
||||
|
||||
2000-11-02 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* autoupdate.sh (m4.txt): Use `dumpdef' and m4 to build it.
|
||||
|
||||
206
configure
vendored
206
configure
vendored
@ -187,7 +187,7 @@ do
|
||||
expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
|
||||
{ echo "configure:188: error: invalid feature name: $ac_feature" >&5
|
||||
echo "configure: error: invalid feature name: $ac_feature" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
||||
eval "enable_$ac_feature=no" ;;
|
||||
|
||||
@ -197,7 +197,7 @@ do
|
||||
expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
|
||||
{ echo "configure:198: error: invalid feature name: $ac_feature" >&5
|
||||
echo "configure: error: invalid feature name: $ac_feature" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
||||
case $ac_option in
|
||||
*=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
||||
@ -380,7 +380,7 @@ do
|
||||
expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
|
||||
{ echo "configure:381: error: invalid package name: $ac_package" >&5
|
||||
echo "configure: error: invalid package name: $ac_package" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||||
case $ac_option in
|
||||
*=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
||||
@ -394,7 +394,7 @@ do
|
||||
expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
|
||||
{ echo "configure:395: error: invalid package name: $ac_package" >&5
|
||||
echo "configure: error: invalid package name: $ac_package" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
ac_package=`echo $ac_package | sed 's/-/_/g'`
|
||||
eval "with_$ac_package=no" ;;
|
||||
|
||||
@ -420,7 +420,7 @@ do
|
||||
Try \`configure --help' for more information." >&5
|
||||
echo "configure: error: unrecognized option: $ac_option
|
||||
Try \`configure --help' for more information." >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
;;
|
||||
|
||||
*=*)
|
||||
@ -429,18 +429,18 @@ Try \`configure --help' for more information." >&2
|
||||
expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
|
||||
{ echo "configure:430: error: invalid variable name: $ac_envvar" >&5
|
||||
echo "configure: error: invalid variable name: $ac_envvar" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
||||
eval "$ac_envvar='$ac_optarg'"
|
||||
export $ac_envvar ;;
|
||||
|
||||
*)
|
||||
# FIXME: should be removed in autoconf 3.0.
|
||||
echo "configure:439: WARNING: you should use --build, --host, --target" >&5
|
||||
echo "configure: WARNING: you should use --build, --host, --target" >&2
|
||||
{ echo "configure:439: WARNING: you should use --build, --host, --target" >&5
|
||||
echo "configure: WARNING: you should use --build, --host, --target" >&2; }
|
||||
expr "x$ac_option" : ".*[^.$ac_cr_alnum]" >/dev/null &&
|
||||
echo "configure:442: WARNING: invalid host type: $ac_option" >&5
|
||||
echo "configure: WARNING: invalid host type: $ac_option" >&2
|
||||
{ echo "configure:442: WARNING: invalid host type: $ac_option" >&5
|
||||
echo "configure: WARNING: invalid host type: $ac_option" >&2; }
|
||||
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
||||
;;
|
||||
|
||||
@ -451,7 +451,7 @@ if test -n "$ac_prev"; then
|
||||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||||
{ echo "configure:452: error: missing argument to $ac_option" >&5
|
||||
echo "configure: error: missing argument to $ac_option" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
|
||||
# Be sure to have absolute paths.
|
||||
@ -465,7 +465,7 @@ do
|
||||
NONE ) ;;
|
||||
*) { echo "configure:466: error: expected an absolute path for --$ac_var: $ac_val" >&5
|
||||
echo "configure: error: expected an absolute path for --$ac_var: $ac_val" >&2
|
||||
exit 1; };;
|
||||
{ false; exit; }; };;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -479,10 +479,10 @@ target=$target_alias
|
||||
if test "x$host_alias" != x; then
|
||||
if test "x$build_alias" = x; then
|
||||
cross_compiling=maybe
|
||||
echo "configure:482: WARNING: If you wanted to set the --build type, don't use --host.
|
||||
{ echo "configure:482: 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." >&5
|
||||
echo "configure: 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
|
||||
If a cross compiler is detected then cross compile mode will be used." >&2; }
|
||||
elif test "x$build_alias" != "x$host_alias"; then
|
||||
cross_compiling=yes
|
||||
fi
|
||||
@ -509,11 +509,11 @@ if test ! -r $srcdir/$ac_unique_file; then
|
||||
if test "$ac_srcdir_defaulted" = yes; then
|
||||
{ echo "configure:510: error: cannot find sources in $ac_confdir or .." >&5
|
||||
echo "configure: error: cannot find sources in $ac_confdir or .." >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
else
|
||||
{ echo "configure:514: error: cannot find sources in $srcdir" >&5
|
||||
echo "configure: error: cannot find sources in $srcdir" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
fi
|
||||
srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
|
||||
@ -589,11 +589,6 @@ Fine tuning of the installation directories:
|
||||
EOF
|
||||
|
||||
cat <<\EOF
|
||||
|
||||
Program names:
|
||||
--program-prefix=PREFIX prepend PREFIX to installed program names
|
||||
--program-suffix=SUFFIX append SUFFIX to installed program names
|
||||
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
|
||||
EOF
|
||||
fi
|
||||
|
||||
@ -636,8 +631,8 @@ if test "$ac_init_help" = "recursive"; then
|
||||
echo
|
||||
$ac_configure --help
|
||||
else
|
||||
echo "configure:639: WARNING: no configuration information is in $ac_subdir" >&5
|
||||
echo "configure: WARNING: no configuration information is in $ac_subdir" >&2
|
||||
{ echo "configure:634: WARNING: no configuration information is in $ac_subdir" >&5
|
||||
echo "configure: WARNING: no configuration information is in $ac_subdir" >&2; }
|
||||
fi
|
||||
cd $ac_popdir
|
||||
done
|
||||
@ -720,8 +715,7 @@ hostinfo = `(hostinfo) 2>/dev/null`
|
||||
|
||||
# When interrupted or exit'd, cleanup temporary files, and complete
|
||||
# config.log.
|
||||
trap '
|
||||
exit_status=$?
|
||||
trap 'exit_status=$?
|
||||
test "$ac_signal" != 0 &&
|
||||
echo "configure: caught signal $ac_signal" >&5
|
||||
echo "configure: exit $exit_status" >&5
|
||||
@ -780,31 +774,31 @@ for ac_var in `(set) 2>&1 |
|
||||
eval ac_new_val="\$ac_env_${ac_var}_value"
|
||||
case $ac_old_set,$ac_new_set in
|
||||
set,)
|
||||
echo "configure:783: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||||
echo "configure: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2
|
||||
{ echo "configure:777: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||||
echo "configure: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2; }
|
||||
ac_suggest_removing_cache=: ;;
|
||||
,set)
|
||||
echo "configure:787: WARNING: \`$ac_var' was not set in the previous run" >&5
|
||||
echo "configure: WARNING: \`$ac_var' was not set in the previous run" >&2
|
||||
{ echo "configure:781: WARNING: \`$ac_var' was not set in the previous run" >&5
|
||||
echo "configure: WARNING: \`$ac_var' was not set in the previous run" >&2; }
|
||||
ac_suggest_removing_cache=: ;;
|
||||
,);;
|
||||
*)
|
||||
if test "x$ac_old_val" != "x$ac_new_val"; then
|
||||
echo "configure:793: WARNING: \`$ac_var' has changed since the previous run:" >&5
|
||||
echo "configure: WARNING: \`$ac_var' has changed since the previous run:" >&2
|
||||
echo "configure:795: WARNING: former value: $ac_old_val" >&5
|
||||
echo "configure: WARNING: former value: $ac_old_val" >&2
|
||||
echo "configure:797: WARNING: current value: $ac_new_val" >&5
|
||||
echo "configure: WARNING: current value: $ac_new_val" >&2
|
||||
{ echo "configure:787: WARNING: \`$ac_var' has changed since the previous run:" >&5
|
||||
echo "configure: WARNING: \`$ac_var' has changed since the previous run:" >&2; }
|
||||
{ echo "configure:789: WARNING: former value: $ac_old_val" >&5
|
||||
echo "configure: WARNING: former value: $ac_old_val" >&2; }
|
||||
{ echo "configure:791: WARNING: current value: $ac_new_val" >&5
|
||||
echo "configure: WARNING: current value: $ac_new_val" >&2; }
|
||||
ac_suggest_removing_cache=:
|
||||
fi;;
|
||||
esac
|
||||
done
|
||||
if $ac_suggest_removing_cache; then
|
||||
echo "configure:804: WARNING: changes in the environment can compromise the build" >&5
|
||||
echo "configure: WARNING: changes in the environment can compromise the build" >&2
|
||||
echo "configure:806: WARNING: consider removing $cache_file and starting over" >&5
|
||||
echo "configure: WARNING: consider removing $cache_file and starting over" >&2
|
||||
{ echo "configure:798: WARNING: changes in the environment can compromise the build" >&5
|
||||
echo "configure: WARNING: changes in the environment can compromise the build" >&2; }
|
||||
{ echo "configure:800: WARNING: consider removing $cache_file and starting over" >&5
|
||||
echo "configure: WARNING: consider removing $cache_file and starting over" >&2; }
|
||||
fi
|
||||
|
||||
ac_ext=c
|
||||
@ -837,9 +831,9 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||
fi
|
||||
done
|
||||
if test -z "$ac_aux_dir"; then
|
||||
{ echo "configure:840: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||||
{ echo "configure:834: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||||
echo "configure: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||||
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||||
@ -857,7 +851,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo "configure:860: checking for a BSD compatible install" >&5
|
||||
echo "configure:854: checking for a BSD compatible install" >&5
|
||||
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
|
||||
if test -z "$INSTALL"; then
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
@ -906,7 +900,7 @@ fi
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
echo "configure:909: result: $INSTALL" >&5
|
||||
echo "configure:903: result: $INSTALL" >&5
|
||||
echo "${ECHO_T}$INSTALL" >&6
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
@ -917,7 +911,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
echo "configure:920: checking whether build environment is sane" >&5
|
||||
echo "configure:914: checking whether build environment is sane" >&5
|
||||
echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
|
||||
# Just in case
|
||||
sleep 1
|
||||
@ -940,11 +934,11 @@ if (
|
||||
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
||||
# broken ls alias from the environment. This has actually
|
||||
# happened. Such a system could not be considered "sane".
|
||||
{ echo "configure:943: error: ls -t appears to fail. Make sure there is not a broken
|
||||
{ echo "configure:937: error: ls -t appears to fail. Make sure there is not a broken
|
||||
alias in your environment" >&5
|
||||
echo "configure: error: ls -t appears to fail. Make sure there is not a broken
|
||||
alias in your environment" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
|
||||
test "$2" = conftestfile
|
||||
@ -953,35 +947,17 @@ then
|
||||
# Ok.
|
||||
:
|
||||
else
|
||||
{ echo "configure:956: error: newly created file is older than distributed files!
|
||||
{ echo "configure:950: error: newly created file is older than distributed files!
|
||||
Check your system clock" >&5
|
||||
echo "configure: error: newly created file is older than distributed files!
|
||||
Check your system clock" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
rm -f conftest*
|
||||
echo "configure:963: result: yes" >&5
|
||||
echo "configure:957: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
if test "$program_transform_name" = s,x,x,; then
|
||||
program_transform_name=
|
||||
else
|
||||
# Double any \ or $. echo might interpret backslashes.
|
||||
cat <<\EOF >conftestsed
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF
|
||||
program_transform_name=`echo $program_transform_name | sed -f conftestsed`
|
||||
rm -f conftestsed
|
||||
fi
|
||||
test "$program_prefix" != NONE &&
|
||||
program_transform_name="s,^,${program_prefix},;$program_transform_name"
|
||||
# Use a double $ so make ignores it.
|
||||
test "$program_suffix" != NONE &&
|
||||
program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
|
||||
|
||||
# sed with no file args requires a program.
|
||||
test -z "$program_transform_name" && program_transform_name="s,x,x,"
|
||||
|
||||
echo "configure:984: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:960: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
|
||||
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
|
||||
@ -1001,11 +977,11 @@ fi
|
||||
rm -f conftestmake
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
|
||||
echo "configure:1004: result: yes" >&5
|
||||
echo "configure:980: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
SET_MAKE=
|
||||
else
|
||||
echo "configure:1008: result: no" >&5
|
||||
echo "configure:984: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
SET_MAKE="MAKE=${MAKE-make}"
|
||||
fi
|
||||
@ -1015,9 +991,9 @@ PACKAGE=autoconf
|
||||
VERSION=2.49b
|
||||
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||
{ echo "configure:1018: error: source directory already configured; run \"make distclean\" there first" >&5
|
||||
{ echo "configure:994: error: source directory already configured; run \"make distclean\" there first" >&5
|
||||
echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<EOF
|
||||
@ -1029,83 +1005,83 @@ cat >>confdefs.h <<EOF
|
||||
EOF
|
||||
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
echo "configure:1032: checking for working aclocal" >&5
|
||||
echo "configure:1008: checking for working aclocal" >&5
|
||||
echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (aclocal --version) < /dev/null > /dev/null 2>&1; then
|
||||
ACLOCAL=aclocal
|
||||
echo "configure:1039: result: found" >&5
|
||||
echo "configure:1015: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
ACLOCAL="$SHELL $missing_dir/missing aclocal"
|
||||
echo "configure:1043: result: missing" >&5
|
||||
echo "configure:1019: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
echo "configure:1047: checking for working autoconf" >&5
|
||||
echo "configure:1023: checking for working autoconf" >&5
|
||||
echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (autoconf --version) < /dev/null > /dev/null 2>&1; then
|
||||
AUTOCONF=autoconf
|
||||
echo "configure:1054: result: found" >&5
|
||||
echo "configure:1030: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
AUTOCONF="$SHELL $missing_dir/missing autoconf"
|
||||
echo "configure:1058: result: missing" >&5
|
||||
echo "configure:1034: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
echo "configure:1062: checking for working automake" >&5
|
||||
echo "configure:1038: checking for working automake" >&5
|
||||
echo $ECHO_N "checking for working automake... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (automake --version) < /dev/null > /dev/null 2>&1; then
|
||||
AUTOMAKE=automake
|
||||
echo "configure:1069: result: found" >&5
|
||||
echo "configure:1045: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
AUTOMAKE="$SHELL $missing_dir/missing automake"
|
||||
echo "configure:1073: result: missing" >&5
|
||||
echo "configure:1049: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
echo "configure:1077: checking for working autoheader" >&5
|
||||
echo "configure:1053: checking for working autoheader" >&5
|
||||
echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (autoheader --version) < /dev/null > /dev/null 2>&1; then
|
||||
AUTOHEADER=autoheader
|
||||
echo "configure:1084: result: found" >&5
|
||||
echo "configure:1060: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
AUTOHEADER="$SHELL $missing_dir/missing autoheader"
|
||||
echo "configure:1088: result: missing" >&5
|
||||
echo "configure:1064: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
echo "configure:1092: checking for working makeinfo" >&5
|
||||
echo "configure:1068: checking for working makeinfo" >&5
|
||||
echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
|
||||
MAKEINFO=makeinfo
|
||||
echo "configure:1099: result: found" >&5
|
||||
echo "configure:1075: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
MAKEINFO="$SHELL $missing_dir/missing makeinfo"
|
||||
echo "configure:1103: result: missing" >&5
|
||||
echo "configure:1079: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
# Initialize the test suite.
|
||||
AT_TESTPATH=..
|
||||
AUTOTEST_PATH=..
|
||||
|
||||
# We use a path for GNU m4 so even if users have another m4 first in
|
||||
# their path, the installer can configure with a path that has GNU m4
|
||||
@ -1115,7 +1091,7 @@ for ac_prog in gm4 gnum4 m4
|
||||
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 "configure:1118: checking for $ac_word" >&5
|
||||
echo "configure:1094: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_M4+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -1142,10 +1118,10 @@ fi
|
||||
M4=$ac_cv_path_M4
|
||||
|
||||
if test -n "$M4"; then
|
||||
echo "configure:1145: result: $M4" >&5
|
||||
echo "configure:1121: result: $M4" >&5
|
||||
echo "${ECHO_T}$M4" >&6
|
||||
else
|
||||
echo "configure:1148: result: no" >&5
|
||||
echo "configure:1124: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -1153,7 +1129,7 @@ fi
|
||||
done
|
||||
test -n "$M4" || M4="m4"
|
||||
|
||||
echo "configure:1156: checking whether m4 supports frozen files" >&5
|
||||
echo "configure:1132: checking whether m4 supports frozen files" >&5
|
||||
echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_gnu_m4+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -1165,12 +1141,12 @@ if test x"$M4" != x; then
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
echo "configure:1168: result: $ac_cv_prog_gnu_m4" >&5
|
||||
echo "configure:1144: result: $ac_cv_prog_gnu_m4" >&5
|
||||
echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
|
||||
if test x"$ac_cv_prog_gnu_m4" != xyes; then
|
||||
{ echo "configure:1171: error: GNU m4 1.4 is required" >&5
|
||||
{ echo "configure:1147: error: GNU m4 1.4 is required" >&5
|
||||
echo "configure: error: GNU m4 1.4 is required" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi
|
||||
# This is needed because Automake does not seem to realize there is
|
||||
# an AC_SUBST inside AC_PROG_GNU_M4. Grmph!
|
||||
@ -1180,7 +1156,7 @@ for ac_prog in mawk gawk 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
|
||||
echo "configure:1183: checking for $ac_word" >&5
|
||||
echo "configure:1159: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_AWK+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -1202,10 +1178,10 @@ fi
|
||||
fi
|
||||
AWK=$ac_cv_prog_AWK
|
||||
if test -n "$AWK"; then
|
||||
echo "configure:1205: result: $AWK" >&5
|
||||
echo "configure:1181: result: $AWK" >&5
|
||||
echo "${ECHO_T}$AWK" >&6
|
||||
else
|
||||
echo "configure:1208: result: no" >&5
|
||||
echo "configure:1184: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -1213,25 +1189,25 @@ fi
|
||||
done
|
||||
|
||||
# Generating man pages.
|
||||
echo "configure:1216: checking for working help2man" >&5
|
||||
echo "configure:1192: checking for working help2man" >&5
|
||||
echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
if (help2man --version) < /dev/null > /dev/null 2>&1; then
|
||||
HELP2MAN=help2man
|
||||
echo "configure:1223: result: found" >&5
|
||||
echo "configure:1199: result: found" >&5
|
||||
echo "${ECHO_T}found" >&6
|
||||
else
|
||||
HELP2MAN="$SHELL $missing_dir/missing help2man"
|
||||
echo "configure:1227: result: missing" >&5
|
||||
echo "configure:1203: result: missing" >&5
|
||||
echo "${ECHO_T}missing" >&6
|
||||
fi
|
||||
|
||||
# We use a path for perl so the #! line in autoscan will work.
|
||||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
set dummy perl; ac_word=$2
|
||||
echo "configure:1234: checking for $ac_word" >&5
|
||||
echo "configure:1210: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_PERL+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -1259,18 +1235,18 @@ fi
|
||||
PERL=$ac_cv_path_PERL
|
||||
|
||||
if test -n "$PERL"; then
|
||||
echo "configure:1262: result: $PERL" >&5
|
||||
echo "configure:1238: result: $PERL" >&5
|
||||
echo "${ECHO_T}$PERL" >&6
|
||||
else
|
||||
echo "configure:1265: result: no" >&5
|
||||
echo "configure:1241: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if test "$PERL" != no; then
|
||||
PERLSCRIPTS=autoscan
|
||||
else
|
||||
echo "configure:1272: WARNING: autoscan will not be built since perl is not found" >&5
|
||||
echo "configure: WARNING: autoscan will not be built since perl is not found" >&2
|
||||
{ echo "configure:1248: WARNING: autoscan will not be built since perl is not found" >&5
|
||||
echo "configure: WARNING: autoscan will not be built since perl is not found" >&2; }
|
||||
fi
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
@ -1285,7 +1261,7 @@ fi
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo "configure:1288: checking for a BSD compatible install" >&5
|
||||
echo "configure:1264: checking for a BSD compatible install" >&5
|
||||
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
|
||||
if test -z "$INSTALL"; then
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
@ -1334,7 +1310,7 @@ fi
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
echo "configure:1337: result: $INSTALL" >&5
|
||||
echo "configure:1313: result: $INSTALL" >&5
|
||||
echo "${ECHO_T}$INSTALL" >&6
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
@ -1644,7 +1620,7 @@ fi
|
||||
$debug ||
|
||||
{
|
||||
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
|
||||
trap 'exit $?' 1 2 13 15
|
||||
trap '{ (exit $?); exit; }' 1 2 13 15
|
||||
}
|
||||
|
||||
# Create a (secure) tmp directory for tmp files.
|
||||
@ -1659,7 +1635,7 @@ $debug ||
|
||||
} ||
|
||||
{
|
||||
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
|
||||
exit 1;
|
||||
{ false; exit; }
|
||||
}
|
||||
|
||||
EOF
|
||||
@ -1713,7 +1689,7 @@ s,@AUTOMAKE@,$AUTOMAKE,;t t
|
||||
s,@AUTOHEADER@,$AUTOHEADER,;t t
|
||||
s,@MAKEINFO@,$MAKEINFO,;t t
|
||||
s,@SET_MAKE@,$SET_MAKE,;t t
|
||||
s,@AT_TESTPATH@,$AT_TESTPATH,;t t
|
||||
s,@AUTOTEST_PATH@,$AUTOTEST_PATH,;t t
|
||||
s,@M4@,$M4,;t t
|
||||
s,@AWK@,$AWK,;t t
|
||||
s,@HELP2MAN@,$HELP2MAN,;t t
|
||||
@ -1842,9 +1818,9 @@ done; }
|
||||
-) echo $tmp/stdin ;;
|
||||
[\\/$]* | ?:[\\/]*)
|
||||
# Absolute
|
||||
test -f "$f" || { echo "configure:1845: error: cannot find input file \\\`$f'" >&5
|
||||
test -f "$f" || { echo "configure:1821: error: cannot find input file \\\`$f'" >&5
|
||||
echo "configure: error: cannot find input file \\\`$f'" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
echo $f;;
|
||||
*) # Relative
|
||||
if test -f "$f"; then
|
||||
@ -1855,9 +1831,9 @@ done; }
|
||||
echo $ac_given_srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ echo "configure:1858: error: cannot find input file \\\`$f'" >&5
|
||||
{ echo "configure:1834: error: cannot find input file \\\`$f'" >&5
|
||||
echo "configure: error: cannot find input file \\\`$f'" >&2
|
||||
exit 1; }
|
||||
{ false; exit; }; }
|
||||
fi;;
|
||||
esac
|
||||
done` || { (exit 1); exit; }
|
||||
|
||||
@ -8,6 +8,6 @@
|
||||
# built test directory. Maybe omitted if the same (flat distribution).
|
||||
|
||||
AC_DEFUN([AT_CONFIG],
|
||||
[AT_TESTPATH=ifelse([$1], [], [.], [$1])
|
||||
AC_SUBST(AT_TESTPATH)
|
||||
[AUTOTEST_PATH=ifelse([$1], [], [.], [$1])
|
||||
AC_SUBST(AUTOTEST_PATH)
|
||||
])
|
||||
|
||||
@ -71,8 +71,8 @@ top_srcdir=@top_srcdir@
|
||||
# Use absolute file notations, as the test might change directories.
|
||||
at_srcdir=`cd @srcdir@ && pwd`
|
||||
at_top_srcdir=`cd @top_srcdir@ && pwd`
|
||||
if test -n "@AT_TESTPATH@"; then
|
||||
export PATH; PATH=`pwd`:`cd @AT_TESTPATH@ && pwd`:$PATH
|
||||
if test -n "@AUTOTEST_PATH@"; then
|
||||
export PATH; PATH=`pwd`:`cd @AUTOTEST_PATH@ && pwd`:$PATH
|
||||
else
|
||||
export PATH; PATH=`pwd`:$PATH
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user