* automake.in (handle_configure): Quote @MAINTAINER_MODE_TRUE@ to

	avoid problems where AM_MAINTAINER_MODE is put into automake's own
	configure.in.

diff --git a/ChangeLog b/ChangeLog
index 11e6a27b745f57c41466752aa9b0d0dd1ff0a270..42621819e01b7bcdd98101b081acc69ecff8d85b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1998-12-02  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Quote @MAINTAINER_MODE_TRUE@ to
+       avoid problems where AM_MAINTAINER_MODE is put into automake's own
+       configure.in.
+
        * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir.
 
        Some bugs from François Pinard:

diff --git a/automake.in b/automake.in
index d0d42350a534431177a077ab6083442d151cab34..a30b9806a758ec44e4c2c5a27c5f095a34d905b8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2906,7 +2906,7 @@ sub handle_configure
                      # uninitialized value error on the next line.
                      # Don't know why.
                      . ': '
-                     . ($seen_maint_mode ? '@MAINTAINER_MODE_TRUE@ ' : '')
+                     . ($seen_maint_mode ? "\@MAINTAINER_MODE_TRUE\@ " : '')
                      . $amfile . ' '
                      . '$(top_srcdir)/configure.in $(ACLOCAL_M4)'
                       . ' ' . join (' ', @include_stack)