* Makefile.am (.m4.m4f): Pass the options first.

Fixes PR autoconf/182.

diff --git a/ChangeLog b/ChangeLog
index 79cb029c32c4a77b069a6d4c539d1fe8818f3e9a..84ebef3c52fcf459cbd6034611c27bbaebe9b6d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-02  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am (.m4.m4f): Pass the options first.
+       Fixes PR autoconf/182.
+
 2001-06-02  Nathan Sidwell  <nathan@codesourcery.com>
 
        GNU getopt, when POSIXLY_CORRECT does not permute options and

diff --git a/Makefile.am b/Makefile.am
index b8545642541db6e8ec9a93d2d310b43dd9c943de..9c6c3cfb0e7b1ccd321fda455f9852d0e7b29ebc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,7 +178,7 @@ autoscan: $(srcdir)/autoscan.in $(srcdir)/configure.in
 # It may happen that the output does not end with a end of line, hence
 # force an end of line when reporting errors.
 .m4.m4f:
-       $(M4) -I $(srcdir) $(srcdir)/$*.m4 -D divert | \
+       $(M4) -I $(srcdir) -D divert $(srcdir)/$*.m4 | \
          sed 's/#.*//;/^$$/d' >process.log
        if grep . process.log >/dev/null 2>&1; then \
          echo "Processing $(srcdir)/$*.m4 produced output:" >&2; \
@@ -188,7 +188,7 @@ autoscan: $(srcdir)/autoscan.in $(srcdir)/configure.in
        else \
          rm -f process.log; \
        fi
-       $(M4) -I $(srcdir) $(srcdir)/$*.m4 --freeze-state=$*.m4f >freeze.log
+       $(M4) -I $(srcdir) --freeze-state=$*.m4f $(srcdir)/$*.m4 >freeze.log
        if grep . freeze.log >/dev/null 2>&1; then \
          echo "Freezing $(srcdir)/$*.m4 produced output:" >&2; \
          sed "s,^,$(srcdir)/$*.m4: ," < freeze.log >&2; \

diff --git a/Makefile.in b/Makefile.in
index 499de21ede22b416184f38a11328caed9ca0c526..6046784853f967585044a24db172c4d57d6608c3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -481,7 +481,7 @@ autoscan: $(srcdir)/autoscan.in $(srcdir)/configure.in
 # It may happen that the output does not end with a end of line, hence
 # force an end of line when reporting errors.
 .m4.m4f:
-       $(M4) -I $(srcdir) $(srcdir)/$*.m4 -D divert | \
+       $(M4) -I $(srcdir) -D divert $(srcdir)/$*.m4 | \
          sed 's/#.*//;/^$$/d' >process.log
        if grep . process.log >/dev/null 2>&1; then \
          echo "Processing $(srcdir)/$*.m4 produced output:" >&2; \
@@ -491,7 +491,7 @@ autoscan: $(srcdir)/autoscan.in $(srcdir)/configure.in
        else \
          rm -f process.log; \
        fi
-       $(M4) -I $(srcdir) $(srcdir)/$*.m4 --freeze-state=$*.m4f >freeze.log
+       $(M4) -I $(srcdir) --freeze-state=$*.m4f $(srcdir)/$*.m4 >freeze.log
        if grep . freeze.log >/dev/null 2>&1; then \
          echo "Freezing $(srcdir)/$*.m4 produced output:" >&2; \
          sed "s,^,$(srcdir)/$*.m4: ," < freeze.log >&2; \