diff mbox

[build] libatomic, libgfortran: Use automake-1.11.1 to sync with the rest

Message ID 54942092.7030208@ssi-schaefer.com
State New
Headers show

Commit Message

Michael Haubenwallner Dec. 19, 2014, 12:56 p.m. UTC 
On the way to prepare some (aix) libtool patch for toplevel libtool.m4
I've discovered that different versions of automake were used to generate
files across various libs:

most libs:           automake-1.11.1
libatomic   r211747: automake-1.11.6
libgfortran r204654: automake-1.11.3
            r215741: automake-1.11.6

Doesn't feel like there were specific reasons to use newer versions,
but OTOH I've failed to find some docs on which versions to use, so
I'd be fine with updating others to 1.11.6 instead as well.

Anyway - for now, this would be:

libatomic/ChangeLog:

    2014-12-19  Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>

        * Makefile.in: Regenerate with automake-1.11.1.
        * aclocal.m4: Likewise.
        * configure: Likewise.
        * testsuite/Makefile.in: Likewise.

libgfortran/ChangeLog:

    2014-12-19  Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>

        * Makefile.in: Regenerate with automake-1.11.1.
        * aclocal.m4: Likewise.
        * configure: Likewise.

Thanks for review!
/haubi/

Comments

Janne Blomqvist Dec. 31, 2014, 10:45 a.m. UTC | #1 
On Fri, Dec 19, 2014 at 2:56 PM, Michael Haubenwallner
<michael.haubenwallner@ssi-schaefer.com> wrote:
> On the way to prepare some (aix) libtool patch for toplevel libtool.m4
> I've discovered that different versions of automake were used to generate
> files across various libs:
>
> most libs:           automake-1.11.1
> libatomic   r211747: automake-1.11.6
> libgfortran r204654: automake-1.11.3
>             r215741: automake-1.11.6
>
> Doesn't feel like there were specific reasons to use newer versions,
> but OTOH I've failed to find some docs on which versions to use, so
> I'd be fine with updating others to 1.11.6 instead as well.

I'm far from an autotools expert, but one justification for updating
to 1.11.6 would be CVE-2012-3386, see
https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html .

Whatever version we end up choosing, the docs should say it so that
there won't be such misconceptions in the future, IMHO.
Michael Haubenwallner Jan. 4, 2015, 7:20 p.m. UTC | #2 
(CC'ing build machinery maintainers, maybe I should have done this initially)

Am 2014-12-31 um 11:45 schrieb Janne Blomqvist:
> On Fri, Dec 19, 2014 at 2:56 PM, Michael Haubenwallner
> <michael.haubenwallner@ssi-schaefer.com> wrote:
>> On the way to prepare some (aix) libtool patch for toplevel libtool.m4
>> I've discovered that different versions of automake were used to generate
>> files across various libs:
>>
>> most libs:           automake-1.11.1
>> libatomic   r211747: automake-1.11.6
>> libgfortran r204654: automake-1.11.3
>>             r215741: automake-1.11.6
>>
>> Doesn't feel like there were specific reasons to use newer versions,
>> but OTOH I've failed to find some docs on which versions to use, so
>> I'd be fine with updating others to 1.11.6 instead as well.
> 
> I'm far from an autotools expert, but one justification for updating
> to 1.11.6 would be CVE-2012-3386, see
> https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html .
> 
> Whatever version we end up choosing, the docs should say it so that
> there won't be such misconceptions in the future, IMHO.

IMHO, changing an autotool's version in general should be up to (review by)
the build machinery maintainers.

And it should be done across the whole tree, not just for various subdirectories.

However, each update listed here feels like happened by accident, using the
version installed on the more or less up-to-date host OS.


Am 2014-12-28 um 05:20 schrieb Bernd Edlinger:
> On Fri, 19 Dec 2014 13:56:50, Michael Haubenwallner wrote:
>> <text above>
> 
> Michael proposes to change everything to automake-1.11.1.
> But the helper files "missing" and friends were updated to automake-1.14.1
> by:
> 
> 2014-11-16  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
> 
>         * compile: Sync with upstream Automake.
>         * depcomp: Ditto.
>         * install-sh: Ditto.
>         * missing: Ditto.
>         * mkinstalldirs: Ditto.
>         * ylwrap: Ditto.
> 
> 
> Actually I thought that was in preparation to move everything to automake 1.14.1
> 
> If I see that right, calling automake without parameters does not touch these
> helper files, but "automake --add-missing --copy --force-missing" would replace
> them with the copy from the automake installation additionally to just rewriting the
> Makefile.in.
> 
> I think we should have all automake files from the same version, either 1.11.1
> or 1.14.1.
> 
> What do you think?

Updating to 1.14 might require more work like updating some .in files as well. I've
seen automake-1.11 being explicitly used, so for now we really want 1.11.6 eventually?

/haubi/
Michael Haubenwallner Jan. 22, 2015, 8:05 a.m. UTC | #3 
ping

As trunk is in stage 4, is there some accepted custom to re-run all the third party
generators, to avoid different versions of generated code across the final release?

Thanks!
/haubi/

On 01/04/2015 08:20 PM, Michael Haubenwallner wrote:
> (CC'ing build machinery maintainers, maybe I should have done this initially)
> 
> Am 2014-12-31 um 11:45 schrieb Janne Blomqvist:
>> On Fri, Dec 19, 2014 at 2:56 PM, Michael Haubenwallner
>> <michael.haubenwallner@ssi-schaefer.com> wrote:
>>> On the way to prepare some (aix) libtool patch for toplevel libtool.m4
>>> I've discovered that different versions of automake were used to generate
>>> files across various libs:
>>>
>>> most libs:           automake-1.11.1
>>> libatomic   r211747: automake-1.11.6
>>> libgfortran r204654: automake-1.11.3
>>>             r215741: automake-1.11.6
>>>
>>> Doesn't feel like there were specific reasons to use newer versions,
>>> but OTOH I've failed to find some docs on which versions to use, so
>>> I'd be fine with updating others to 1.11.6 instead as well.
>>
>> I'm far from an autotools expert, but one justification for updating
>> to 1.11.6 would be CVE-2012-3386, see
>> https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html .
>>
>> Whatever version we end up choosing, the docs should say it so that
>> there won't be such misconceptions in the future, IMHO.
> 
> IMHO, changing an autotool's version in general should be up to (review by)
> the build machinery maintainers.
> 
> And it should be done across the whole tree, not just for various subdirectories.
> 
> However, each update listed here feels like happened by accident, using the
> version installed on the more or less up-to-date host OS.
> 
> 
> Am 2014-12-28 um 05:20 schrieb Bernd Edlinger:
>> On Fri, 19 Dec 2014 13:56:50, Michael Haubenwallner wrote:
>>> <text above>
>>
>> Michael proposes to change everything to automake-1.11.1.
>> But the helper files "missing" and friends were updated to automake-1.14.1
>> by:
>>
>> 2014-11-16  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
>>
>>         * compile: Sync with upstream Automake.
>>         * depcomp: Ditto.
>>         * install-sh: Ditto.
>>         * missing: Ditto.
>>         * mkinstalldirs: Ditto.
>>         * ylwrap: Ditto.
>>
>>
>> Actually I thought that was in preparation to move everything to automake 1.14.1
>>
>> If I see that right, calling automake without parameters does not touch these
>> helper files, but "automake --add-missing --copy --force-missing" would replace
>> them with the copy from the automake installation additionally to just rewriting the
>> Makefile.in.
>>
>> I think we should have all automake files from the same version, either 1.11.1
>> or 1.14.1.
>>
>> What do you think?
> 
> Updating to 1.14 might require more work like updating some .in files as well. I've
> seen automake-1.11 being explicitly used, so for now we really want 1.11.6 eventually?
> 
> /haubi/
>
Jan-Benedict Glaw Jan. 25, 2015, 7:42 p.m. UTC | #4 
Hi Michael,

On Sun, 2015-01-04 20:20:40 +0100, Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> wrote:
> (CC'ing build machinery maintainers, maybe I should have done this initially)

Good point, that's my oversight and I'm quite undecided what to do.

> Am 2014-12-31 um 11:45 schrieb Janne Blomqvist:
> > On Fri, Dec 19, 2014 at 2:56 PM, Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> wrote:
> > > On the way to prepare some (aix) libtool patch for toplevel
> > > libtool.m4 I've discovered that different versions of automake
> > > were used to generate files across various libs:
> > >
> > > most libs:           automake-1.11.1
> > > libatomic   r211747: automake-1.11.6
> > > libgfortran r204654: automake-1.11.3
> > >             r215741: automake-1.11.6
> > >
> > > Doesn't feel like there were specific reasons to use newer
> > > versions, but OTOH I've failed to find some docs on which
> > > versions to use, so I'd be fine with updating others to 1.11.6
> > > instead as well.
> > 
> > I'm far from an autotools expert, but one justification for
> > updating to 1.11.6 would be CVE-2012-3386, see
> > https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html .
> > 
> > Whatever version we end up choosing, the docs should say it so
> > that there won't be such misconceptions in the future, IMHO.
> IMHO, changing an autotool's version in general should be up to
> (review by) the build machinery maintainers.
> 
> And it should be done across the whole tree, not just for various
> subdirectories.
> 
> However, each update listed here feels like happened by accident,
> using the version installed on the more or less up-to-date host OS.
>
> Am 2014-12-28 um 05:20 schrieb Bernd Edlinger:
> > On Fri, 19 Dec 2014 13:56:50, Michael Haubenwallner wrote:
>
> > > <text above>
> > 
> > Michael proposes to change everything to automake-1.11.1.
> > But the helper files "missing" and friends were updated to automake-1.14.1
> > by:
> > 
> > 2014-11-16  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
> > 
> >         * compile: Sync with upstream Automake.
> >         * depcomp: Ditto.
> >         * install-sh: Ditto.
> >         * missing: Ditto.
> >         * mkinstalldirs: Ditto.
> >         * ylwrap: Ditto.
> > 
> > 
> > Actually I thought that was in preparation to move everything to
> > automake 1.14.1
> > 
> > If I see that right, calling automake without parameters does not
> > touch these helper files, but "automake --add-missing --copy
> > --force-missing" would replace them with the copy from the
> > automake installation additionally to just rewriting the
> > Makefile.in.

I actually updated `missing' by hand from upstream (thus sync'ing in
the current upstream version), later on regenerated the files.

  So this is my fault to not keep proper tool's vs. helper files's
versions together.

> > I think we should have all automake files from the same version,
> > either 1.11.1 or 1.14.1.
> > 
> > What do you think?

I think I totally agree.

> Updating to 1.14 might require more work like updating some .in
> files as well. I've seen automake-1.11 being explicitly used, so for
> now we really want 1.11.6 eventually?

Probably yes, we may want to stick to a well-known version. (Maybe
another way could be to really upgrade to current versions, with is, I
guess, more work than just sync files and rerun. That might be
fruitful (ie. to not stick to older versions), but this is a change I
don't see in the current stage.)

  To cut a long story short:

  * Do we actually see *problems* from the version inconsistencies
    already introduced by me and/or others?
  * ...and: Do we want to stick to known versions, or update if?
    (Probably not in such a late stage, though...)

MfG, JBG
diff mbox

Patch

Index: libgfortran/Makefile.in
===================================================================
--- libgfortran/Makefile.in	(revision 218894)
+++ libgfortran/Makefile.in	(working copy)
@@ -1,9 +1,9 @@ 
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,23 +18,6 @@ 
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -168,12 +151,6 @@ 
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(cafexeclibdir)" \
 	"$(DESTDIR)$(myexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" \
 	"$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(fincludedir)"
@@ -430,11 +407,6 @@ 
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(toolexeclib_DATA)
 HEADERS = $(nodist_finclude_HEADERS)
 ETAGS = etags
@@ -1316,7 +1288,7 @@ 
 
 .SUFFIXES:
 .SUFFIXES: .F90 .c .f90 .lo .o .obj
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -1352,8 +1324,10 @@ 
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -1369,6 +1343,7 @@ 
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-cafexeclibLTLIBRARIES: $(cafexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(cafexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(cafexeclibdir)"
 	@list='$(cafexeclib_LTLIBRARIES)'; test -n "$(cafexeclibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -1376,8 +1351,6 @@ 
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(cafexeclibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(cafexeclibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(cafexeclibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(cafexeclibdir)"; \
 	}
@@ -1401,6 +1374,7 @@ 
 	done
 install-myexeclibLTLIBRARIES: $(myexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(myexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(myexeclibdir)"
 	@list='$(myexeclib_LTLIBRARIES)'; test -n "$(myexeclibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -1408,8 +1382,6 @@ 
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(myexeclibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(myexeclibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(myexeclibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(myexeclibdir)"; \
 	}
@@ -1433,6 +1405,7 @@ 
 	done
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)"
 	@list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -1440,8 +1413,6 @@ 
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(toolexeclibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(toolexeclibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(toolexeclibdir)"; \
 	}
@@ -1463,11 +1434,11 @@ 
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libcaf_single.la: $(libcaf_single_la_OBJECTS) $(libcaf_single_la_DEPENDENCIES) $(EXTRA_libcaf_single_la_DEPENDENCIES) 
+libcaf_single.la: $(libcaf_single_la_OBJECTS) $(libcaf_single_la_DEPENDENCIES) 
 	$(libcaf_single_la_LINK) -rpath $(cafexeclibdir) $(libcaf_single_la_OBJECTS) $(libcaf_single_la_LIBADD) $(LIBS)
-libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) $(EXTRA_libgfortran_la_DEPENDENCIES) 
+libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) 
 	$(libgfortran_la_LINK) -rpath $(toolexeclibdir) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS)
-libgfortranbegin.la: $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_DEPENDENCIES) $(EXTRA_libgfortranbegin_la_DEPENDENCIES) 
+libgfortranbegin.la: $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_DEPENDENCIES) 
 	$(libgfortranbegin_la_LINK) -rpath $(myexeclibdir) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -5734,11 +5705,8 @@ 
 	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
 install-toolexeclibDATA: $(toolexeclib_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)"
 	@list='$(toolexeclib_DATA)'; test -n "$(toolexeclibdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(toolexeclibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -5752,14 +5720,13 @@ 
 	@$(NORMAL_UNINSTALL)
 	@list='$(toolexeclib_DATA)'; test -n "$(toolexeclibdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(toolexeclibdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(toolexeclibdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(toolexeclibdir)" && rm -f $$files
 install-nodist_fincludeHEADERS: $(nodist_finclude_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(fincludedir)" || $(MKDIR_P) "$(DESTDIR)$(fincludedir)"
 	@list='$(nodist_finclude_HEADERS)'; test -n "$(fincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(fincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(fincludedir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -5773,7 +5740,9 @@ 
 	@$(NORMAL_UNINSTALL)
 	@list='$(nodist_finclude_HEADERS)'; test -n "$(fincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(fincludedir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(fincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(fincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -5845,15 +5814,10 @@ 
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
Index: libgfortran/aclocal.m4
===================================================================
--- libgfortran/aclocal.m4	(revision 218894)
+++ libgfortran/aclocal.m4	(working copy)
@@ -1,8 +1,7 @@ 
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,15 +19,12 @@ 
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -38,7 +34,7 @@ 
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,21 +50,19 @@ 
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -150,14 +144,14 @@ 
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -197,7 +191,6 @@ 
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -262,7 +255,7 @@ 
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -327,13 +320,10 @@ 
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -555,15 +545,12 @@ 
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -582,8 +569,8 @@ 
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -603,7 +590,7 @@ 
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -749,15 +736,12 @@ 
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -780,14 +764,13 @@ 
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -795,13 +778,13 @@ 
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -877,14 +860,12 @@ 
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -907,13 +888,13 @@ 
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 2
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -922,13 +903,13 @@ 
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -950,11 +931,10 @@ 
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
 m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
Index: libgfortran/configure
===================================================================
--- libgfortran/configure	(revision 218894)
+++ libgfortran/configure	(working copy)
@@ -659,7 +659,6 @@ 
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -3402,18 +3401,18 @@ 
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3539,7 +3538,6 @@ 
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4357,7 +4355,6 @@ 
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4417,7 +4414,7 @@ 
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -5533,7 +5530,6 @@ 
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5593,7 +5589,7 @@ 
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -12376,7 +12372,7 @@ 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12379 "configure"
+#line 12375 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12482,7 +12478,7 @@ 
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12485 "configure"
+#line 12481 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H