summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>2015-07-24 18:20:44 +0000
committerIvan Maidanski <ivmai@mail.ru>2015-10-30 01:30:39 +0300
commit595a08f4d410a931bbada821fead0fa4a5e215c7 (patch)
treef53ac516320fddef7089ba3ce5acf215bf4f8135
parent47a30adabbdd8a521a25515739e4cdd9284058ae (diff)
downloadbdwgc-595a08f4d410a931bbada821fead0fa4a5e215c7.tar.gz
PR other/66259 * config-ml.in: Reflects renaming of configure.in to configure.ac * configure: Likewise * configure.ac: Likewise
PR other/66259 * Makefile.direct: Reflects renaming of configure.in to configure.ac * Makefile.dist: Likewise * version.h: Likewise * doc/README: Likewise git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226183 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.direct2
-rw-r--r--Makefile.dist2
-rw-r--r--doc/README2
-rw-r--r--version.h4
5 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c8906b6..4a7ca390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ 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 <michael.haubenwallner@ssi-schaefer.com>
* Makefile.in: Regenerated with automake-1.11.6.
diff --git a/Makefile.direct b/Makefile.direct
index 1f03b511..8b4dff1f 100644
--- a/Makefile.direct
+++ b/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/Makefile.dist b/Makefile.dist
index 20fa40a9..7105f935 100644
--- a/Makefile.dist
+++ b/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/doc/README b/doc/README
index a19cb302..eaba6e50 100644
--- a/doc/README
+++ b/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/version.h b/version.h
index e1fe24bd..9fcbb7b6 100644
--- a/version.h
+++ b/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