From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28694 invoked by alias); 25 May 2006 22:49:53 -0000 Received: (qmail 28212 invoked by uid 22791); 25 May 2006 22:49:45 -0000 X-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,TW_BJ,TW_CP,TW_JC,TW_RG,UPPERCASE_25_50 X-Spam-Check-By: sourceware.org Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Thu, 25 May 2006 22:49:37 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1FjOe5-0003Rp-0Y; Thu, 25 May 2006 18:49:33 -0400 Date: Thu, 25 May 2006 22:49:00 -0000 From: Daniel Jacobowitz To: binutils@sourceware.org, Steve Ellcey Cc: gdb-patches@sourceware.org, rda@sourceware.org Subject: Re: changes in 'intl' Message-ID: <20060525224932.GA12464@nevyn.them.org> Mail-Followup-To: binutils@sourceware.org, Steve Ellcey , gdb-patches@sourceware.org, rda@sourceware.org References: <4475B7AD.46E1073E@dessent.net> <20060525144537.GA1017@nevyn.them.org> <20060525174240.GA5632@nevyn.them.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060525174240.GA5632@nevyn.them.org> User-Agent: Mutt/1.5.11+cvs20060403 X-IsSubscribed: yes Mailing-List: contact rda-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Post: List-Help: , Sender: rda-owner@sourceware.org X-SW-Source: 2006-q2/txt/msg00000.txt.bz2 On Thu, May 25, 2006 at 01:42:40PM -0400, Daniel Jacobowitz wrote: > On Thu, May 25, 2006 at 10:45:37AM -0400, Daniel Jacobowitz wrote: > > On Thu, May 25, 2006 at 06:57:01AM -0700, Brian Dessent wrote: > > > I'm having difficulty building current CVS binutils for native cygwin > > > (i686-pc-cygwin). If I configure without options, nothing is built in > > > intl/ and I get the following error trying to link in binutils/ > > > > The very same code fragment, from config/gettext.m4, is used to > > determine whether to build intl/ and whether to link to it. This is > > very strange. I'm going to try to reproduce it myself. > > BFD uses src/gettext.m4. intl uses src/config/gettext.m4. They define > different macros, and detect different conditions. > > config/gettext.m4 is the new one and presumably better. We will have > to migrate. With a little luck, this will fix some known problems > building GDB with NLS... > > I will work on it. Whew. That took a long time. Basically, we were still using src/gettext.m4, but the new intl uses config/gettext.m4. This led to some skew in the conditions under which intl/ was built versus used: intl/ decided it was unnecessary, binutils/ decided it was necessary. These patches resynchronize it. I'll have to post the GCC side for approval on gcc-patches, there were some updates there too. This touches gdb, binutils, and RDA; the RDA bits are quite obvious though. I won't commit this right away; I need a break. Any comments on it are welcome. The binutils po/Make-in fragments are do for an update, but they've diverged from the gettext copy quite a lot now, especially in bfd (SRC-POTFILES.in). -- Daniel Jacobowitz CodeSourcery ./ 2006-05-25 Daniel Jacobowitz * Makefile.def: Added dependencies from sim and gdb on intl, and added configure dependencies to everything with an all dependency on intl. * gettext.m4: Removed. * src-release (DEVO_SUPPORT): Don't mention gettext.m4. * Makefile.in: Regenerated. bfd/ 2006-05-25 Daniel Jacobowitz * Makefile.am (INCLUDES): Use @INCINTL@. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Manually substitute POFILES and GMOFILES. * Makefile.in, aclocal.m4, configure, doc/Makefile.in: Regenerated. binutils/ 2006-05-25 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS with LIBINTL everywhere. Add DEPENDENCIES variables for every program. (INTLLIBS): Remove. (INCLUDES): Use @INCINTL@. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Remove local code for po/Makefile. * Makefile.in, configure, doc/Makefile.in: Regenerated. config/ 2006-05-25 Daniel Jacobowitz * gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some defines otherwise gotten from AM_GNU_GETTEXT. Remove the po/ prefix from CATALOGS. gas/ 2006-05-25 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. (INTLLIBS): Remove. (INCLUDES, DEP_INCLUDES): Use @INCINTL@. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Remove local code for po/Makefile. * Makefile.in, configure, doc/Makefile.in: Regenerated. gdb/ 2006-05-25 Daniel Jacobowitz * Makefile.in (top_builddir): Update comments. (INTL_DIR, INTL_SRC): Delete. (INTL, INTL_DEPS, INTL_CFLAGS): Update. * acinclude.m4: Include new gettext macros. * configure.ac: Use ZW_GNU_GETTEXT_SISTER_DIR. Remove copied CATALOGS code. * aclocal.m4, configure: Regenerated. gprof/ 2006-05-25 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. (INCLUDES): Use @INCINTL@. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Remove local code for po/Makefile. * Makefile.in, aclocal.m4, configure: Regenerated. ld/ 2006-05-25 Daniel Jacobowitz * Makefile.am: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. (INTLLIBS): Remove. (INCLUDES): Use @INCINTL@. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Remove local code for po/Makefile. * Makefile.in, configure: Regenerated. opcodes/ 2006-05-25 Daniel Jacobowitz * Makefile.am (INCLUDES): Use @INCINTL@. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS. Remove local code for po/Makefile. * Makefile.in, aclocal.m4, configure: Regenerated. rda/ 2006-05-25 Daniel Jacobowitz * samples/Makefile.am: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. * acinclude.m4: Include new gettext macros. * configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR. * Makefile.in, aclocal.m4, configure, lib/Makefile.in, qe/Makefile.in, samples/Makefile.in: Regenerated. sim/arm/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/common/ 2006-05-25 Daniel Jacobowitz * Make-common.in: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. (CSEARCH): Use INCINTL. * aclocal.m4: Use ZW_GNU_GETTEXT_SISTER_DIR. Include new gettext macros. * configure: Regenerated. sim/cris/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/d10v/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/erc32/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/frv/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/h8300/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/iq2000/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/m32c/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/m32r/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/m68hc11/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/mcore/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/mips/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/mn10300/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/ppc/ 2006-05-25 Daniel Jacobowitz * Makefile.in: Replace INTLLIBS and INTLDEPS with LIBINTL and LIBINTL_DEP everywhere. (INTL_DIR, INTL_SRC): Remove. (INTL_CFLAGS): Use INCINTL. * configure.ac: Use ZW_GNU_GETTEXT_SISTER_DIR. * configure: Regenerated. sim/sh/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/sh64/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. sim/v850/ 2006-05-25 Daniel Jacobowitz * configure: Regenerated. Index: Makefile.def =================================================================== RCS file: /cvs/src/src/Makefile.def,v retrieving revision 1.66 diff -u -p -r1.66 Makefile.def --- Makefile.def 6 Apr 2006 21:49:24 -0000 1.66 +++ Makefile.def 25 May 2006 22:20:01 -0000 @@ -295,7 +295,9 @@ dependencies = { module=all-fixincludes; dependencies = { module=all-gnattools; on=all-target-libada; }; // Host modules specific to gdb. +dependencies = { module=configure-gdb; on=configure-intl; }; dependencies = { module=configure-gdb; on=configure-sim; }; +dependencies = { module=all-gdb; on=all-intl; }; dependencies = { module=all-gdb; on=all-libiberty; }; dependencies = { module=all-gdb; on=all-opcodes; }; dependencies = { module=all-gdb; on=all-bfd; }; @@ -312,9 +314,11 @@ dependencies = { module=all-libgui; on=a // Host modules specific to binutils. dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; }; +dependencies = { module=configure-bfd; on=configure-intl; }; dependencies = { module=all-bfd; on=all-libiberty; }; dependencies = { module=all-bfd; on=all-intl; }; +dependencies = { module=configure-binutils; on=configure-intl; }; dependencies = { module=all-binutils; on=all-libiberty; }; dependencies = { module=all-binutils; on=all-opcodes; }; dependencies = { module=all-binutils; on=all-bfd; }; @@ -331,14 +335,17 @@ dependencies = { module=install-binutils // libopcodes depends on libbfd dependencies = { module=install-opcodes; on=install-bfd; }; +dependencies = { module=configure-gas; on=configure-intl; }; dependencies = { module=all-gas; on=all-libiberty; }; dependencies = { module=all-gas; on=all-opcodes; }; dependencies = { module=all-gas; on=all-bfd; }; dependencies = { module=all-gas; on=all-intl; }; +dependencies = { module=configure-gprof; on=configure-intl; }; dependencies = { module=all-gprof; on=all-libiberty; }; dependencies = { module=all-gprof; on=all-bfd; }; dependencies = { module=all-gprof; on=all-opcodes; }; dependencies = { module=all-gprof; on=all-intl; }; +dependencies = { module=configure-ld; on=configure-intl; }; dependencies = { module=all-ld; on=all-libiberty; }; dependencies = { module=all-ld; on=all-bfd; }; dependencies = { module=all-ld; on=all-opcodes; }; @@ -378,6 +385,8 @@ dependencies = { module=all-sid; on=all- dependencies = { module=install-sid; on=install-tcl; }; dependencies = { module=install-sid; on=install-tk; }; +dependencies = { module=configure-sim; on=configure-intl; }; +dependencies = { module=all-sim; on=all-intl; }; dependencies = { module=all-sim; on=all-libiberty; }; dependencies = { module=all-sim; on=all-bfd; }; dependencies = { module=all-sim; on=all-opcodes; }; Index: gettext.m4 =================================================================== RCS file: gettext.m4 diff -N gettext.m4 --- gettext.m4 31 Jan 2005 20:29:41 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,346 +0,0 @@ -# This file is derived from `gettext.m4'. The difference is that the -# included macros assume Cygnus-style source and build trees. - -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 3 - -AC_DEFUN([CY_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - USE_INCLUDED_LIBINTL=no - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT= - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include ], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_TRY_LINK([], [return (int) gettext ("")], - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)])]) - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define as 1 if you have gettext and don't want to use GNU gettext.]) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) - - dnl In the standard gettext, we would now check for catgets. - dnl However, we never want to use catgets for our releases. - - if test x"$CATOBJEXT" = x && test -d $srcdir/../intl; then - # Neither gettext nor catgets in included in the C library. - # Fall back on GNU gettext library (assuming it is present). - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/../intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=libintl.h - nls_cv_header_libgt=libgettext.h - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=libintl.h - nls_cv_header_libgt=libgettext.h - fi - - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes - fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - if test "x$CATOBJEXT" != "x"; then - AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) - fi - ]) - -AC_DEFUN([CY_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h values.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function]) - fi - - AM_LC_MESSAGES - CY_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl The reference to in the installed file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - if test -f $srcdir/po2tbl.sed.in; then - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/po2tbl.sed.in > po2tbl.sed - fi - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - - MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" - AC_SUBST(MKINSTALLDIRS) - - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. But only do this if the po directory - dnl exists in srcdir and contains POTFILES.in. - if test -f $srcdir/po/POTFILES.in; then - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - fi - ]) - -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test -n "[$]$1"; then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your locale.h file contains LC_MESSAGES.]) - fi - fi]) Index: src-release =================================================================== RCS file: /cvs/src/src/src-release,v retrieving revision 1.20 diff -u -p -r1.20 src-release --- src-release 25 May 2006 17:21:33 -0000 1.20 +++ src-release 25 May 2006 22:20:04 -0000 @@ -50,7 +50,7 @@ DEVO_SUPPORT= README Makefile.in configu config.guess config.sub config move-if-change \ COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ mkinstalldirs ltconfig ltmain.sh missing ylwrap \ - libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \ + libtool.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \ Makefile.def Makefile.tpl src-release config.rpath # Files in devo/etc used in any net release. Index: bfd/Makefile.am =================================================================== RCS file: /cvs/src/src/bfd/Makefile.am,v retrieving revision 1.176 diff -u -p -r1.176 Makefile.am --- bfd/Makefile.am 19 Apr 2006 12:09:42 -0000 1.176 +++ bfd/Makefile.am 25 May 2006 22:20:04 -0000 @@ -616,7 +616,7 @@ BFD_LIBS = @bfd_libs@ BFD_MACHINES = @bfd_machines@ TDEFAULTS = @tdefaults@ -INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl +INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) @INCINTL@ # C source files that correspond to .o's. SOURCE_CFILES = \ Index: bfd/acinclude.m4 =================================================================== RCS file: /cvs/src/src/bfd/acinclude.m4,v retrieving revision 1.15 diff -u -p -r1.15 acinclude.m4 --- bfd/acinclude.m4 10 May 2005 01:27:51 -0000 1.15 +++ bfd/acinclude.m4 25 May 2006 22:20:04 -0000 @@ -1,4 +1,8 @@ sinclude(../config/acx.m4) +sinclude(../config/gettext-sister.m4) +sinclude(../config/nls.m4) +sinclude(../config/po.m4) +sinclude(../config/progtest.m4) sinclude(../bfd/bfd.m4) sinclude(../bfd/warning.m4) @@ -55,12 +59,6 @@ AC_DEFUN([AM_DISABLE_SHARED],) AC_SUBST(LIBTOOL) ]) -sinclude(../gettext.m4) -ifelse(yes,no,[ -AC_DEFUN([CY_WITH_NLS],) -AC_SUBST(INTLLIBS) -]) - AC_DEFUN([AM_INSTALL_LIBBFD], [AC_MSG_CHECKING([whether to install libbfd]) AC_ARG_ENABLE(install-libbfd, Index: bfd/configure.in =================================================================== RCS file: /cvs/src/src/bfd/configure.in,v retrieving revision 1.206 diff -u -p -r1.206 configure.in --- bfd/configure.in 16 Apr 2006 18:01:02 -0000 1.206 +++ bfd/configure.in 25 May 2006 22:20:05 -0000 @@ -85,7 +85,8 @@ AC_PROG_CC AC_GNU_SOURCE ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw vi" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS # Permit host specific settings. . ${srcdir}/configure.host @@ -962,7 +963,28 @@ esac rm -f doc/config.status AC_CONFIG_FILES([Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in]) -AC_CONFIG_COMMANDS([default],[[sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' -e '/BLD-POTFILES =/r po/BLD-POTFILES' po/Makefile.in > po/Makefile]],[[]]) + +dnl We need this duplication, even though we use AM_PO_SUBDIRS, because of +dnl our two separate POTFILES. Yuck. +AC_CONFIG_COMMANDS([default], +[[ +case "$srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; +esac +POFILES= +GMOFILES= +for lang in dummy $OBSOLETE_ALL_LINGUAS; do + if test $lang != dummy; then + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + fi +done +sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' \ + -e '/BLD-POTFILES =/r po/BLD-POTFILES' \ + -e "s,@POFILES@,$POFILES," \ + -e "s,@GMOFILES@,$GMOFILES," \ + po/Makefile.in > po/Makefile]],[[]]) dnl Required by html and install-html AC_SUBST(datarootdir) Index: binutils/Makefile.am =================================================================== RCS file: /cvs/src/src/binutils/Makefile.am,v retrieving revision 1.73 diff -u -p -r1.73 Makefile.am --- binutils/Makefile.am 19 Apr 2006 12:10:00 -0000 1.73 +++ binutils/Makefile.am 25 May 2006 22:20:06 -0000 @@ -1,8 +1,5 @@ ## Process this file with automake to generate Makefile.in -## FIXME: Work around apparent bug in automake. -INTLLIBS = @INTLLIBS@ - AUTOMAKE_OPTIONS = cygnus dejagnu SUBDIRS = doc po @@ -75,7 +72,7 @@ MKDEP = gcc -MM INCLUDES = -D_GNU_SOURCE \ -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ - -I$(srcdir)/../intl -I../intl \ + @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -Dbin_dummy_emulation=$(EMULATION_VECTOR) @@ -182,7 +179,29 @@ check-DEJAGNU: site.exp installcheck: /bin/sh $(srcdir)/sanity.sh $(bindir) -LDADD = $(BFDLIB) $(LIBIBERTY) $(INTLLIBS) +# There's no global DEPENDENCIES. So, we must explicitly list everything +# which depends on libintl, since we don't know whether LIBINTL_DEP will be +# non-empty until configure time. Ugh! +size_DEPENDENCIES = $(LIBINTL_DEP) +objdump_DEPENDENCIES = $(LIBINTL_DEP) +nm_DEPENDENCIES = $(LIBINTL_DEP) +ar_DEPENDENCIES = $(LIBINTL_DEP) +strings_DEPENDENCIES = $(LIBINTL_DEP) +strip_DEPENDENCIES = $(LIBINTL_DEP) +ranlib_DEPENDENCIES = $(LIBINTL_DEP) +cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) +objcopy_DEPENDENCIES = $(LIBINTL_DEP) +nlmconv_DEPENDENCIES = $(LIBINTL_DEP) +srconv_DEPENDENCIES = $(LIBINTL_DEP) +sysdump_DEPENDENCIES = $(LIBINTL_DEP) +coffdump_DEPENDENCIES = $(LIBINTL_DEP) +dlltool_DEPENDENCIES = $(LIBINTL_DEP) +windres_DEPENDENCIES = $(LIBINTL_DEP) +addr2line_DEPENDENCIES = $(LIBINTL_DEP) +readelf_DEPENDENCIES = $(LIBINTL_DEP) +dllwrap_DEPENDENCIES = $(LIBINTL_DEP) + +LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) size_SOURCES = size.c $(BULIBS) @@ -191,14 +210,14 @@ objcopy_SOURCES = objcopy.c not-strip.c strings_SOURCES = strings.c $(BULIBS) readelf_SOURCES = readelf.c version.c unwind-ia64.c dwarf.c -readelf_LDADD = $(INTLLIBS) $(LIBIBERTY) +readelf_LDADD = $(LIBINTL) $(LIBIBERTY) strip_new_SOURCES = objcopy.c is-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS) nm_new_SOURCES = nm.c budemang.c $(BULIBS) objdump_SOURCES = objdump.c dwarf.c budemang.c prdbg.c $(DEBUG_SRCS) $(BULIBS) -objdump_LDADD = $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS) +objdump_LDADD = $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) objdump.o:objdump.c $(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c @@ -207,11 +226,11 @@ cxxfilt_SOURCES = cxxfilt.c $(BULIBS) ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \ emul_$(EMULATION).c $(BULIBS) -ar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(INTLLIBS) +ar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) ranlib_SOURCES = ar.c is-ranlib.c arparse.y arlex.l arsup.c rename.c \ binemul.c emul_$(EMULATION).c $(BULIBS) -ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(INTLLIBS) +ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) addr2line_SOURCES = addr2line.c budemang.c $(BULIBS) @@ -287,7 +306,7 @@ rclex.o: srconv_SOURCES = srconv.c coffgrok.c $(BULIBS) dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS) -dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(INTLLIBS) +dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) dlltool.o: $(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/dlltool.c @@ -309,10 +328,10 @@ nlmconv_SOURCES = nlmconv.c nlmheader.y windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l \ winduni.c resres.c $(BULIBS) -windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(INTLLIBS) +windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) dllwrap_SOURCES = dllwrap.c version.c -dllwrap_LDADD = $(LIBIBERTY) $(INTLLIBS) +dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ Index: binutils/configure.in =================================================================== RCS file: /cvs/src/src/binutils/configure.in,v retrieving revision 1.61 diff -u -p -r1.61 configure.in --- binutils/configure.in 6 Apr 2006 21:49:29 -0000 1.61 +++ binutils/configure.in 25 May 2006 22:20:07 -0000 @@ -47,7 +47,8 @@ AC_PROG_YACC AM_PROG_LEX ALL_LINGUAS="fr tr ja es sv da zh_CN ru ro rw zh_TW fi vi" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS AM_MAINTAINER_MODE AC_EXEEXT @@ -351,9 +352,4 @@ AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) -AC_OUTPUT(Makefile doc/Makefile po/Makefile.in:po/Make-in, -[ -case "x$CONFIG_FILES" in -*) sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile ;; -esac -]) +AC_OUTPUT(Makefile doc/Makefile po/Makefile.in:po/Make-in) Index: config/gettext-sister.m4 =================================================================== RCS file: /cvs/src/src/config/gettext-sister.m4,v retrieving revision 1.1 diff -u -p -r1.1 gettext-sister.m4 --- config/gettext-sister.m4 23 Sep 2004 19:43:47 -0000 1.1 +++ config/gettext-sister.m4 25 May 2006 22:20:07 -0000 @@ -46,8 +46,8 @@ else # by the backticks, then collapsed again by the double quotes, # leaving us with one backslash in the sed expression (right # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"` + cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` + lang=`echo $cat | sed -e "s!\\\\.gmo!!"` # The user is allowed to set LINGUAS to a list of languages to # install catalogs for. If it's empty that means "all of them." if test "x$LINGUAS" = x; then @@ -63,4 +63,17 @@ else done LINGUAS="$XLINGUAS" AC_MSG_RESULT($LINGUAS) + + dnl Set up some additional variables which our po/Make-in files + dnl may need. + + dnl For backward compatibility. Some Makefiles may be using these. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + GENCAT=gencat + AC_SUBST(GENCAT) + CATOBJEXT=.gmo + AC_SUBST(CATOBJEXT) fi]) Index: gas/Makefile.am =================================================================== RCS file: /cvs/src/src/gas/Makefile.am,v retrieving revision 1.132 diff -u -p -r1.132 Makefile.am --- gas/Makefile.am 19 Apr 2006 12:10:46 -0000 1.132 +++ gas/Makefile.am 25 May 2006 22:20:07 -0000 @@ -1,8 +1,5 @@ ## Process this file with automake to generate Makefile.in -## Work around apparent automake bug. -INTLLIBS = @INTLLIBS@ - AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu SUBDIRS = doc po @@ -470,13 +467,13 @@ INCDIR = $(BASEDIR)/include # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(datadir)/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) @INCINTL@ -DLOCALEDIR="\"$(datadir)/locale\"" # This should be parallel to INCLUDES, but should replace $(srcdir) # with $${srcdir}, and should work in a subdirectory. This is used # when building dependencies, because the dependency building is done # in a subdirectory. -DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(datadir)/locale\"" +DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd @INCINTL@ -DLOCALEDIR="\"$(datadir)/locale\"" DEP_FLAGS = -DOBJ_MAYBE_ELF \ -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) @@ -495,9 +492,9 @@ $(OBJS): @ALL_OBJ_DEPS@ as_new_SOURCES = $(GAS_CFILES) as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ - $(extra_objects) $(GASLIBS) $(INTLLIBS) $(LIBM) + $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ - $(extra_objects) $(GASLIBS) $(INTLDEPS) + $(extra_objects) $(GASLIBS) $(LIBINTL_DEP) # Stuff that every object file depends upon. If anything is removed # from this list, remove it from dep-in.sed as well. Index: gas/acinclude.m4 =================================================================== RCS file: /cvs/src/src/gas/acinclude.m4,v retrieving revision 1.4 diff -u -p -r1.4 acinclude.m4 --- gas/acinclude.m4 14 Apr 2005 05:26:31 -0000 1.4 +++ gas/acinclude.m4 25 May 2006 22:20:07 -0000 @@ -1,4 +1,8 @@ sinclude(../bfd/warning.m4) +sinclude(../config/gettext-sister.m4) +sinclude(../config/nls.m4) +sinclude(../config/po.m4) +sinclude(../config/progtest.m4) dnl GAS_CHECK_DECL_NEEDED(name, typedefname, typedef, headers) AC_DEFUN([GAS_CHECK_DECL_NEEDED],[ @@ -66,9 +70,3 @@ AC_DEFUN([AM_PROG_LIBTOOL],) AC_DEFUN([AC_CHECK_LIBM],) AC_SUBST(LIBTOOL) ]) - -sinclude(../gettext.m4) -ifelse(yes,no,[ -AC_DEFUN([CY_WITH_NLS],) -AC_SUBST(INTLLIBS) -]) Index: gas/configure.in =================================================================== RCS file: /cvs/src/src/gas/configure.in,v retrieving revision 1.189 diff -u -p -r1.189 configure.in --- gas/configure.in 19 Apr 2006 02:06:14 -0000 1.189 +++ gas/configure.in 25 May 2006 22:20:08 -0000 @@ -578,7 +578,8 @@ AC_PROG_YACC AM_PROG_LEX ALL_LINGUAS="fr tr es rw" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS AM_MAINTAINER_MODE AC_EXEEXT @@ -691,9 +692,7 @@ AC_CONFIG_COMMANDS([default], echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h if test "x$cgen_cpu_prefix" != x ; then echo '#include "opcodes/'"${cgen_cpu_prefix}"'-desc.h"' > cgen-desc.h - fi - - sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile], + fi], [target_cpu_type=${target_cpu_type} cgen_cpu_prefix=${cgen_cpu_prefix} obj_format=${obj_format} Index: gdb/Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.819 diff -u -p -r1.819 Makefile.in --- gdb/Makefile.in 19 May 2006 20:42:47 -0000 1.819 +++ gdb/Makefile.in 25 May 2006 22:20:09 -0000 @@ -45,7 +45,8 @@ infodir = @infodir@ htmldir = $(prefix)/html includedir = @includedir@ -# This can be referenced by `INTLDEPS' as computed by CY_GNU_GETTEXT. +# This can be referenced by `LIBINTL' as computed by +# ZW_GNU_GETTEXT_SISTER_DIR. top_builddir = . SHELL = @SHELL@ @@ -135,11 +136,9 @@ GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"` # Where is the INTL library? Typically in ../intl. -INTL_DIR = ../intl -INTL = @INTLLIBS@ -INTL_DEPS = @INTLDEPS@ -INTL_SRC = $(srcdir)/$(INTL_DIR) -INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) +INTL = @LIBINTL@ +INTL_DEPS = @LIBINTL_DEP@ +INTL_CFLAGS = @INCINTL@ # Where is the ICONV library? This can be empty if libc has iconv. LIBICONV = @LIBICONV@ Index: gdb/acinclude.m4 =================================================================== RCS file: /cvs/src/src/gdb/acinclude.m4,v retrieving revision 1.14 diff -u -p -r1.14 acinclude.m4 --- gdb/acinclude.m4 15 May 2006 17:11:58 -0000 1.14 +++ gdb/acinclude.m4 25 May 2006 22:20:09 -0000 @@ -10,12 +10,7 @@ sinclude(../config/acinclude.m4) dnl This gets GCC_HEADER_STDINT. sinclude(../config/stdint.m4) -sinclude(../gettext.m4) -dnl The lines below arrange for aclocal not to bring gettext.m4's -dnl CY_GNU_GETTEXT into aclocal.m4. -ifelse(yes,no,[ -AC_DEFUN([CY_GNU_GETTEXT],) -]) +sinclude(../config/gettext-sister.m4) dnl CYGNUS LOCAL: This gets the right posix flag for gcc AC_DEFUN([CY_AC_TCL_LYNX_POSIX], Index: gdb/configure.ac =================================================================== RCS file: /cvs/src/src/gdb/configure.ac,v retrieving revision 1.32 diff -u -p -r1.32 configure.ac --- gdb/configure.ac 15 May 2006 17:11:59 -0000 1.32 +++ gdb/configure.ac 25 May 2006 22:20:11 -0000 @@ -48,49 +48,13 @@ CONFIG_CLEAN= CONFIG_INSTALL= CONFIG_UNINSTALL= -dnl Set up for gettext. PACKAGE is used when we call bindtextdomain. - -CY_GNU_GETTEXT +dnl Set up for gettext. +ZW_GNU_GETTEXT_SISTER_DIR localedir='${datadir}/locale' AC_SUBST(localedir) -if test "x$POSUB" != x; then - - dnl Lifted from GCC's config/gettext.m4. - AC_MSG_CHECKING(for catalogs to be installed) - # Look for .po and .gmo files in the source directory. - CATALOGS= AC_SUBST(CATALOGS) - XLINGUAS= - for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do - # If there aren't any .gmo files the shell will give us the - # literal string "../path/to/srcdir/po/*.gmo" which has to be - # weeded out. - case "$cat" in *\**) - continue;; - esac - # The quadruple backslash is collapsed to a double backslash - # by the backticks, then collapsed again by the double quotes, - # leaving us with one backslash in the sed expression (right - # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"` - # The user is allowed to set LINGUAS to a list of languages to - # install catalogs for. If it's empty that means "all of them." - if test "x$LINGUAS" = x; then - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS="$XLINGUAS" - AC_MSG_RESULT($LINGUAS) - +if test x"$USE_NLS" = xyes; then CONFIG_ALL="$CONFIG_ALL all-po" CONFIG_CLEAN="$CONFIG_CLEAN clean-po" CONFIG_INSTALL="$CONFIG_INSTALL install-po" Index: gprof/Makefile.am =================================================================== RCS file: /cvs/src/src/gprof/Makefile.am,v retrieving revision 1.27 diff -u -p -r1.27 Makefile.am --- gprof/Makefile.am 25 Apr 2006 16:20:47 -0000 1.27 +++ gprof/Makefile.am 25 May 2006 22:20:11 -0000 @@ -16,7 +16,7 @@ AM_CFLAGS = $(WARN_CFLAGS) MKDEP = gcc -MM -INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(datadir)/locale\"" +INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd @INCINTL@ -I. -DLOCALEDIR="\"$(datadir)/locale\"" bin_PROGRAMS = gprof @@ -26,8 +26,8 @@ sources = basic_blocks.c call_graph.c cg search_list.c symtab.c sym_ids.c utils.c \ i386.c alpha.c vax.c tahoe.c sparc.c mips.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c -gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS) -gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLLIBS) +gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP) +gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL) noinst_HEADERS = \ basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \ Index: gprof/acinclude.m4 =================================================================== RCS file: /cvs/src/src/gprof/acinclude.m4,v retrieving revision 1.2 diff -u -p -r1.2 acinclude.m4 --- gprof/acinclude.m4 14 Apr 2005 05:26:37 -0000 1.2 +++ gprof/acinclude.m4 25 May 2006 22:20:11 -0000 @@ -1,4 +1,9 @@ sinclude(../bfd/warning.m4) +sinclude(../config/gettext-sister.m4) +sinclude(../config/nls.m4) +sinclude(../config/po.m4) +sinclude(../config/progtest.m4) + sinclude(../libtool.m4) dnl The lines below arrange for aclocal not to bring libtool.m4 dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake @@ -7,9 +12,3 @@ ifelse(yes,no,[ AC_DEFUN([AM_PROG_LIBTOOL],) AC_SUBST(LIBTOOL) ]) - -sinclude(../gettext.m4) -ifelse(yes,no,[ -AC_DEFUN([CY_WITH_NLS],) -AC_SUBST(INTLLIBS) -]) Index: gprof/configure.in =================================================================== RCS file: /cvs/src/src/gprof/configure.in,v retrieving revision 1.28 diff -u -p -r1.28 configure.in --- gprof/configure.in 6 Apr 2006 21:49:33 -0000 1.28 +++ gprof/configure.in 25 May 2006 22:20:12 -0000 @@ -25,7 +25,8 @@ AC_PROG_INSTALL AC_CHECK_FUNCS(setmode) ALL_LINGUAS="fr tr sv es id da pt_BR de vi rw ga" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS AM_MAINTAINER_MODE AC_EXEEXT @@ -50,5 +51,4 @@ AC_SUBST(docdir) AC_SUBST(htmldir) AC_CONFIG_FILES([Makefile po/Makefile.in:po/Make-in]) -AC_CONFIG_COMMANDS([default],[[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile]],[[]]) AC_OUTPUT Index: ld/Makefile.am =================================================================== RCS file: /cvs/src/src/ld/Makefile.am,v retrieving revision 1.210 diff -u -p -r1.210 Makefile.am --- ld/Makefile.am 2 May 2006 14:20:46 -0000 1.210 +++ ld/Makefile.am 25 May 2006 22:20:12 -0000 @@ -1,8 +1,5 @@ ## Process this file with automake to generate Makefile.in -## FIXME: work around apparent automake bug. -INTLLIBS = @INTLLIBS@ - AUTOMAKE_OPTIONS = cygnus dejagnu SUBDIRS = po @@ -100,7 +97,7 @@ man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @INCINTL@ $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a @@ -1613,8 +1610,8 @@ EXTRA_ld_new_SOURCES = deffilep.y ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c -ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLDEPS) -ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS) +ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL_DEP) +ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) # The generated emulation files mostly have the same dependencies. $(EMULATION_OFILES): ../bfd/bfd.h sysdep.h config.h $(INCDIR)/bfdlink.h \ @@ -1636,7 +1633,7 @@ check-DEJAGNU: site.exp CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" LIBS="$(LIBS)" \ + LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \ $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi Index: ld/configure.in =================================================================== RCS file: /cvs/src/src/ld/configure.in,v retrieving revision 1.36 diff -u -p -r1.36 configure.in --- ld/configure.in 11 Apr 2006 10:36:26 -0000 1.36 +++ ld/configure.in 25 May 2006 22:20:13 -0000 @@ -83,7 +83,8 @@ AC_PROG_CC AC_PROG_INSTALL ALL_LINGUAS="fr sv tr es da vi zh_CN" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS AC_EXEEXT @@ -258,5 +259,4 @@ AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) -AC_OUTPUT(Makefile po/Makefile.in:po/Make-in, -[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile]) +AC_OUTPUT(Makefile po/Makefile.in:po/Make-in) Index: opcodes/Makefile.am =================================================================== RCS file: /cvs/src/src/opcodes/Makefile.am,v retrieving revision 1.99 diff -u -p -r1.99 Makefile.am --- opcodes/Makefile.am 19 Apr 2006 12:10:21 -0000 1.99 +++ opcodes/Makefile.am 25 May 2006 22:20:14 -0000 @@ -328,7 +328,7 @@ OFILES = @BFD_MACHINES@ # that's where the version number in Makefile comes from. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $(srcdir)/disassemble.c Index: opcodes/acinclude.m4 =================================================================== RCS file: /cvs/src/src/opcodes/acinclude.m4,v retrieving revision 1.3 diff -u -p -r1.3 acinclude.m4 --- opcodes/acinclude.m4 17 May 2002 10:34:28 -0000 1.3 +++ opcodes/acinclude.m4 25 May 2006 22:20:14 -0000 @@ -10,12 +10,6 @@ AC_DEFUN([AM_DISABLE_SHARED],) AC_SUBST(LIBTOOL) ]) -dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4 -ifelse(yes,no,[ -AC_DEFUN([CY_WITH_NLS],) -AC_SUBST(INTLLIBS) -]) - dnl AM_INSTALL_LIBBFD already included in bfd/acinclude.m4 ifelse(yes,no,[ AC_DEFUN([AM_INSTALL_LIBBFD],) Index: opcodes/configure.in =================================================================== RCS file: /cvs/src/src/opcodes/configure.in,v retrieving revision 1.69 diff -u -p -r1.69 configure.in --- opcodes/configure.in 17 Feb 2006 14:36:28 -0000 1.69 +++ opcodes/configure.in 25 May 2006 22:20:15 -0000 @@ -61,7 +61,8 @@ AC_EXEEXT AC_PROG_CC ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN" -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR +AM_PO_SUBDIRS . ${srcdir}/../bfd/configure.host @@ -273,5 +274,4 @@ AC_SUBST(archdefs) AC_SUBST(BFD_MACHINES) AC_CONFIG_FILES([Makefile po/Makefile.in:po/Make-in]) -AC_CONFIG_COMMANDS([default],[[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile]],[[]]) AC_OUTPUT Index: rda/acinclude.m4 =================================================================== RCS file: /cvs/src/src/rda/acinclude.m4,v retrieving revision 1.1 diff -u -p -r1.1 acinclude.m4 --- rda/acinclude.m4 28 Aug 2002 01:22:27 -0000 1.1 +++ rda/acinclude.m4 25 May 2006 22:20:15 -0000 @@ -7,10 +7,4 @@ AC_DEFUN([AM_PROG_LIBTOOL],) AC_SUBST(LIBTOOL) ]) -sinclude(../gettext.m4) -dnl The lines below arrange for aclocal not to bring gettext.m4's -dnl CY_WITH_NLS into aclocal.m4. -ifelse(yes,no,[ -AC_DEFUN([CY_WITH_NLS],) -AC_SUBST(INTLLIBS) -]) +sinclude(../../gettext-sister.m4) Index: rda/configure.in =================================================================== RCS file: /cvs/src/src/rda/configure.in,v retrieving revision 1.2 diff -u -p -r1.2 configure.in --- rda/configure.in 10 Dec 2004 19:22:24 -0000 1.2 +++ rda/configure.in 25 May 2006 22:20:17 -0000 @@ -97,7 +97,7 @@ esac dnl $targ_subdirs is expanded at configure run time AC_SUBST(targ_subdirs) -CY_WITH_NLS +ZW_GNU_GETTEXT_SISTER_DIR dnl Outputs AC_OUTPUT(Makefile lib/Makefile samples/Makefile qe/Makefile) Index: rda/samples/Makefile.am =================================================================== RCS file: /cvs/src/src/rda/samples/Makefile.am,v retrieving revision 1.1 diff -u -p -r1.1 Makefile.am --- rda/samples/Makefile.am 28 Aug 2002 01:22:28 -0000 1.1 +++ rda/samples/Makefile.am 25 May 2006 22:20:17 -0000 @@ -12,8 +12,8 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../in sample_SOURCES = main.c demo-target.c sample_DEPLIBS = ../lib/librda.la -sample_LDADD = $(sample_DEPLIBS) $(INTLLIBS) -sample_DEPENDENCIES = $(sample_DEPLIBS) $(INTLDEPS) +sample_LDADD = $(sample_DEPLIBS) $(LIBINTL) +sample_DEPENDENCIES = $(sample_DEPLIBS) $(LIBINTL_DEP) async_SOURCES = async.c demo-target.c async_LDADD = ../lib/librda.la Index: sim/common/Make-common.in =================================================================== RCS file: /cvs/src/src/sim/common/Make-common.in,v retrieving revision 1.24 diff -u -p -r1.24 Make-common.in --- sim/common/Make-common.in 24 May 2005 14:21:19 -0000 1.24 +++ sim/common/Make-common.in 25 May 2006 22:20:17 -0000 @@ -229,7 +229,7 @@ CSEARCH = -I. -I$(srcdir) -I../common -I -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ - -I../../intl -I$(srcroot)/intl + @INCINTL@ ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) BUILD_CFLAGS = -g -O $(CSEARCH) @@ -238,12 +238,12 @@ COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(C LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a OPCODES_LIB = ../../opcodes/libopcodes.a -INTLLIBS = @INTLLIBS@ -INTLDEPS = @INTLDEPS@ +LIBINTL = @LIBINTL@ +LIBINTL_DEP = @LIBINTL_DEP@ CONFIG_LIBS = @LIBS@ -LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(INTLDEPS) $(LIBIBERTY_LIB) \ +LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \ $(SIM_EXTRA_LIBDEPS) -EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(INTLLIBS) $(LIBIBERTY_LIB) \ +EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) LIB_OBJS = callback.o syscall.o targ-map.o $(SIM_OBJS) Index: sim/common/aclocal.m4 =================================================================== RCS file: /cvs/src/src/sim/common/aclocal.m4,v retrieving revision 1.12 diff -u -p -r1.12 aclocal.m4 --- sim/common/aclocal.m4 29 Mar 2006 03:40:25 -0000 1.12 +++ sim/common/aclocal.m4 25 May 2006 22:20:17 -0000 @@ -44,7 +44,7 @@ AC_PROG_RANLIB dnl We don't use gettext, but bfd does. So we do the appropriate checks dnl to see if there are intl libraries we should link against. ALL_LINGUAS= -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR # Check for common headers. # FIXME: Seems to me this can cause problems for i386-windows hosts. @@ -892,7 +892,7 @@ AC_CONFIG_COMMANDS([stamp-h], [echo > st AC_OUTPUT ]) -sinclude(../../gettext.m4) +sinclude(../../config/gettext-sister.m4) dnl --enable-cgen-maint support AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, Index: sim/ppc/Makefile.in =================================================================== RCS file: /cvs/src/src/sim/ppc/Makefile.in,v retrieving revision 1.21 diff -u -p -r1.21 Makefile.in --- sim/ppc/Makefile.in 5 May 2006 17:11:19 -0000 1.21 +++ sim/ppc/Makefile.in 25 May 2006 22:20:24 -0000 @@ -155,11 +155,9 @@ INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDE LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a -INTLLIBS = @INTLLIBS@ -INTLDEPS = @INTLDEPS@ -INTL_DIR = ../../intl -INTL_SRC = $(srcdir)/$(INTL_DIR) -INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) +LIBINTL = @LIBINTL@ +LIBINTL_DEP = @LIBINTL_DEP@ +INTL_CFLAGS = @INCINTL@ TARGETLIB = libsim.a @@ -550,8 +548,8 @@ PACKAGE_SRC = @sim_pk_src@ PACKAGE_OBJ = @sim_pk_obj@ -psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(INTLDEPS) - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(INTLLIBS) $(LIBIBERTY_LIB) $(LIBS) +psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) + $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) run: psim rm -f run$(EXEEXT) Index: sim/ppc/configure.ac =================================================================== RCS file: /cvs/src/src/sim/ppc/configure.ac,v retrieving revision 1.5 diff -u -p -r1.5 configure.ac --- sim/ppc/configure.ac 5 May 2006 17:11:19 -0000 1.5 +++ sim/ppc/configure.ac 25 May 2006 22:20:24 -0000 @@ -17,7 +17,7 @@ CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CF dnl We don't use gettext, but bfd does. So we do the appropriate checks dnl to see if there are intl libraries we should link against. ALL_LINGUAS= -CY_GNU_GETTEXT +ZW_GNU_GETTEXT_SISTER_DIR AC_ARG_ENABLE(sim-alignment,