From: Akim Demaille Date: Mon, 17 Sep 2001 14:32:07 +0000 (+0000) Subject: * lib/missing (autom4te): New. X-Git-Tag: Release-1-5b~144 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c5c893d537443f459a805c13f6b90bd589ea96d7;p=automake.git * lib/missing (autom4te): New. (aclocal, autoconf, automake, autoheader, help2man): Propagate actual failures. --- diff --git a/ChangeLog b/ChangeLog index fcd9a3e2..3a7f4947 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-09-17 Akim Demaille + + * lib/missing (autom4te): New. + (aclocal, autoconf, automake, autoheader, help2man): Propagate + actual failures. + 2001-08-27 Tom Tromey * 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 diff --git a/Makefile.in b/Makefile.in index c7df0943..a536836e 100644 --- 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 6c8f8071..ae6dcd28 100644 --- 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 4d2f04dc..f4cb7fec 100755 --- 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 0a7fb5a2..3199d495 100755 --- 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