From: Akim Demaille Date: Sat, 22 Sep 2001 16:29:22 +0000 (+0000) Subject: * configure.in, NEWS: Bump to 1.5a. X-Git-Tag: Release-1-5b~142 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1e84757c11d1a0f4b9e2f07285abc2709ca15c07;p=automake.git * configure.in, NEWS: Bump to 1.5a. Require 2.52. --- diff --git a/ChangeLog b/ChangeLog index c1255bf2..d6d2b37f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-09-22 Akim Demaille + + * configure.in, NEWS: Bump to 1.5a. + Require 2.52. + 2001-09-22 Paul Eggert * ChangeLog, ChangeLog.1996, ChangeLog.1998, ChangeLog.2000, diff --git a/Makefile.in b/Makefile.in index 7414934e..e8fa85a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/NEWS b/NEWS index 46473ad7..26525ffa 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,7 @@ -New in 1.4s: +New in 1.5a: +* Autoconf 2.52 is required. + +New in 1.5: * Support for `configure.ac'. * Support for `else COND', `endif COND' and negated conditions `!COND'. * `make dist-all' is much faster. diff --git a/aclocal.m4 b/aclocal.m4 index b87cc76a..3c9f4b21 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.4s +# aclocal.m4 generated automatically by aclocal 1.5a # Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/configure b/configure index 1ab20f5b..228e4783 100755 --- a/configure +++ b/configure @@ -1,25 +1,14 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.52e. +# Generated by GNU Autoconf 2.52e for GNU Automake 1.5a. +# +# Report bugs to . # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -35,6 +24,44 @@ fi # Name of the executable. as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'` +# If LINENO is not supported by the shell, produce a version of this +# script where LINENO is hard coded. Rewrite if not up to date only. +# Comparing LINENO against _oline_ is not a good solution, since in +# the case of embedded executables (such as config.status within +# configure) you'd compare LINENO wrt config.status vs. _oline_ vs +# configure. Hence a useless rewrite (not to mention the risk of +# ``infinite'' rewrites. Merely check that LINENO is incremented +# between two lines, which is a property guaranteed for _oline_, hence +# it protects us from repetitive rewrites. +as_lineno_1=$LINENO +as_lineno_2=$LINENO +# Compute as_lineno_1 in two steps: some shells restart LINENO for +# subshells. +as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null` +if test "x$as_lineno_1" != "x$as_lineno_2"; then + if test ! -f $as_me.lineno || + test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \ + != x$as_me.lineno; then + # Be sure to write the pattern so that it doesn't replace itself: + # it must not match itself. + awk '{ + if ($0 ~ /[$]LINENO/) + while (sub (/[$]LINENO/, NR)) + continue + print + }' <$as_me >$as_me.lineno + chmod +x $as_me.lineno + fi + exec ${SHELL-/bin/sh} ./$as_me.lineno +fi + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in *c*,-n*) ECHO_N= ECHO_C=' ' ECHO_T=' ' ;; @@ -81,6 +108,12 @@ fi as_executable_p="test -f" +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -105,7 +138,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -170,11 +203,11 @@ infodir='${prefix}/info' mandir='${prefix}/man' # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='GNU Automake' +PACKAGE_TARNAME='automake' +PACKAGE_VERSION='1.5a' +PACKAGE_STRING='GNU Automake 1.5a' +PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_prev= for ac_option @@ -570,7 +603,7 @@ if test "$ac_init_help" = "long"; 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 <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures GNU Automake 1.5a to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -631,7 +664,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of GNU Automake 1.5a:";; + esac cat <<\_ACEOF Optional Features: @@ -640,6 +675,7 @@ Optional Features: --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors +Report bugs to . _ACEOF fi @@ -649,9 +685,9 @@ if test "$ac_init_help" = "recursive"; then for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue cd $ac_dir if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\./,,'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` else ac_dir_suffix= ac_top_builddir= fi @@ -693,6 +729,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +GNU Automake configure 1.5a +generated by GNU Autoconf 2.52e Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -706,7 +744,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by GNU Automake $as_me 1.5a, which was generated by GNU Autoconf 2.52e. Invocation command line was $ $0 $@ @@ -846,7 +884,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:849: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" @@ -857,7 +895,7 @@ if test -r "$cache_file"; then # 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:860: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -865,7 +903,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:868: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -881,21 +919,21 @@ 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 "$as_me:884: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { 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;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:888: error: \`$ac_var' was not set in the previous run" >&5 + { 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;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:894: error: \`$ac_var' has changed since the previous run:" >&5 + { 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:896: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:898: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -914,9 +952,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:917: error: changes in the environment can compromise the build" >&5 + { 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:919: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { 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;} { (exit 1); exit 1; }; } fi @@ -944,7 +982,7 @@ for ac_dir in lib $srcdir/lib; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:947: error: cannot find install-sh or install.sh in lib $srcdir/lib" >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in lib $srcdir/lib" >&5 echo "$as_me: error: cannot find install-sh or install.sh in lib $srcdir/lib" >&2;} { (exit 1); exit 1; }; } fi @@ -964,7 +1002,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 "$as_me:967: checking for a BSD compatible install" >&5 +echo "$as_me:$LINENO: 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 @@ -985,20 +1023,22 @@ case $as_dir/ in # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if $as_executable_p "$as_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog -c" - break 2 - fi - fi + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # 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 + fi + fi + done done ;; esac @@ -1015,7 +1055,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1018: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1026,7 +1066,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1029: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1050,7 +1090,7 @@ 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 "$as_me:1053: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1063,13 +1103,13 @@ then # Ok. : else - { { echo "$as_me:1066: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1072: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1094,7 +1134,7 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1097: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi @@ -1102,7 +1142,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 "$as_me:1105: checking for $ac_word" >&5 +echo "$as_me:$LINENO: 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 @@ -1110,32 +1150,35 @@ 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 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_executable_p "$as_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1120: found $as_dir/$ac_word" >&5 -break + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$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 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1128: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1131: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1138: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:$LINENO: 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 @@ -1155,11 +1198,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1158: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1162: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1195,14 +1238,14 @@ rmdir .deps 2>/dev/null # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1198: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi # Define the identity of the package. PACKAGE=automake -VERSION=1.4s +VERSION=1.5a cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" @@ -1251,7 +1294,7 @@ AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:1254: checking for $ac_word" >&5 +echo "$as_me:$LINENO: 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 @@ -1266,11 +1309,13 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - if $as_executable_p "$as_dir/$ac_word"; then - ac_cv_path_PERL="$as_dir/$ac_word" - echo "$as_me:1271: found $as_dir/$ac_word" >&5 - break -fi + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done ;; @@ -1279,26 +1324,29 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:1282: result: $PERL" >&5 + echo "$as_me:$LINENO: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:1285: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$PERL"; then - { { echo "$as_me:1290: error: perl not found" >&5 + { { echo "$as_me:$LINENO: error: perl not found" >&5 echo "$as_me: error: perl not found" >&2;} { (exit 1); exit 1; }; } fi $PERL -e 'require 5.005;' || { - { { echo "$as_me:1295: error: perl 5.005 or better is required" >&5 + { { echo "$as_me:$LINENO: error: perl 5.005 or better is required" >&5 echo "$as_me: error: perl 5.005 or better is required" >&2;} { (exit 1); exit 1; }; } } -ac_config_files="$ac_config_files Makefile lib/Makefile lib/Automake/Makefile lib/am/Makefile m4/Makefile tests/Makefile automake aclocal" -ac_config_commands="$ac_config_commands default" +ac_config_files="$ac_config_files automake" + +ac_config_files="$ac_config_files aclocal" + +ac_config_files="$ac_config_files Makefile lib/Makefile lib/Automake/Makefile lib/am/Makefile m4/Makefile tests/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -1408,7 +1456,7 @@ rm -f confdef2opt.sed : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:1411: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -1438,6 +1486,44 @@ fi # Name of the executable. as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'` +# If LINENO is not supported by the shell, produce a version of this +# script where LINENO is hard coded. Rewrite if not up to date only. +# Comparing LINENO against _oline_ is not a good solution, since in +# the case of embedded executables (such as config.status within +# configure) you'd compare LINENO wrt config.status vs. _oline_ vs +# configure. Hence a useless rewrite (not to mention the risk of +# ``infinite'' rewrites. Merely check that LINENO is incremented +# between two lines, which is a property guaranteed for _oline_, hence +# it protects us from repetitive rewrites. +as_lineno_1=$LINENO +as_lineno_2=$LINENO +# Compute as_lineno_1 in two steps: some shells restart LINENO for +# subshells. +as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null` +if test "x$as_lineno_1" != "x$as_lineno_2"; then + if test ! -f $as_me.lineno || + test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \ + != x$as_me.lineno; then + # Be sure to write the pattern so that it doesn't replace itself: + # it must not match itself. + awk '{ + if ($0 ~ /[$]LINENO/) + while (sub (/[$]LINENO/, NR)) + continue + print + }' <$as_me >$as_me.lineno + chmod +x $as_me.lineno + fi + exec ${SHELL-/bin/sh} ./$as_me.lineno +fi + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in *c*,-n*) ECHO_N= ECHO_C=' ' ECHO_T=' ' ;; @@ -1484,6 +1570,12 @@ fi as_executable_p="test -f" +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -1508,7 +1600,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 @@ -1524,7 +1616,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by GNU Automake $as_me 1.5a, which was generated by GNU Autoconf 2.52e. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -1573,15 +1665,12 @@ Usage: $0 [OPTIONS] [FILE]... Configuration files: $config_files -Configuration commands: -$config_commands - Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +GNU Automake config.status 1.5a configured by $0, generated by GNU Autoconf 2.52e, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -1626,7 +1715,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:1629: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -1645,7 +1734,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:1648: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -1664,16 +1753,15 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. + "automake" ) CONFIG_FILES="$CONFIG_FILES automake" ;; + "aclocal" ) CONFIG_FILES="$CONFIG_FILES aclocal" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/Automake/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Automake/Makefile" ;; "lib/am/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/am/Makefile" ;; "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "automake" ) CONFIG_FILES="$CONFIG_FILES automake" ;; - "aclocal" ) CONFIG_FILES="$CONFIG_FILES aclocal" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - *) { { echo "$as_me:1676: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -1685,7 +1773,6 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Create a temporary directory, and hook for its removal unless debugging. @@ -1858,7 +1945,7 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do as_incr_dir=$as_incr_dir/$as_mkdir_dir test -d "$as_incr_dir" || mkdir "$as_incr_dir" || - { { echo "$as_me:1861: error: cannot create \"$ac_dir\"" >&5 + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -1866,9 +1953,9 @@ echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} done; } if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\./,,'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` else ac_dir_suffix= ac_top_builddir= fi @@ -1895,7 +1982,7 @@ esac esac if test x"$ac_file" != x-; then - { echo "$as_me:1898: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -1913,7 +2000,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:1916: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -1926,7 +2013,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:1929: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -1953,55 +2040,10 @@ s,@INSTALL@,$ac_INSTALL,;t t rm -f $tmp/out fi -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\./,,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - - { echo "$as_me:2001: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - default ) chmod +x automake aclocal ;; + # Run the commands associated with the file. + case $ac_file in + automake ) chmod +x automake ;; + aclocal ) chmod +x aclocal ;; esac done _ACEOF diff --git a/configure.in b/configure.in index 034ec395..c857d81a 100644 --- a/configure.in +++ b/configure.in @@ -18,11 +18,13 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_INIT(automake.in) +AC_PREREQ(2.52) +AC_INIT([GNU Automake], [1.5a], [bug-automake@gnu.org]) +AC_CONFIG_SRCDIR(automake.in) AC_CONFIG_AUX_DIR(lib) -AM_INIT_AUTOMAKE(automake, 1.4s) +AM_INIT_AUTOMAKE(automake, 1.5a) ACLOCAL="`pwd`/aclocal --acdir=m4" # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really @@ -37,12 +39,12 @@ $PERL -e 'require 5.005;' || { AC_MSG_ERROR([perl 5.005 or better is required]) } +AC_CONFIG_FILES([automake], [chmod +x automake]) +AC_CONFIG_FILES([aclocal], [chmod +x aclocal]) + AC_OUTPUT([Makefile lib/Makefile lib/Automake/Makefile lib/am/Makefile m4/Makefile - tests/Makefile - - automake aclocal], - [chmod +x automake aclocal]) + tests/Makefile]) diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 15bf39a0..19e7126e 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/lib/Makefile.in b/lib/Makefile.in index 6c5d1985..616f4784 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 053f84cc..cb7ae92d 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/m4/Makefile.in b/m4/Makefile.in index e64a3494..2b91e217 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/stamp-vti b/stamp-vti index 31e5acd1..30485bbc 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 3 September 2001 @set UPDATED-MONTH September 2001 -@set EDITION 1.4s -@set VERSION 1.4s +@set EDITION 1.5a +@set VERSION 1.5a diff --git a/tests/Makefile.in b/tests/Makefile.in index d8c0ce0e..93d43052 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5a from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff --git a/version.texi b/version.texi index 31e5acd1..30485bbc 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ @set UPDATED 3 September 2001 @set UPDATED-MONTH September 2001 -@set EDITION 1.4s -@set VERSION 1.4s +@set EDITION 1.5a +@set VERSION 1.5a