* configure.in: Introduce --enable-maintainer-mode.

* configure: Rebuilt.
* Makefile.tpl (Makefile.in, configure): Enable dependencies only
for maintainer mode.
* Makefile.in: Rebuilt.

diff --git a/ChangeLog b/ChangeLog
index 75d9b8abb4a9cf29ff338f2e06b2f2ec8d20434a..591d1cf277c518ca1157cb9f8285c2b114db68e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in: Introduce --enable-maintainer-mode.
+       * configure: Rebuilt.
+       * Makefile.tpl (Makefile.in, configure): Enable dependencies only
+       for maintainer mode.
+       * Makefile.in: Rebuilt.
+
 2003-02-19  Andrew Cagney <ac131313@redhat.com>
 
        * configure: Regenerate using autoconf 2.13.

diff --git a/Makefile.in b/Makefile.in
index 7e420f74e548e52ce55ee3162cb9e181e808c0f0..3c351ee3d2c59d400a0fba413866eb6daa5c1088 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7470,7 +7470,7 @@ multilib.out: maybe-all-gcc
 
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
        cd $(srcdir) && $(AUTOGEN) Makefile.def
 
 # Rebuilding Makefile.
@@ -7482,7 +7482,7 @@ config.status: configure $(gcc_version_trigger)
 
 # Rebuilding configure.
 AUTOCONF = autoconf
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
        cd $(srcdir) && $(AUTOCONF)
 #
 

diff --git a/Makefile.tpl b/Makefile.tpl
index fe3ecec6cd51d6d1e1c0e0e64aaef2fc251f87f4..a174e3ac0f3137f2e0ecaf9f064150ea8a60b659 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1410,7 +1410,7 @@ multilib.out: maybe-all-gcc
 
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
        cd $(srcdir) && $(AUTOGEN) Makefile.def
 
 # Rebuilding Makefile.
@@ -1422,7 +1422,7 @@ config.status: configure $(gcc_version_trigger)
 
 # Rebuilding configure.
 AUTOCONF = autoconf
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
        cd $(srcdir) && $(AUTOCONF)
 #
 

diff --git a/configure.in b/configure.in
index 6412e7ba040dd6e809502b577ed9331c1d674c23..bb575724ebde1439ab320b5e7637ed12d9004bd9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2127,4 +2127,23 @@ AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
 RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
 NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
 
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+AC_MSG_RESULT($USE_MAINTAINER_MODE)
+AC_SUBST(MAINTAINER_MODE_TRUE)
+AC_SUBST(MAINTAINER_MODE_FALSE)
+if test "$USE_MAINTAINER_MODE" = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi     
+MAINT=$MAINTAINER_MODE_TRUE
+AC_SUBST(MAINT)dnl
+
 AC_OUTPUT(Makefile)