Skip to content

Commit 6b1786a

Browse files
author
Jeff Law
committed
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
1 parent 525a825 commit 6b1786a

40 files changed

+134
-76
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2015-07-24 Michael Darling <[email protected]>
2+
3+
PR other/66259
4+
* config-ml.in: Reflects renaming of configure.in to configure.ac
5+
* configure: Likewise
6+
* configure.ac: Likewise
7+
18
2015-07-23 Bernd Schmidt <[email protected]>
29

310
* MAINTAINERS: Update my email address.

boehm-gc/ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2015-07-24 Michael Darling <[email protected]>
2+
3+
PR other/66259
4+
* Makefile.direct: Reflects renaming of configure.in to configure.ac
5+
* Makefile.dist: Likewise
6+
* version.h: Likewise
7+
* doc/README: Likewise
8+
19
2015-05-13 Michael Haubenwallner <[email protected]>
210

311
* Makefile.in: Regenerated with automake-1.11.6.

boehm-gc/Makefile.direct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
331331
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
332332
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
333333

334-
GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
334+
GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
335335
libtool.m4 install-sh configure.host Makefile.in \
336336
aclocal.m4 config.sub config.guess \
337337
include/Makefile.am include/Makefile.in \

boehm-gc/Makefile.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
326326
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
327327
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
328328

329-
GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
329+
GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
330330
libtool.m4 install-sh configure.host Makefile.in \
331331
aclocal.m4 config.sub config.guess \
332332
include/Makefile.am include/Makefile.in \

boehm-gc/doc/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
66
The file linux_threads.c is also
77
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
88

9-
The files Makefile.am, and configure.in are
9+
The files Makefile.am, and configure.ac are
1010
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
1111

1212
Several files supporting GNU-style builds are copyrighted by the Free

boehm-gc/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* The version here should match that in configure/configure.in */
1+
/* The version here should match that in configure/configure.ac */
22
/* Eventually this one may become unnecessary. For now we need */
33
/* it to keep the old-style build process working. */
44
#define GC_TMP_VERSION_MAJOR 6
@@ -14,7 +14,7 @@
1414
GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
1515
defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
1616
defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
17-
# error Inconsistent version info. Check README, version.h, and configure.in.
17+
# error Inconsistent version info. Check README, version.h, and configure.ac.
1818
# endif
1919
#else
2020
# define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR

config-ml.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# user select which libraries s/he really wants.
3232
#
3333
# Subdirectories wishing to use multilib should put the following lines
34-
# in the "post-target" section of configure.in.
34+
# in the "post-target" section of configure.ac.
3535
#
3636
# if [ "${srcdir}" = "." ] ; then
3737
# if [ "${with_target_subdir}" != "." ] ; then
@@ -182,8 +182,8 @@ if [ "${enable_multilib}" = yes ]; then
182182
# ${with_multisubdir} tells us we're in the right branch, but we could be
183183
# in a subdir of that.
184184
# ??? The previous version could void this test by separating the process into
185-
# two files: one that only the library's toplevel configure.in ran (to
186-
# configure the multilib subdirs), and another that all configure.in's ran to
185+
# two files: one that only the library's toplevel configure.ac ran (to
186+
# configure the multilib subdirs), and another that all configure.ac's ran to
187187
# update the Makefile. It seemed reasonable to collapse all multilib support
188188
# into one file, but it does leave us with having to perform this test.
189189
ml_toplevel_p=no

config/ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2015-07-24 Micahel Darling <[email protected]>
2+
3+
PR other/66259
4+
* gettext.m4: Reflects renaming of configure.in to configure.ac
5+
* po.m4: Likewise
6+
* stdint.m4: Likewise
7+
* tcl.m4: Likewise
8+
19
2015-07-14 H.J. Lu <[email protected]>
210

311
* zlib.m4: Sync with binutils-gdb.

config/gettext.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
8181
dnl Ideally we would do this search only after the
8282
dnl if test "$USE_NLS" = "yes"; then
8383
dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
84-
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
84+
dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
8585
dnl the configure script would need to contain the same shell code
8686
dnl again, outside any 'if'. There are two solutions:
8787
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
@@ -303,7 +303,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
303303
AC_SUBST(USE_INCLUDED_LIBINTL)
304304
AC_SUBST(CATOBJEXT)
305305
306-
dnl For backward compatibility. Some configure.ins may be using this.
306+
dnl For backward compatibility. Some configure.acs may be using this.
307307
nls_cv_header_intl=
308308
nls_cv_header_libgt=
309309

config/po.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ AC_DEFUN([AM_PO_SUBDIRS],
117117
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
118118
# The LINGUAS file contains the set of available languages.
119119
if test -n "$OBSOLETE_ALL_LINGUAS"; then
120-
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
120+
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obsolete"
121121
fi
122122
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
123123
# Hide the ALL_LINGUAS assigment from automake.
124124
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
125125
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
126126
else
127-
# The set of available languages was given in configure.in.
127+
# The set of available languages was given in configure.ac.
128128
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
129129
fi
130130
case "$ac_given_srcdir" in

0 commit comments

Comments
 (0)