* lib/missing (autom4te): New.

(aclocal, autoconf, automake, autoheader, help2man): Propagate
actual failures.

diff --git a/ChangeLog b/ChangeLog
index fcd9a3e2fed7d1467c0fc4e2565c3a4458b98e61..3a7f49473a7457f3174cc72c8aaeb9b8b3afc771 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-17  Akim Demaille  <akim@epita.fr>
+
+       * lib/missing (autom4te): New.
+       (aclocal, autoconf, automake, autoheader, help2man): Propagate
+       actual failures.
+
 2001-08-27  Tom Tromey  <tromey@redhat.com>
 
        * automake.texi (A Shared Library): Clarify installation
@@ -115,7 +121,7 @@
        * tests/defs: Unset the MFLAGS, MAKEFLAGS and MAKELEVEL
        environment variables.
        * tests/cond16.test: Use '$MAKE -s', and avoid GNU make
-       dependency. 
+       dependency.
        * tests/substref.test: Likewise.
 
 2001-08-08  Richard Boulton <richard@tartarus.org>

diff --git a/Makefile.in b/Makefile.in
index c7df094335c3764fd511fdaeb32436f4ce576f79..a536836ef52797e371e9bbbb7b9513efefc7cbdb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,8 +105,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-       Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 automake.in \
-       configure configure.in install-sh mdate-sh missing \
+       Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
+       automake.in configure configure.in install-sh mdate-sh missing \
        mkinstalldirs stamp-vti version.texi
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
@@ -115,7 +115,7 @@ all: all-recursive
 .SUFFIXES: .dvi .info .ps .texi
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  Makefile
+         $(AUTOMAKE) --gnits  Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
@@ -345,6 +345,11 @@ distdir = $(PACKAGE)-$(VERSION)
 GZIP_ENV = --best
 
 distdir: $(DISTFILES)
+       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
+       then :; else \
+         echo "NEWS not updated; not releasing" 1>&2; \
+         exit 1; \
+       fi
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
        $(mkinstalldirs) $(distdir)/.

diff --git a/NEWS b/NEWS
index 6c8f8071e06c4bf114c2c04745a493388c205053..ae6dcd28764efa8911e3079ad78ac0332793494a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.4j:
+New in 1.4s:
 * Support for `configure.ac'.
 * Support for `else COND', `endif COND' and negated conditions `!COND'.
 * `make dist-all' is much faster.

diff --git a/configure b/configure
index 4d2f04dc2d7cfa533a560b39552f29fa70f82a53..f4cb7fecb8773786d7873143288a6584871a7ca9 100755 (executable)
--- a/configure
+++ b/configure
@@ -681,7 +681,7 @@ fi
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 
-for ac_prog in gawk mawk nawk awk
+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

diff --git a/lib/missing b/lib/missing
index 0a7fb5a2acec32d1ef949e5e7e7fb11460c5e021..3199d495f525c3b661418235899c307da3d5e455 100755 (executable)
--- a/lib/missing
+++ b/lib/missing
@@ -78,7 +78,7 @@ Supported PROGRAM values:
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -88,6 +88,11 @@ Supported PROGRAM values:
     ;;
 
   aclocal)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
@@ -97,6 +102,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -106,6 +116,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -125,6 +140,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   automake)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -135,6 +155,34 @@ WARNING: \`$1' is missing on your system.  You should only need it if
           while read f; do touch "$f"; done
     ;;
 
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+       touch $file
+    else
+       test -z "$file" || exec >$file
+       echo "#! /bin/sh"
+       echo "# Created by GNU Automake missing as a replacement of"
+       echo "#  $ $@"
+       echo "exit 0"
+       chmod +x $file
+       exit 1
+    fi
+    ;;
+
   bison|yacc)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
@@ -189,6 +237,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a dependency of a manual page.  You may need the