summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJeff Law <law@gcc.gnu.org>2015-07-24 12:20:44 -0600
committerJeff Law <law@gcc.gnu.org>2015-07-24 12:20:44 -0600
commit6b1786aa65f71d94362d38ada4bf96b6841a59cb (patch)
tree96bb0ed7351cd7b40e9303e38db7d0fc7f3aa2cf /config
parent525a825bc6fedc3a5d0c5311098ad55e830e8ac6 (diff)
downloadgcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.gz
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
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog8
-rw-r--r--config/gettext.m44
-rw-r--r--config/po.m44
-rw-r--r--config/stdint.m42
-rw-r--r--config/tcl.m44
5 files changed, 15 insertions, 7 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 311378e2e77..68bafda0cb3 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-24 Micahel Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * gettext.m4: Reflects renaming of configure.in to configure.ac
+ * po.m4: Likewise
+ * stdint.m4: Likewise
+ * tcl.m4: Likewise
+
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4: Sync with binutils-gdb.
diff --git a/config/gettext.m4 b/config/gettext.m4
index 16070b40a99..45fa6b4ab76 100644
--- a/config/gettext.m4
+++ b/config/gettext.m4
@@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
@@ -303,7 +303,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT)
- dnl For backward compatibility. Some configure.ins may be using this.
+ dnl For backward compatibility. Some configure.acs may be using this.
nls_cv_header_intl=
nls_cv_header_libgt=
diff --git a/config/po.m4 b/config/po.m4
index 2edd5a7d3b4..6ceef420f10 100644
--- a/config/po.m4
+++ b/config/po.m4
@@ -117,14 +117,14 @@ AC_DEFUN([AM_PO_SUBDIRS],
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
- # The set of available languages was given in configure.in.
+ # The set of available languages was given in configure.ac.
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
case "$ac_given_srcdir" in
diff --git a/config/stdint.m4 b/config/stdint.m4
index 61898a75fae..59f43595440 100644
--- a/config/stdint.m4
+++ b/config/stdint.m4
@@ -39,7 +39,7 @@ dnl If your installed header files require the stdint-types you will want to
dnl create an installable file mylib-int.h that all your other installable
dnl header may include. So, for a library package named "mylib", just use
dnl GCC_HEADER_STDINT(mylib-int.h)
-dnl in configure.in and install that header file in Makefile.am along with
+dnl in configure.ac and install that header file in Makefile.am along with
dnl the other headers (mylib.h). The mylib-specific headers can simply
dnl use "#include <mylib-int.h>" to obtain the stdint-types.
dnl
diff --git a/config/tcl.m4 b/config/tcl.m4
index 59a0c7e0a59..4542a4b23d7 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -2136,7 +2136,7 @@ dnl # preprocessing tests use only CPPFLAGS.
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
fi
-dnl Not at all clear what this was doing in Tcl's configure.in
+dnl Not at all clear what this was doing in Tcl's configure.ac
dnl or why it was needed was needed. In any event, this sort of
dnl things needs to be done in the big loop above.
dnl REMOVE THIS BLOCK LATER! (mdejong)
@@ -3235,7 +3235,7 @@ AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [
# created. Accumulates.
#
# Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
-# of configure.in (right before AC_OUTPUT).
+# of configure.ac (right before AC_OUTPUT).
#
#--------------------------------------------------------------------