* Makefile.am (perl4-check): Remove, we now require Perl 5.

(maintainer-check): Don't be silent when you find a problem, and
actually, even specify the locations.
Also check that @_ is assigned to arrays.

diff --git a/ChangeLog b/ChangeLog
index 36a71951ba4621e7c93e97d92477a7e57a8c3b0c..6156edb0e5be64a5ba402ce62f9c513cf8ed6834 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-05  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am (perl4-check): Remove, we now require Perl 5.
+       (maintainer-check): Don't be silent when you find a problem, and
+       actually, even specify the locations.
+       Also check that @_ is assigned to arrays.
+
 2001-02-05  Akim Demaille  <akim@epita.fr>
 
        * m4/regex.m4: Use AC_LIBSOURCES.

diff --git a/Makefile.am b/Makefile.am
index d417b3118e6c87b6dc707d9a3f3a0bc6f8853989..80d88e9c3c38c4696775be2cbb049dd9d866f9cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,12 +58,6 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998
 ## to anybody else
 ##
 
-# Run the test suite using Perl 4.
-perl4-check: automake aclocal
-       @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \
-         $(MAKE) PERL=perl4.036 check; \
-       else :; fi
-
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
@@ -81,40 +75,44 @@ maintainer-check: automake aclocal
 ## expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
 ## The backslash in `$${' is needed for some versions of bash.
-       @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \
-         echo "found too many uses of '\$${'" 1>&2; \
+       @if fgrep '\$${' $(srcdir)/[a-z]*.am | \
+              fgrep -v '$$$$' | \
+              grep . ; then \
+         echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
 ## Make sure all invocations of mkinstalldirs are correct.
-       @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \
-         echo "found incorrect use of mkinstalldirs" 1>&2; \
+       @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
+             fgrep -v '$$(mkinstalldirs)' | \
+             grep . ; then \
+         echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
        else :; fi
-## Another syntax check, this time with Perl 4, if it exists.
-       @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \
-         perl4.036 -c -w automake; \
-         perl4.036 -c -w aclocal; \
-       else :; fi
 ## We never want to use "undef", only "delete".
-       @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \
+       @if grep -n -w undef $(srcdir)/automake.in; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \
        fi
 ## We never want split (/ /,...), only split (' ', ...).
-       @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \
-         echo "Found bad split in automake.in" 1>&2; \
+       @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \
+         echo "Found bad split in the lines above." 1>&2; \
          exit 1; \
        fi
 ## Look for cd within backquotes without CDPATH=:
-       @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+       @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
              $(srcdir)/m4/*.m4; then \
          echo "Consider setting CDPATH in the lines above" 1>&2; \
          exit 1; \
        fi
+## Using @_ in a scalar context is most probably a programming error.
+       @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \
+         echo "Using @_ in a scalar context in the lines above." 1>&2; \
+         exit 1; \
+       fi
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check perl4-check distcheck
+cvs-dist: maintainer-check distcheck
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \

diff --git a/Makefile.in b/Makefile.in
index 9863740393b362b20eca02a0db2ade3a9a970232..bb82edbb0bfd987f5d1e58ea9e296ee171b3ee95 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -138,7 +139,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+         && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in 
        cd $(srcdir) && $(ACLOCAL)
@@ -148,9 +149,9 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 automake: $(top_builddir)/config.status automake.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
@@ -512,6 +513,7 @@ distdir: $(DISTFILES)
        fi
        -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
+       $(mkinstalldirs) $(distdir)/. .
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
@@ -636,12 +638,6 @@ installcheck-local:
 
 ################################################################
 
-# Run the test suite using Perl 4.
-perl4-check: automake aclocal
-       @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \
-         $(MAKE) PERL=perl4.036 check; \
-       else :; fi
-
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
@@ -652,35 +648,39 @@ maintainer-check: automake aclocal
        fi
        $(PERL) -c -w automake
        $(PERL) -c -w aclocal
-       @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \
-         echo "found too many uses of '\$${'" 1>&2; \
+       @if fgrep '\$${' $(srcdir)/[a-z]*.am | \
+              fgrep -v '$$$$' | \
+              grep . ; then \
+         echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
-       @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \
-         echo "found incorrect use of mkinstalldirs" 1>&2; \
+       @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
+             fgrep -v '$$(mkinstalldirs)' | \
+             grep . ; then \
+         echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
        else :; fi
-       @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \
-         perl4.036 -c -w automake; \
-         perl4.036 -c -w aclocal; \
-       else :; fi
-       @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \
+       @if grep -n -w undef $(srcdir)/automake.in; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \
        fi
-       @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \
-         echo "Found bad split in automake.in" 1>&2; \
+       @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \
+         echo "Found bad split in the lines above." 1>&2; \
          exit 1; \
        fi
-       @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+       @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
              $(srcdir)/m4/*.m4; then \
          echo "Consider setting CDPATH in the lines above" 1>&2; \
          exit 1; \
        fi
+       @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \
+         echo "Using @_ in a scalar context in the lines above." 1>&2; \
+         exit 1; \
+       fi
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check perl4-check distcheck
+cvs-dist: maintainer-check distcheck
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index d417b3118e6c87b6dc707d9a3f3a0bc6f8853989..80d88e9c3c38c4696775be2cbb049dd9d866f9cf 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -58,12 +58,6 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998
 ## to anybody else
 ##
 
-# Run the test suite using Perl 4.
-perl4-check: automake aclocal
-       @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \
-         $(MAKE) PERL=perl4.036 check; \
-       else :; fi
-
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
@@ -81,40 +75,44 @@ maintainer-check: automake aclocal
 ## expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
 ## The backslash in `$${' is needed for some versions of bash.
-       @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \
-         echo "found too many uses of '\$${'" 1>&2; \
+       @if fgrep '\$${' $(srcdir)/[a-z]*.am | \
+              fgrep -v '$$$$' | \
+              grep . ; then \
+         echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
 ## Make sure all invocations of mkinstalldirs are correct.
-       @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \
-         echo "found incorrect use of mkinstalldirs" 1>&2; \
+       @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
+             fgrep -v '$$(mkinstalldirs)' | \
+             grep . ; then \
+         echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
        else :; fi
-## Another syntax check, this time with Perl 4, if it exists.
-       @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \
-         perl4.036 -c -w automake; \
-         perl4.036 -c -w aclocal; \
-       else :; fi
 ## We never want to use "undef", only "delete".
-       @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \
+       @if grep -n -w undef $(srcdir)/automake.in; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \
        fi
 ## We never want split (/ /,...), only split (' ', ...).
-       @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \
-         echo "Found bad split in automake.in" 1>&2; \
+       @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \
+         echo "Found bad split in the lines above." 1>&2; \
          exit 1; \
        fi
 ## Look for cd within backquotes without CDPATH=:
-       @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
+       @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \
              $(srcdir)/m4/*.m4; then \
          echo "Consider setting CDPATH in the lines above" 1>&2; \
          exit 1; \
        fi
+## Using @_ in a scalar context is most probably a programming error.
+       @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \
+         echo "Using @_ in a scalar context in the lines above." 1>&2; \
+         exit 1; \
+       fi
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check perl4-check distcheck
+cvs-dist: maintainer-check distcheck
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index e847f64a34a803782744f7921a3c0675dc3da893..79c7f129bcebd031809b35c2647da810b1bfbb74 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -357,7 +358,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status
 
 tags: TAGS
 TAGS: