merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16f541e..b2f4120 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 20a7210..e8f4f4d 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.