From patchwork Mon Jul 27 14:51:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lu, Hongjiu" X-Patchwork-Id: 7867 Received: (qmail 84632 invoked by alias); 27 Jul 2015 14:51:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 84609 invoked by uid 89); 27 Jul 2015 14:51:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.1 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, RP_MATCHES_RCVD, URIBL_BLACK autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mga02.intel.com Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 27 Jul 2015 14:51:34 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 27 Jul 2015 07:51:33 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([172.25.70.52]) by orsmga001.jf.intel.com with ESMTP; 27 Jul 2015 07:51:33 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 1000) id 03CD3C4031; Mon, 27 Jul 2015 07:51:33 -0700 (PDT) Date: Mon, 27 Jul 2015 07:51:32 -0700 From: "H.J. Lu" To: binutils@sourceware.org, GDB Subject: [committed, PATCH 1/2] Sync config with GCC Message-ID: <20150727145132.GA4608@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sync with GCC 2015-07-24 Micahel Darling PR other/66259 * gettext.m4: Reflects renaming of configure.in to configure.ac * po.m4: Likewise * stdint.m4: Likewise * tcl.m4: Likewise --- config/ChangeLog | 11 +++++++++++ config/gettext.m4 | 4 ++-- config/po.m4 | 4 ++-- config/stdint.m4 | 2 +- config/tcl.m4 | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 71a6e2d..102fc47 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,14 @@ +2015-07-27 H.J. Lu + + Sync with GCC + 2015-07-24 Micahel Darling + + 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 Sync with GCC diff --git a/config/gettext.m4 b/config/gettext.m4 index 16070b4..45fa6b4 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 2edd5a7..6ceef42 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 61898a7..59f4359 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 " to obtain the stdint-types. dnl diff --git a/config/tcl.m4 b/config/tcl.m4 index 59a0c7e..4542a4b 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). # #--------------------------------------------------------------------