* configure.in: Updated to 1.4f.

diff --git a/ChangeLog b/ChangeLog
index 734ba27..5532056 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-05-20  Tom Tromey  <tromey@redhat.com>
 
+       * configure.in: Updated to 1.4f.
+
        * Makefile.am (EXTRA_DIST): Added ChangeLog.2000.
 
        * lib/ansi2knr.c: New version.

diff --git a/Makefile.in b/Makefile.in
index 3148837..c8614c5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/NEWS b/NEWS
index 1f5d386..66033d4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,13 @@
-New in 1.4e:
+New in 1.4f:
 * Support for `configure.ac'.
 * Support for `else COND', `endif COND' and negated conditions `!COND'.
 * `make dist-all' is much faster.
 * Allows '@' AC_SUBSTs in macro names.
-
-New in 1.4b:
 * Faster AM_INIT_AUTOMAKE (requires update of `missing' script)
 * User-side dependency tracking.  Developers no longer need GNU make
 * Python support
 * Many bug fixes
 * Uses DIST_SUBDIRS in some situations when SUBDIRS is conditional
-New in 1.4a:
 * Many files (but not all) are correctly handled if they appear in subdirs
   For instance, a _DATA file can appear in a subdir
 * GNU tar is no longer required for `make dist'

diff --git a/aclocal.m4 b/aclocal.m4
index b737557..bc8cc48 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.4e
+# aclocal.m4 generated automatically by aclocal 1.4f
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -212,55 +212,16 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
-# annoying in cross=compiling environments, where the build's strip
+# annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so if we ever
-# need to use a non standard strip, we just have to make sure we use
-# install-sh with the STRIPPROG variable set.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_MISSING_INSTALL_SH])
-dnl Don't test for $cross_compiling = yes, it might be `maybe'...
-# We'd like to do this but we can't because it will unconditionally
-# require config.guess.  One way would be if autoconf had the capability
-# to let us compile in this code only when config.guess was already
-# a possibility.
-#if test "$cross_compiling" != no; then
-#  # since we are cross-compiling, we need to check for a suitable `strip'
-#  AM_PROG_STRIP
-#  if test -z "$STRIP"; then
-#    AC_MSG_WARN([strip missing, install-strip will not strip binaries])
-#  fi
-#fi
-
-# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
-# instruct install-strip to use install-sh and the given $STRIP program.
-# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
-# as much as possible, because it's faster.
-if test -z "$STRIP"; then
-  # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-  # and the double dolard below is there to make sure that ${INSTALL}
-  # is substitued in the sub-makes, not at the top-level; this is
-  # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-  # by config.status).
-  INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-  INSTALL_STRIP_PROGRAM_ENV=''
-else
-  _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
-  INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-  INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
-fi
-AC_SUBST([STRIP])
-AC_SUBST([INSTALL_STRIP_PROGRAM])
-AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
-
-#AC_DEFUN([AM_PROG_STRIP],
-#[# Check for `strip', unless the installer
-# has set the STRIP environment variable.
-# Note: don't explicitly check for -z "$STRIP" here because
-# that will cause problems if AC_CANONICAL_* is AC_REQUIREd after
-# this macro, and anyway it doesn't have an effect anyway.
-#AC_CHECK_TOOL([STRIP],[strip])
-#])
+[AC_REQUIRE([AM_MISSING_INSTALL_SH])dnl
+_am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
+INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # serial 3
 
@@ -303,7 +264,7 @@ AC_REQUIRE([AM_DEP_TRACK])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE"; then
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
@@ -462,7 +423,12 @@ _am_quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
    _am_include=include
    _am_quote=
    _am_result=GNU

diff --git a/configure b/configure
index c36ab57..41d2302 100755 (executable)
--- a/configure
+++ b/configure
@@ -779,7 +779,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=automake
-VERSION=1.4e
+VERSION=1.4f
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -824,38 +824,8 @@ if test -z "$install_sh"; then
    install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
 fi
 
-
-# We'd like to do this but we can't because it will unconditionally
-# require config.guess.  One way would be if autoconf had the capability
-# to let us compile in this code only when config.guess was already
-# a possibility.
-#if test "$cross_compiling" != no; then
-#  # since we are cross-compiling, we need to check for a suitable `strip'
-#  AM_PROG_STRIP
-#  if test -z "$STRIP"; then
-#    AC_MSG_WARN([strip missing, install-strip will not strip binaries])
-#  fi
-#fi
-
-# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
-# instruct install-strip to use install-sh and the given $STRIP program.
-# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
-# as much as possible, because it's faster.
-if test -z "$STRIP"; then
-  # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-  # and the double dolard below is there to make sure that ${INSTALL}
-  # is substitued in the sub-makes, not at the top-level; this is
-  # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-  # by config.status).
-  INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-  INSTALL_STRIP_PROGRAM_ENV=''
-else
-  _am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
-  INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-  INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
-fi
-
-
+_am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
+INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -869,7 +839,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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:873: checking for $ac_word" >&5
+echo "configure:843: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1072,9 +1042,7 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@AMTAR@%$AMTAR%g
 s%@install_sh@%$install_sh%g
-s%@STRIP@%$STRIP%g
 s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
-s%@INSTALL_STRIP_PROGRAM_ENV@%$INSTALL_STRIP_PROGRAM_ENV%g
 s%@AWK@%$AWK%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@AMDEP_TRUE@%$AMDEP_TRUE%g

diff --git a/configure.in b/configure.in
index e5443fc..11ed48a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(automake.in)
 
 AC_CONFIG_AUX_DIR(lib)
 
-AM_INIT_AUTOMAKE(automake, 1.4e)
+AM_INIT_AUTOMAKE(automake, 1.4f)
 
 ACLOCAL="`pwd`/aclocal --acdir=m4"
 # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 64b1f8d..c09e3a4 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 54c846d..7cef292 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 1748130..897610b 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 9223b24..2040c31 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/stamp-vti b/stamp-vti
index 24b5928..e5e6062 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 17 May 2001
 @set UPDATED-MONTH May 2001
-@set EDITION 1.4e
-@set VERSION 1.4e
+@set EDITION 1.4f
+@set VERSION 1.4f

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f11a46f..0d4233c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.4f from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -59,10 +59,8 @@ AMTAR = @AMTAR@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-STRIP = @STRIP@
 VERSION = @VERSION@
 _am_include = @_am_include@
 _am_quote = @_am_quote@

diff --git a/version.texi b/version.texi
index 24b5928..e5e6062 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 17 May 2001
 @set UPDATED-MONTH May 2001
-@set EDITION 1.4e
-@set VERSION 1.4e
+@set EDITION 1.4f
+@set VERSION 1.4f