The patches to gotools and libbacktrace are fine if the rest of the patches are approved.
I will handle the patch to libgo, which is copied from a different repository. Please do not commit it yourself. Thanks. Ian Michael Haubenwallner <michael.haubenwall...@ssi-schaefer.com> writes: > Patch for gotools. > > Am 2015-05-05 um 18:03 schrieb Michael Haubenwallner: >> Hello build machinery maintainers, >> >> following up >> http://thread.gmane.org/gmane.comp.gcc.patches/331902/focus=334462 >> http://thread.gmane.org/gmane.comp.gcc.patches/332160 >> >> On 01/25/2015 08:42 PM, Jan-Benedict Glaw wrote: >>> On Sun, 2015-01-04 20:20:40 +0100, Michael Haubenwallner >>> <michael.haubenwall...@ssi-schaefer.com> wrote: >> >>>> 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? >> >> There's a problem for gcc-developers: When I need to import a libtool >> upstream patch, by its nature it affects each library. As I prefer to >> avoid mixing these diffs with an automake version change in one commit, >> I need to bootstrap different libraries with different automake versions. >> >> Even if I probably need to split this change into one commit per library >> anyway, the need for multiple automake versions still feels pointless. >> >>> * ...and: Do we want to stick to known versions, or update if? >>> (Probably not in such a late stage, though...) >> >> Now that gcc-5 is out, what about an automake-1.11.6 update for gcc-6? >> >> BTW, the actual commands I use to re-run automake for everything (I found) >> is: >> $ export AUTOMAKE='automake-1.11 --add-missing --copy --force-missing' >> $ /src/gcc-trunk/configure --prefix=/install \ >> --enable-languages=c,c++,fortran,go,java,lto,objc,obj-c++ \ >> --enable-liboffloadmic=target \ >> --enable-libmpx \ >> --enable-maintainer-mode >> $ make bootstrap >> >> Thanks! >> /haubi/ >> > > 2015-05-06 Michael Haubenwallner <michael.haubenwall...@ssi-schaefer.com> > > Use automake-1.11.6. > Makefile.in: Recreate. > aclocal.m4: Recreate. > configure: Recreate. > > Index: gotools/Makefile.in > =================================================================== > --- gotools/Makefile.in (revision 222804) > +++ gotools/Makefile.in (working copy) > @@ -1,9 +1,9 @@ > -# Makefile.in generated by automake 1.11.1 from Makefile.am. > +# Makefile.in generated by automake 1.11.6 from Makefile.am. > # @configure_input@ > > # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, > -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, > -# Inc. > +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. > @@ -33,6 +33,23 @@ > # <http://www.gnu.org/licenses/>. > > 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@ > @@ -56,6 +73,7 @@ > DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ > $(srcdir)/Makefile.am $(top_srcdir)/configure \ > $(am__configure_deps) $(srcdir)/../mkinstalldirs \ > + $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp \ > $(srcdir)/../depcomp > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ > @@ -89,6 +107,11 @@ > CCLD = $(CC) > LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ > SOURCES = cgo.c go.c gofmt.c > +am__can_run_installinfo = \ > + case $$AM_UPDATE_INFO_DIR in \ > + n|no|NO) false;; \ > + *) (install-info --version) >/dev/null 2>&1;; \ > + esac > am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; > am__vpath_adj = case $$p in \ > $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ > @@ -110,6 +133,12 @@ > 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; }; \ > + } > man1dir = $(mandir)/man1 > NROFF = nroff > MANS = $(man_MANS) > @@ -289,7 +318,7 @@ > > .SUFFIXES: > .SUFFIXES: .c .o .obj > -am--refresh: > +am--refresh: Makefile > @: > $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am > $(am__configure_deps) > @for dep in $?; do \ > @@ -325,8 +354,11 @@ > $(am__aclocal_m4_deps): > install-binPROGRAMS: $(bin_PROGRAMS) > @$(NORMAL_INSTALL) > - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" > @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ > + if test -n "$$list"; then \ > + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ > + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ > + fi; \ > for p in $$list; do echo "$$p $$p"; done | \ > sed 's/$(EXEEXT)$$//' | \ > while read p p1; do if test -f $$p; \ > @@ -363,13 +395,13 @@ > > clean-noinstPROGRAMS: > -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) > -@NATIVE_FALSE@cgo$(EXEEXT): $(cgo_OBJECTS) $(cgo_DEPENDENCIES) > +@NATIVE_FALSE@cgo$(EXEEXT): $(cgo_OBJECTS) $(cgo_DEPENDENCIES) > $(EXTRA_cgo_DEPENDENCIES) > @NATIVE_FALSE@ @rm -f cgo$(EXEEXT) > @NATIVE_FALSE@ $(LINK) $(cgo_OBJECTS) $(cgo_LDADD) $(LIBS) > -@NATIVE_FALSE@go$(EXEEXT): $(go_OBJECTS) $(go_DEPENDENCIES) > +@NATIVE_FALSE@go$(EXEEXT): $(go_OBJECTS) $(go_DEPENDENCIES) > $(EXTRA_go_DEPENDENCIES) > @NATIVE_FALSE@ @rm -f go$(EXEEXT) > @NATIVE_FALSE@ $(LINK) $(go_OBJECTS) $(go_LDADD) $(LIBS) > -@NATIVE_FALSE@gofmt$(EXEEXT): $(gofmt_OBJECTS) $(gofmt_DEPENDENCIES) > +@NATIVE_FALSE@gofmt$(EXEEXT): $(gofmt_OBJECTS) $(gofmt_DEPENDENCIES) > $(EXTRA_gofmt_DEPENDENCIES) > @NATIVE_FALSE@ @rm -f gofmt$(EXEEXT) > @NATIVE_FALSE@ $(LINK) $(gofmt_OBJECTS) $(gofmt_LDADD) $(LIBS) > > @@ -398,11 +430,18 @@ > @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` > install-man1: $(man_MANS) > @$(NORMAL_INSTALL) > - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" > - @list=''; test -n "$(man1dir)" || exit 0; \ > - { for i in $$list; do echo "$$i"; done; \ > - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ > - sed -n '/\.1[a-z]*$$/p'; \ > + @list1=''; \ > + list2='$(man_MANS)'; \ > + test -n "$(man1dir)" \ > + && test -n "`echo $$list1$$list2`" \ > + || exit 0; \ > + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ > + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ > + { for i in $$list1; do echo "$$i"; done; \ > + if test -n "$$list2"; then \ > + for i in $$list2; do echo "$$i"; done \ > + | sed -n '/\.1[a-z]*$$/p'; \ > + fi; \ > } | while read p; do \ > if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ > echo "$$d$$p"; echo "$$p"; \ > @@ -431,9 +470,7 @@ > sed -n '/\.1[a-z]*$$/p'; \ > } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ > -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ > - test -z "$$files" || { \ > - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ > - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } > + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) > list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ > @@ -503,10 +540,15 @@ > > installcheck: installcheck-am > install-strip: > - $(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 > + 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 > mostlyclean-generic: > -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) > > Index: gotools/aclocal.m4 > =================================================================== > --- gotools/aclocal.m4 (revision 222804) > +++ gotools/aclocal.m4 (working copy) > @@ -1,7 +1,8 @@ > -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- > +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- > > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, > -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. > +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. > @@ -19,12 +20,15 @@ > 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 Free Software > Foundation, Inc. > +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 > @@ -34,7 +38,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.1], [], > +m4_if([$1], [1.11.6], [], > [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl > ]) > > @@ -50,7 +54,7 @@ > # 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.1])dnl > +[AM_AUTOMAKE_VERSION([1.11.6])dnl > m4_ifndef([AC_AUTOCONF_VERSION], > [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) > @@ -57,12 +61,14 @@ > > # AM_AUX_DIR_EXPAND -*- Autoconf -*- > > -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. > +# Copyright (C) 2001, 2003, 2005, 2011 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/../..'. > @@ -144,14 +150,14 @@ > Usually this means the macro was only invoked conditionally.]]) > fi])]) > > -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 > -# Free Software Foundation, Inc. > +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, > +# 2010, 2011 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 10 > +# serial 12 > > # 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, > @@ -191,6 +197,7 @@ > # 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. > @@ -255,7 +262,7 @@ > break > fi > ;; > - msvisualcpp | msvcmsys) > + msvc7 | msvc7msys | 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. > @@ -320,10 +327,13 @@ > 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 -*- > @@ -545,12 +555,15 @@ > done > echo "timestamp for $_am_arg" > >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) > > -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. > +# Copyright (C) 2001, 2003, 2005, 2008, 2011 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. > @@ -569,8 +582,8 @@ > # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- > # From Jim Meyering > > -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 > -# Free Software Foundation, Inc. > +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, > +# 2011 Free Software Foundation, Inc. > # > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, > @@ -590,7 +603,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 am_maintainer_other maintainer-specific portions > of Makefiles]) > +AC_MSG_CHECKING([whether to enable 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 > @@ -701,12 +714,15 @@ > fi > ]) > > -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. > +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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'. > @@ -729,13 +745,14 @@ > > # Helper functions for option handling. -*- Autoconf -*- > > -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. > +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 4 > +# serial 5 > > # _AM_MANGLE_OPTION(NAME) > # ----------------------- > @@ -743,13 +760,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)])]) > @@ -825,12 +842,14 @@ > fi > AC_MSG_RESULT(yes)]) > > -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. > +# Copyright (C) 2001, 2003, 2005, 2011 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 > @@ -853,13 +872,13 @@ > INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" > AC_SUBST([INSTALL_STRIP_PROGRAM])]) > > -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. > +# Copyright (C) 2006, 2008, 2010 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 2 > +# serial 3 > > # _AM_SUBST_NOTMAKE(VARIABLE) > # --------------------------- > @@ -868,13 +887,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 Free Software Foundation, Inc. > +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. > # > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, > @@ -896,10 +915,11 @@ > # a tarball read from stdin. > # $(am__untar) < result.tar > AC_DEFUN([_AM_PROG_TAR], > -[# Always define AMTAR for backward compatibility. > -AM_MISSING_PROG([AMTAR], [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}']) > m4_if([$1], [v7], > - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], > + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], > [m4_case([$1], [ustar],, [pax],, > [m4_fatal([Unknown tar format])]) > AC_MSG_CHECKING([how to create a $1 tar archive]) > Index: gotools/configure > =================================================================== > --- gotools/configure (revision 222804) > +++ gotools/configure (working copy) > @@ -563,6 +563,7 @@ > am__fastdepCC_FALSE > am__fastdepCC_TRUE > CCDEPMODE > +am__nodep > AMDEPBACKSLASH > AMDEP_FALSE > AMDEP_TRUE > @@ -2565,17 +2566,17 @@ > > # We need awk for the "check" target. The system "awk" is bad on > # some platforms. > -# Always define AMTAR for backward compatibility. > +# 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}' > > -AMTAR=${AMTAR-"${am_missing_run}tar"} > +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' > > -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. > @@ -3417,6 +3418,7 @@ > 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= > @@ -3441,6 +3443,7 @@ > # 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. > @@ -3500,7 +3503,7 @@ > break > fi > ;; > - msvisualcpp | msvcmsys) > + msvc7 | msvc7msys | 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.