diff --git a/ChangeLog b/ChangeLog index 814bb5cf..4f91ad71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,7 +70,7 @@ * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Fix copy n' paste typos in `--with-*', `--without-*' and `*' decoding. Reported by Raja R Harinath. - Fixes autoconf/119. + Fixes autoconf/118. 2000-03-08 Akim Demaille diff --git a/configure b/configure index 02967cd5..167439e6 100755 --- a/configure +++ b/configure @@ -1,48 +1,18 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using Autoconf version 2.14a +# Generated automatically using Autoconf version 2.14a. # Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 # Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - # Defaults: -ac_arg_with_help= -ac_arg_enable_help= -ac_arg_var_help= ac_default_prefix=/usr/local -# Factorizing default headers for most tests. -ac_includes_default="\ -#include -#include -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#else -# if HAVE_STRINGS_H -# include -# endif -#endif -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_UNISTD_H -# include -#endif" # Any additions from configure.in: # Initialize some variables set by options. +ac_init_help=false +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. build=NONE @@ -161,78 +131,7 @@ do with_gas=yes ;; -help | --help | --hel | --he | -h) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<\EOF -`configure' configures software source code packages to adapt to many kinds -of systems. - -Usage: configure [OPTION]... [VAR=VALUE]... [HOST] - -To safely assign special values to environment variables (e.g., CC, -CFLAGS...), give to `configure' the definition as VAR=VALUE. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help print this message - -V, --version print the version of autoconf that created configure - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE - -n, --no-create do not create output files - -Directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - -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 - cat <<\EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - test -n "$ac_arg_enable_help" && echo " -Optional features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ -$ac_arg_enable_help" - test -n "$ac_arg_with_help" && echo " -Optional packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ -$ac_arg_with_help" - test -n "$ac_arg_var_help" && echo " -Some influent environment variables:$ac_arg_var_help" - exit 0 ;; - + ac_init_help=: ;; -host | --host | --hos | --ho) ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) @@ -380,13 +279,12 @@ Some influent environment variables:$ac_arg_var_help" verbose=yes ;; -version | --version | --versio | --versi | --vers | -V) - echo "configure generated by autoconf version 2.14a" - exit 0 ;; + ac_init_version=: ;; -with-* | --with-*) ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then + if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -399,7 +297,7 @@ Some influent environment variables:$ac_arg_var_help" -without-* | --without-*) ac_package=`echo "$ac_option"|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then + if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -438,7 +336,7 @@ Try \`configure --help' for more information." 1>&2; exit 1; } export $ac_envvar ;; *) - if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then + if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then echo "configure: warning: invalid host type: $ac_option" 1>&2 fi if test "x$nonopt" != xNONE; then @@ -453,7 +351,81 @@ done if test -n "$ac_prev"; then { echo "configure: error: missing argument to --\`echo $ac_prev | sed 's/_/-/g'\`" 1>&2; exit 1; } fi +if $ac_init_help; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<\EOF +`configure' configures software source code packages to adapt to many kinds +of systems. +Usage: configure [OPTION]... [VAR=VALUE]... [HOST] + +To safely assign special values to environment variables (e.g., CC, +CFLAGS...), give to `configure' the definition as VAR=VALUE. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help print this message + -V, --version print the version of autoconf that created configure + -q, --quiet, --silent do not print `checking...' messages + --cache-file=FILE cache test results in FILE + -n, --no-create do not create output files + +EOF + + cat </dev/null; then # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -614,7 +615,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 -echo "configure:618: checking for a BSD compatible install" 1>&5 +echo "configure:619: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 @@ -671,7 +672,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6 -echo "configure:675: checking whether build environment is sane" 1>&5 +echo "configure:676: checking whether build environment is sane" 1>&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -728,7 +729,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6 -echo "configure:732: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 +echo "configure:733: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 @@ -771,7 +772,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6 -echo "configure:775: checking for working aclocal" 1>&5 +echo "configure:776: checking for working aclocal" 1>&5 # 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. @@ -784,7 +785,7 @@ else fi echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6 -echo "configure:788: checking for working autoconf" 1>&5 +echo "configure:789: checking for working autoconf" 1>&5 # 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. @@ -797,7 +798,7 @@ else fi echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6 -echo "configure:801: checking for working automake" 1>&5 +echo "configure:802: checking for working automake" 1>&5 # 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. @@ -810,7 +811,7 @@ else fi echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6 -echo "configure:814: checking for working autoheader" 1>&5 +echo "configure:815: checking for working autoheader" 1>&5 # 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. @@ -823,7 +824,7 @@ else fi echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6 -echo "configure:827: checking for working makeinfo" 1>&5 +echo "configure:828: checking for working makeinfo" 1>&5 # 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. @@ -842,12 +843,12 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:846: checking for $ac_word" 1>&5 +echo "configure:847: checking for $ac_word" 1>&5 if test "${ac_cv_path_M4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$M4" in - /* | ?:/*) + /\\* | ?:/\\*) ac_cv_path_M4="$M4" # Let the user override the test with a path. ;; *) @@ -876,7 +877,7 @@ done test -n "$M4" || M4="m4" echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" 1>&6 -echo "configure:880: checking whether m4 supports frozen files" 1>&5 +echo "configure:881: checking whether m4 supports frozen files" 1>&5 if test "${ac_cv_prog_gnu_m4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else @@ -897,23 +898,26 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:901: checking for $ac_word" 1>&5 +echo "configure:902: checking for $ac_word" 1>&5 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_AWK="$ac_prog" + break done - IFS="$ac_save_ifs" fi fi AWK="$ac_cv_prog_AWK" @@ -927,7 +931,7 @@ test -n "$AWK" && break done echo $ECHO_N "checking for working help2man... $ECHO_C" 1>&6 -echo "configure:931: checking for working help2man" 1>&5 +echo "configure:935: checking for working help2man" 1>&5 # 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. @@ -942,12 +946,12 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:946: checking for $ac_word" 1>&5 +echo "configure:950: checking for $ac_word" 1>&5 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$PERL" in - /* | ?:/*) + /\\* | ?:/\\*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) @@ -990,7 +994,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 -echo "configure:994: checking for a BSD compatible install" 1>&5 +echo "configure:998: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 @@ -1391,15 +1395,17 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then case "$ac_given_srcdir" in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; + /\\* | ?:/\\* ) + srcdir="$ac_given_srcdir$ac_dir_suffix"; + top_srcdir=$ac_given_srcdir ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -1444,10 +1450,6 @@ EOF cat >>$CONFIG_STATUS <<\EOF -# -# CONFIG_COMMANDS section. -# - exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/tests/Makefile.in b/tests/Makefile.in index d79f2d55..484b919f 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -169,7 +169,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile all-local +all-am: Makefile all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -208,13 +208,11 @@ maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check-local check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ -all-local all-redirect all-am all installdirs mostlyclean-generic \ +all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -all-local: atconfig testsuite - check-local: atconfig testsuite $(SHELL) testsuite