OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync config with GCC 

Sync with GCC
	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
This commit is contained in:
H.J. Lu 2015-07-27 07:43:26 -07:00
parent 79559014b2
commit edb71a9c38
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/ChangeLog
View File

@ -1,3 +1,14 @@
2015-07-27 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC
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> 2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC Sync with GCC

4
config/gettext.m4
View File

@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl Ideally we would do this search only after the dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then dnl if test "$USE_NLS" = "yes"; then
dnl if test "$gt_cv_func_gnugettext_libc" != "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 the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions: dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. 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(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT) 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_intl=
nls_cv_header_libgt= nls_cv_header_libgt=

4
config/po.m4
View File

@ -117,14 +117,14 @@ AC_DEFUN([AM_PO_SUBDIRS],
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages. # The LINGUAS file contains the set of available languages.
if test -n "$OBSOLETE_ALL_LINGUAS"; then 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 fi
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake. # Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_' eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else 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' eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi fi
case "$ac_given_srcdir" in case "$ac_given_srcdir" in

2
config/stdint.m4
View File

@ -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 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 header may include. So, for a library package named "mylib", just use
dnl GCC_HEADER_STDINT(mylib-int.h) 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 the other headers (mylib.h). The mylib-specific headers can simply
dnl use "#include <mylib-int.h>" to obtain the stdint-types. dnl use "#include <mylib-int.h>" to obtain the stdint-types.
dnl dnl

4
config/tcl.m4
View File

@ -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))' INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
fi 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 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 things needs to be done in the big loop above.
dnl REMOVE THIS BLOCK LATER! (mdejong) dnl REMOVE THIS BLOCK LATER! (mdejong)
@ -3235,7 +3235,7 @@ AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [
# created. Accumulates. # created. Accumulates.
# #
# Requires presence of SC_OUTPUT_COMMANDS_PRE at the end # Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
# of configure.in (right before AC_OUTPUT). # of configure.ac (right before AC_OUTPUT).
# #
#-------------------------------------------------------------------- #--------------------------------------------------------------------