This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/5542
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 1 Apr 2002 14:15:39 -0800
- Subject: [v3] libstdc++/5542
I tested this with and without gettext installed.
tested x86/linux
gcc
gcc-3_1-branch
2002-04-01 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/5542
* Makefile.am (AM_MAKEFLAGS): Add GMSGFMT.
* Makefile.in: Regenerate.
* acinclude: Export glibcpp_MSGFMT.
* aclocal.m4: Regenerate.
* po/Makefile.am (MSGFMT): Use it.
* po/Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.am,v
retrieving revision 1.29
diff -c -p -r1.29 Makefile.am
*** Makefile.am 2002/01/28 22:13:02 1.29
--- Makefile.am 2002/04/01 22:13:07
*************** AM_MAKEFLAGS = \
*** 144,147 ****
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" \
! "WERROR=$(WERROR)"
--- 144,148 ----
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" \
! "WERROR=$(WERROR)" \
! "GMSGFMT=$(GMSGFMT)"
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.202
diff -c -p -r1.202 acinclude.m4
*** acinclude.m4 2002/03/23 03:18:41 1.202
--- acinclude.m4 2002/04/01 22:13:12
*************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
*** 1174,1179 ****
--- 1174,1180 ----
# Don't call AM_GNU_GETTEXT here. Instead, assume glibc.
# Need to deal with MSGFMT, USE_NLS, and glibcpp_[P,M]OFILES
USE_NLS=yes
+ glibcpp_MSGFMT=$GMSGFMT
# Export the build objects.
for ling in $ALL_LINGUAS; do \
*************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
*** 1182,1187 ****
--- 1183,1189 ----
done
AC_SUBST(glibcpp_MOFILES)
AC_SUBST(glibcpp_POFILES)
+ AC_SUBST(glibcpp_MSGFMT)
CLOCALE_H=config/locale/gnu/c_locale.h
CLOCALE_CC=config/locale/gnu/c_locale.cc
Index: po/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/po/Makefile.am,v
retrieving revision 1.6
diff -c -p -r1.6 Makefile.am
*** Makefile.am 2002/01/07 18:57:06 1.6
--- Makefile.am 2002/04/01 22:13:12
***************
*** 1,6 ****
## Makefile for the po subdirectory of the GNU C++ Standard library.
##
! ## Copyright (C) 2001 Free Software Foundation, Inc.
##
## This file is part of the libstdc++ version 3 distribution.
## Process this file with automake to produce Makefile.in.
--- 1,6 ----
## Makefile for the po subdirectory of the GNU C++ Standard library.
##
! ## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
##
## This file is part of the libstdc++ version 3 distribution.
## Process this file with automake to produce Makefile.in.
*************** SUFFIXES = .po .mo
*** 34,40 ****
LOCALE_IN = @glibcpp_POFILES@
LOCALE_OUT = @glibcpp_MOFILES@
! MSGFMT = msgfmt
# Necessary files.
DISTFILES = \
--- 34,40 ----
LOCALE_IN = @glibcpp_POFILES@
LOCALE_OUT = @glibcpp_MOFILES@
! MSGFMT = @glibcpp_MSGFMT@
# Necessary files.
DISTFILES = \