From 6b1786aa65f71d94362d38ada4bf96b6841a59cb Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 24 Jul 2015 12:20:44 -0600 Subject: re PR other/66259 (Combined gcc and binutils build from git-master fails, with gas/as-new not existing) PR other/66259 * config-ml.in: Reflects renaming of configure.in to configure.ac * configure: Likewise * configure.ac: Likewise boehm-gc/ PR other/66259 * Makefile.direct: Reflects renaming of configure.in to configure.ac * Makefile.dist: Likewise * version.h: Likewise * doc/README: Likewise config/ PR other/66259 * gettext.m4: Reflects renaming of configure.in to configure.ac * po.m4: Likewise * stdint.m4: Likewise * tcl.m4: Likewise gcc/ PR other/66259 * acinclude.m4: Reflects renaming of configure.in to configure.ac * configure: Likewise * configure.ac: Likewise * doc/install.texi: Likewise * doc/tm.texi: Likewise * doc/tm.texi.in: Likewise gcc/ada/ PR other/66259 * prj-nmsc.adb: Reflects renaming of configure.in to configure.ac * gcc-interface/Makefile.in: Likewise intl/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac libjava/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac libjava/classpath PR other/66259 * INSTALL: Reflects renaming of configure.in to configure.ac * ltconfig: Likewise * missing: Likewise * m4/ac_prog_javac.m4: Likewise * m4/ac_prog/javac_works.m4: Likewise * resource/META-INF/mimetypes.default: Likewise libjava/libltdl PR other/66259 * THREADS: Reflects renaming of configure.in to configure.ac liboffloadmic/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac From-SVN: r226183 --- boehm-gc/ChangeLog | 8 ++++++++ boehm-gc/Makefile.direct | 2 +- boehm-gc/Makefile.dist | 2 +- boehm-gc/doc/README | 2 +- boehm-gc/version.h | 4 ++-- 5 files changed, 13 insertions(+), 5 deletions(-) (limited to 'boehm-gc') diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 8c8906b..4a7ca39 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,11 @@ +2015-07-24 Michael Darling + + PR other/66259 + * Makefile.direct: Reflects renaming of configure.in to configure.ac + * Makefile.dist: Likewise + * version.h: Likewise + * doc/README: Likewise + 2015-05-13 Michael Haubenwallner * Makefile.in: Regenerated with automake-1.11.6. diff --git a/boehm-gc/Makefile.direct b/boehm-gc/Makefile.direct index 1f03b51..8b4dff1 100644 --- a/boehm-gc/Makefile.direct +++ b/boehm-gc/Makefile.direct @@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \ TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \ tests/leak_test.c tests/thread_leak_test.c tests/middle.c -GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \ +GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \ libtool.m4 install-sh configure.host Makefile.in \ aclocal.m4 config.sub config.guess \ include/Makefile.am include/Makefile.in \ diff --git a/boehm-gc/Makefile.dist b/boehm-gc/Makefile.dist index 20fa40a..7105f93 100644 --- a/boehm-gc/Makefile.dist +++ b/boehm-gc/Makefile.dist @@ -326,7 +326,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \ TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \ tests/leak_test.c tests/thread_leak_test.c tests/middle.c -GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \ +GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \ libtool.m4 install-sh configure.host Makefile.in \ aclocal.m4 config.sub config.guess \ include/Makefile.am include/Makefile.in \ diff --git a/boehm-gc/doc/README b/boehm-gc/doc/README index a19cb30..eaba6e5 100644 --- a/boehm-gc/doc/README +++ b/boehm-gc/doc/README @@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. The file linux_threads.c is also Copyright (c) 1998 by Fergus Henderson. All rights reserved. -The files Makefile.am, and configure.in are +The files Makefile.am, and configure.ac are Copyright (c) 2001 by Red Hat Inc. All rights reserved. Several files supporting GNU-style builds are copyrighted by the Free diff --git a/boehm-gc/version.h b/boehm-gc/version.h index e1fe24b..9fcbb7b 100644 --- a/boehm-gc/version.h +++ b/boehm-gc/version.h @@ -1,4 +1,4 @@ -/* The version here should match that in configure/configure.in */ +/* The version here should match that in configure/configure.ac */ /* Eventually this one may become unnecessary. For now we need */ /* it to keep the old-style build process working. */ #define GC_TMP_VERSION_MAJOR 6 @@ -14,7 +14,7 @@ GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \ defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \ defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION -# error Inconsistent version info. Check README, version.h, and configure.in. +# error Inconsistent version info. Check README, version.h, and configure.ac. # endif #else # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR -- cgit v1.1