fixincludes/

	* Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS):
	New variables.
	($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4):
	Use them.

gcc/
	* Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
	New variables.
	($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
	(AUTOHEADER): New variable.
	($(srcdir)/cstamp-h.in): Use it.

gnattools/
	* Makefile.in (AUTOCONF, configure_deps): New variables.
	($(srcdir)/configure): Use them.

libada/
	* Makefile.in (AUTOCONF, configure_deps): New variables.
	($(srcdir)/configure)): Use them.  Also depend on multi.m4.

libgcc/
	* configure.ac: Add snippet for maintainer-mode.
	* configure: Regenerate.
	* Makefile.in (AUTOCONF, configure_deps): New variables.
	($(srcdir)/configure)): New rule, active only with maintainer
	mode turned on.

libiberty/
	* Makefile.in (AUTOCONF, configure_deps): New variables.
	($(srcdir)/configure): New rule, active only in maintainer mode.

libobjc/
	* Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
	New variables.
	($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.

intl/
	* Makefile.in (aclocal_deps): New variable.
	($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.

libdecnumber/
	* Makefile.in (aclocal_deps): New variable.
	($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150277 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 35260caca66ad730426142258330feae3c7a6b4b..62300af7c25c15b84a8b4758f7600a1532bf8a56 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS):
+       New variables.
+       ($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4):
+       Use them.
+
 2009-07-04  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        * inclhack.def (darwin_stdint_5, darwin_stdint_6,

diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index 1f89cf9edebfea6269ee1ccbd6b0924d6e79dc0f..f91a70d2e6e980ded8631a117d6666a413f8e450 100644 (file)
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -63,6 +63,11 @@ itoolsdatadir = $(libsubdir)/install-tools
 # Locate mkinstalldirs.
 mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
 
+AUTOCONF = autoconf
+AUTOHEADER = autoheader
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config
+
 default : all
 
 # Now figure out from those variables how to compile and link.
@@ -159,13 +164,13 @@ config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
-       cd $(srcdir) && autoconf
+       cd $(srcdir) && $(AUTOCONF)
 
 $(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac
-       cd $(srcdir) && autoheader
+       cd $(srcdir) && $(AUTOHEADER)
 
 $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac
-       cd $(srcdir) && aclocal -I ../gcc -I .. -I ../config
+       cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 check : all
        autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4358c842638403633fc2a43a47d7607f94047b88..a37f9dc2350b88bf74cb7dceb531f716da761953 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
+       New variables.
+       ($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
+       (AUTOHEADER): New variable.
+       ($(srcdir)/cstamp-h.in): Use it.
+
 2009-07-30  Michael Meissner  <meissner@linux.vnet.ibm.com>
            Pat Haugen  <pthaugen@us.ibm.com>
            Revital Eres <ERES@il.ibm.com>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index eeac7deab6a7f88e63caa32ae79f4b79397672f5..72622a0c508bfc10d1cece5efc35bd975519c720 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1592,9 +1592,35 @@ cs-tm_p.h: Makefile
 # might be on a read-only file system.  If configured for maintainer mode
 # then do allow autoconf to be run.
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 \
-  $(srcdir)/acinclude.m4
-       (cd $(srcdir) && autoconf)
+AUTOCONF = autoconf
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../config -I ..
+aclocal_deps = \
+       $(srcdir)/../libtool.m4 \
+       $(srcdir)/../ltoptions.m4 \
+       $(srcdir)/../ltsugar.m4 \
+       $(srcdir)/../ltversion.m4 \
+       $(srcdir)/../lt~obsolete.m4 \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/codeset.m4 \
+       $(srcdir)/../config/extensions.m4 \
+       $(srcdir)/../config/gettext-sister.m4 \
+       $(srcdir)/../config/iconv.m4 \
+       $(srcdir)/../config/lcmessage.m4 \
+       $(srcdir)/../config/lib-ld.m4 \
+       $(srcdir)/../config/lib-link.m4 \
+       $(srcdir)/../config/lib-prefix.m4 \
+       $(srcdir)/../config/override.m4 \
+       $(srcdir)/../config/progtest.m4 \
+       $(srcdir)/../config/unwind_ipinfo.m4 \
+       $(srcdir)/../config/warnings.m4 \
+       $(srcdir)/acinclude.m4
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+       (cd $(srcdir) && $(AUTOCONF))
+
+$(srcdir)/aclocal.m4 : @MAINT@ $(aclocal_deps)
+       (cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS))
 
 gccbug:        $(srcdir)/gccbug.in
        CONFIG_FILES=gccbug CONFIG_HEADERS= ./config.status
@@ -1611,9 +1637,10 @@ gccbug:  $(srcdir)/gccbug.in
 
 # Don't run autoheader automatically either.
 # Only run it if maintainer mode is enabled.
+@MAINT@ AUTOHEADER = autoheader
 @MAINT@ $(srcdir)/config.in: $(srcdir)/cstamp-h.in
 @MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.ac
-@MAINT@        (cd $(srcdir) && autoheader)
+@MAINT@        (cd $(srcdir) && $(AUTOHEADER))
 @MAINT@        @rm -f $(srcdir)/cstamp-h.in
 @MAINT@        echo timestamp > $(srcdir)/cstamp-h.in
 auto-host.h: cstamp-h ; @true

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 72765902458aec0573f08b845100c9d24cc8e1e0..99756b180cf81759af819dd3aa3a44d0a9d1e1fb 100644 (file)
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -92,6 +92,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
 fi
 ])
 
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
 m4_include([../config/acx.m4])
 m4_include([../config/codeset.m4])
 m4_include([../config/extensions.m4])
@@ -105,9 +110,4 @@ m4_include([../config/override.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/unwind_ipinfo.m4])
 m4_include([../config/warnings.m4])
-m4_include([../libtool.m4])
-m4_include([../ltoptions.m4])
-m4_include([../ltsugar.m4])
-m4_include([../ltversion.m4])
-m4_include([../lt~obsolete.m4])
 m4_include([acinclude.m4])

diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index d8cbe086f4a6e15eb31ff32105133a41f7cae23e..ff395ea778300891dbb6c69ea1274ff5e2fbe293 100644 (file)
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, configure_deps): New variables.
+       ($(srcdir)/configure): Use them.
+
 2009-05-18  Bechir Zalila  <bechir.zalila@gmail.com>
 
        PR ada/40166

diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index 92f4773b3d85fe36d3d239b3aafb343151b9274c..931989678576241f1029d7687226cc71145b2667 100644 (file)
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -305,9 +305,14 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \
-       $(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4
-       cd $(srcdir) && autoconf
+AUTOCONF = autoconf
+configure_deps = \
+       $(srcdir)/configure.ac \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/override.m4
+
+$(srcdir)/configure: @MAINT@ $(configure_deps)
+       cd $(srcdir) && $(AUTOCONF)
 
 # Don't export variables to the environment, in order to not confuse
 # configure.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 74018fb44c08dbe25bbe285578defbc609e7e399..fda6cc38cd4c4aeee0b8f1a075e155aec700a7bf 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (aclocal_deps): New variable.
+       ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
+
 2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 96211ffd14787850629e03f739f8b5376510bb49..3dd0b7fe8fdf3906898749bdeb2d914f60babac3 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -211,16 +211,28 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac
        cd $(srcdir) && $(AUTOCONF)
 
-$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac \
-       $(srcdir)/../config/codeset.m4 $(srcdir)/../config/gettext.m4 \
-       $(srcdir)/../config/glibc21.m4 $(srcdir)/../config/iconv.m4 \
-       $(srcdir)/../config/intdiv0.m4 $(srcdir)/../config/inttypes-pri.m4 \
-       $(srcdir)/../config/inttypes.m4 $(srcdir)/../config/inttypes_h.m4 \
-       $(srcdir)/../config/lcmessage.m4 $(srcdir)/../config/lib-ld.m4 \
-       $(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \
-       $(srcdir)/../config/nls.m4 $(srcdir)/../config/po.m4 \
-       $(srcdir)/../config/progtest.m4 $(srcdir)/../config/stdint_h.m4 \
-       $(srcdir)/../config/uintmax_t.m4 $(srcdir)/../config/ulonglong.m4
+aclocal_deps = \
+       $(srcdir)/configure.ac \
+       $(srcdir)/../config/codeset.m4 \
+       $(srcdir)/../config/gettext.m4 \
+       $(srcdir)/../config/glibc21.m4 \
+       $(srcdir)/../config/iconv.m4 \
+       $(srcdir)/../config/intdiv0.m4 \
+       $(srcdir)/../config/inttypes-pri.m4 \
+       $(srcdir)/../config/inttypes.m4 \
+       $(srcdir)/../config/inttypes_h.m4 \
+       $(srcdir)/../config/lcmessage.m4 \
+       $(srcdir)/../config/lib-ld.m4 \
+       $(srcdir)/../config/lib-link.m4 \
+       $(srcdir)/../config/lib-prefix.m4 \
+       $(srcdir)/../config/nls.m4 \
+       $(srcdir)/../config/po.m4 \
+       $(srcdir)/../config/progtest.m4 \
+       $(srcdir)/../config/stdint_h.m4 \
+       $(srcdir)/../config/uintmax_t.m4 \
+       $(srcdir)/../config/ulonglong.m4
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
        cd $(srcdir) && $(ACLOCAL) -I ../config
 
 config.h: stamp-h1

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2be7dff176f2691f7d216e45c0b9efa313e4d891..0eddf991d7287f92aef5331485936669ebc70f8b 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, configure_deps): New variables.
+       ($(srcdir)/configure)): Use them.  Also depend on multi.m4.
+
 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.

diff --git a/libada/Makefile.in b/libada/Makefile.in
index f5057a006e730eb5bd73226f64e2e657316689d0..db483b50033d08caa1e380e3a81ce0acb56ca12a 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -171,9 +171,15 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \
-       $(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4
-       cd $(srcdir) && autoconf
+AUTOCONF = autoconf
+configure_deps = \
+       $(srcdir)/configure.ac \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/override.m4 \
+       $(srcdir)/../config/multi.m4
+
+$(srcdir)/configure: @MAINT@ $(configure_deps)
+       cd $(srcdir) && $(AUTOCONF)
 
 # Don't export variables to the environment, in order to not confuse
 # configure.

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 74fba5990d6f82ee44dfff315e9788062caa2774..8cdf161b1d46e878e7b1e43b0648a2a43fc84304 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (aclocal_deps): New variable.
+       ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
+
 2009-05-31  Ian Lance Taylor  <iant@google.com>
 
        * decContext.h: Add extern "C" if compiling with C++.

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index 41607959c9166cdac1699025a4db07fe81f4fab5..de91f6f614b6648357afb35b1c4846de24c2bed5 100644 (file)
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -94,9 +94,13 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4
        cd $(srcdir) && $(AUTOCONF)
 
-$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../config/stdint.m4 \
-       $(srcdir)/../config/warnings.m4 $(srcdir)/../config/override.m4 \
+aclocal_deps = \
+       $(srcdir)/../config/stdint.m4 \
+       $(srcdir)/../config/warnings.m4 \
+       $(srcdir)/../config/override.m4 \
        $(srcdir)/configure.ac
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
        cd $(srcdir) && $(ACLOCAL) -I ../config
 
 config.h: stamp-h1

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 01c35fc536688e323d4c666ec0c6bccdc4c9ec3c..9c2f7aefb81cba3d41968cc32b8f04ced971029a 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * configure.ac: Add snippet for maintainer-mode.
+       * configure: Regenerate.
+       * Makefile.in (AUTOCONF, configure_deps): New variables.
+       ($(srcdir)/configure)): New rule, active only with maintainer
+       mode turned on.
+
 2009-06-23  DJ Delorie  <dj@redhat.com>
 
        Add MeP port.

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 53dde12b47d53d62f4106ddc0125cb4880f8fa73..9484e7e6c0eb0cec4095330d87ae96b3b503433f 100644 (file)
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -140,6 +140,17 @@ stamp-h: $(srcdir)/config.in config.status Makefile
 config.status: $(srcdir)/configure $(srcdir)/config.host
        $(SHELL) ./config.status --recheck
 
+AUTOCONF = autoconf
+configure_deps = \
+       $(srcdir)/../config/enable.m4 \
+       $(srcdir)/../config/tls.m4 \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/no-executables.m4 \
+       $(srcdir)/../config/override.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+       cd $(srcdir) && $(AUTOCONF)
+
 include $(gcc_objdir)/libgcc.mvars
 
 # Flags to pass to recursive makes.

diff --git a/libgcc/configure b/libgcc/configure
index 6315ecd5cbc1e04e97d2999f44bb86ab490fc6dc..0230e799fce87eb6dac2f0a104834fbd41a943f4 100644 (file)
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.0'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="static-object.mk"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 ac_pwd=`pwd`
 
@@ -812,6 +812,9 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-shared        don't provide a shared libgcc
   --enable-version-specific-runtime-libs    Specify that runtime libraries should be installed in a compiler-specific directory
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
   --enable-decimal-float={no,yes,bid,dpd}
                        enable decimal float extension to C.  Selecting 'bid'
                        or 'dpd' choses which decimal floating point format
@@ -1419,6 +1422,23 @@ fi
 fi;
 
 
+# Command-line options.
+# Very limited version of AC_MAINTAINER_MODE.
+# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  case ${enable_maintainer_mode} in
+     yes) MAINT='' ;;
+     no) MAINT='#' ;;
+     *) { { echo "$as_me:$LINENO: error: --enable-maintainer-mode must be yes or no" >&5
+echo "$as_me: error: --enable-maintainer-mode must be yes or no" >&2;}
+   { (exit 1); exit 1; }; } ;;
+   esac
+   maintainer_mode=${enableval}
+else
+  MAINT='#'
+fi;
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -4226,6 +4246,7 @@ s,@LIBS@,$LIBS,;t t
 s,@libgcc_topdir@,$libgcc_topdir,;t t
 s,@enable_shared@,$enable_shared,;t t
 s,@slibdir@,$slibdir,;t t
+s,@MAINT@,$MAINT,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t

diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index d48bccce0655fbc44db17eb574c343098fe96014..b055dbaca13f48b02dd231b544ca0ceb8c35d50a 100644 (file)
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -78,6 +78,21 @@ else
 fi)
 AC_SUBST(slibdir)
 
+# Command-line options.
+# Very limited version of AC_MAINTAINER_MODE.
+AC_ARG_ENABLE([maintainer-mode],
+  [AC_HELP_STRING([--enable-maintainer-mode],
+                 [enable make rules and dependencies not useful (and
+                  sometimes confusing) to the casual installer])],
+  [case ${enable_maintainer_mode} in
+     yes) MAINT='' ;;
+     no) MAINT='#' ;;
+     *) AC_MSG_ERROR([--enable-maintainer-mode must be yes or no]) ;;
+   esac
+   maintainer_mode=${enableval}],
+  [MAINT='#'])
+AC_SUBST([MAINT])dnl
+
 AC_PROG_INSTALL
 
 AC_PROG_AWK

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16f541ed27528fa94a865fd0da8c3e62e759060c..b2f41208bf8990dbd3bfd8df42c8a2449b5691d6 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, configure_deps): New variables.
+       ($(srcdir)/configure): New rule, active only in maintainer mode.
+
 2009-07-29  Douglas B Rupp  <rupp@gnat.com>
 
        * make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 20a7210a1a1504f075b74ee95f50f5124b7bb85f..e8f4f4d679a451d9210f16bf5f49e97afb6743ec 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -459,6 +459,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
+AUTOCONF = autoconf
+configure_deps = $(srcdir)/aclocal.m4 \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/no-executables.m4 \
+       $(srcdir)/../config/override.m4 \
+       $(srcdir)/../config/warnings.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+       cd $(srcdir) && $(AUTOCONF)
+
 # Depending on config.h makes sure that config.status has been re-run
 # if needed.  This prevents problems with parallel builds, in case
 # subdirectories need to run config.status also.

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index fa6022b2b32ab78cee886649b419f8e0ae993b52..a4c963a6e5c97bafe287c73ea82ce4a9a1e2383d 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
+       New variables.
+       ($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
+
 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 855500355212869ae242a15434b8b5210027d4d9..98539cfda418c1e41b166628c2bcdbe2e46fe15a 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -333,9 +333,25 @@ config.status: configure
        CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \
        CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck
 
-${srcdir}/configure: @MAINT@ configure.ac
+AUTOCONF = autoconf
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../config -I ..
+aclocal_deps = \
+       $(srcdir)/../config/multi.m4 \
+       $(srcdir)/../config/override.m4 \
+       $(srcdir)/../config/proginstall.m4 \
+       $(srcdir)/../ltoptions.m4 \
+       $(srcdir)/../ltsugar.m4 \
+       $(srcdir)/../ltversion.m4 \
+       $(srcdir)/../lt~obsolete.m4 \
+       $(srcdir)/acinclude.m4
+
+$(srcdir)/configure: @MAINT@ configure.ac $(srcdir)/aclocal.m4
        rm -f config.cache
-       cd ${srcdir} && autoconf
+       cd $(srcdir) && $(AUTOCONF)
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
+       cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 install: install-libs install-headers
 

diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4
index 0b3d8b741f714d1f16863a22c6405b641bf414d5..69611d54e7635be71930943eb7abcf1e67c173bf 100644 (file)
--- a/libobjc/aclocal.m4
+++ b/libobjc/aclocal.m4
@@ -154,11 +154,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
 fi
 ])
 
-m4_include([../config/multi.m4])
-m4_include([../config/override.m4])
-m4_include([../config/proginstall.m4])
 m4_include([../ltoptions.m4])
 m4_include([../ltsugar.m4])
 m4_include([../ltversion.m4])
 m4_include([../lt~obsolete.m4])
+m4_include([../config/multi.m4])
+m4_include([../config/override.m4])
+m4_include([../config/proginstall.m4])
 m4_include([acinclude.m4])