2001-08-13 Benjamin Kosnik <bkoz@redhat.com>

	* configure.in (libtool_VERSION): Add.
	(VERSION): Change to
	(release_VERSION): This.
	* configure: Regenerate.
	* src/Makefile.am (libstdc___la_LDFLAGS): Use -version-info with
	libtool_VERSION.
	* src/Makefile.in: Regenerate.

	* intl/Makefile.am: Remove.
	* intl/Makefile.in: Remove.
	* intl: Remove.
	* Makefile.am (SUBDIRS): Remove intl.
	* po/Makefile.am (DISTFILES): Add string_literals.cc
	(MSGFMT): Add.
	* po/string_literals.cc: Add.
	* po/POTFILES.in: Fix path.
	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Don't call AM_GNU_GETTEXT.
	* aclocal.m4: Regenerate.
	* configure.in: Remove AC_OUTPUT of intl/Makefile.

	* include/backward/backward_warning.h: Clarify message.

	* testsuite_flags.in (--cxxflags): Use same debug flags for
	library and testsuite.

	* include/Makefile.am (c_compatibility): Remove.
	* include/Makefile.in: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44880 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 48 insertions, 13 deletions

diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
index fe3a6fbed72..b7c3309df9b 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -23,11 +23,6 @@
 
 PACKAGE = @PACKAGE@
 
-# Necessary files.
-DISTFILES = \
-	Makefile.am Makefile.in POTFILES.in $(PACKAGE).pot \
-	$(LOCALE_IN) 
-
 # Location of installation directories.
 locale_installdir = $(DESTDIR)$(datadir)/locale
 locale_builddir = @glibcpp_localedir@
@@ -35,9 +30,16 @@ locale_builddir = @glibcpp_localedir@
 # Tell automake that foo.po makes foo.mo
 SUFFIXES = .po .mo
 
-LOCALE_IN = @POFILES@
+LOCALE_IN = @glibcpp_POFILES@
 LOCALE_OUT = @glibcpp_MOFILES@
 
+MSGFMT = msgfmt
+
+# Necessary files.
+DISTFILES = \
+	Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \
+	$(LOCALE_IN) 
+
 .po.mo:
 	$(MSGFMT) $< -o $@
 
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index 9bb90b228e8..171a00c3272 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -110,7 +110,6 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
@@ -133,6 +132,7 @@ enable_shared = @enable_shared@
 enable_static = @enable_static@
 glibcpp_CXX = @glibcpp_CXX@
 glibcpp_MOFILES = @glibcpp_MOFILES@
+glibcpp_POFILES = @glibcpp_POFILES@
 glibcpp_basedir = @glibcpp_basedir@
 glibcpp_builddir = @glibcpp_builddir@
 glibcpp_localedir = @glibcpp_localedir@
@@ -145,14 +145,12 @@ gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 l = @l@
 libio_la = @libio_la@
+libtool_VERSION = @libtool_VERSION@
+release_VERSION = @release_VERSION@
 toplevel_srcdir = @toplevel_srcdir@
 
 PACKAGE = @PACKAGE@
 
-# Necessary files.
-DISTFILES =  	Makefile.am Makefile.in POTFILES.in $(PACKAGE).pot 	$(LOCALE_IN) 
-
-
 # Location of installation directories.
 locale_installdir = $(DESTDIR)$(datadir)/locale
 locale_builddir = @glibcpp_localedir@
@@ -160,9 +158,15 @@ locale_builddir = @glibcpp_localedir@
 # Tell automake that foo.po makes foo.mo
 SUFFIXES = .po .mo
 
-LOCALE_IN = @POFILES@
+LOCALE_IN = @glibcpp_POFILES@
 LOCALE_OUT = @glibcpp_MOFILES@
 
+MSGFMT = msgfmt
+
+# Necessary files.
+DISTFILES =  	Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot 	$(LOCALE_IN) 
+
+
 # Specify what gets cleaned up on a 'make clean'
 CLEANFILES = $(LOCALE_OUT) 
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
diff --git a/libstdc++-v3/po/POTFILES.in b/libstdc++-v3/po/POTFILES.in
index 1cedc4176b9..b9c13db641e 100644
--- a/libstdc++-v3/po/POTFILES.in
+++ b/libstdc++-v3/po/POTFILES.in
@@ -22,4 +22,4 @@
 ## USA.
 
 # include/backward/backward_warning.h
-intl/string_literals.cc
+string_literals.cc
diff --git a/libstdc++-v3/po/string_literals.cc b/libstdc++-v3/po/string_literals.cc
new file mode 100644
index 00000000000..776cf39068a
--- /dev/null
+++ b/libstdc++-v3/po/string_literals.cc
@@ -0,0 +1,29 @@
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+#include <libintl.h>
+#define gettext_noop(Str) Str
+
+// For messages testsuite files.
+const char* msgstr1 = gettext_noop("please");
+const char* msgstr2 = gettext_noop("thank you");
+
+// For numpunct implementation.
+const char* msgstr3 = gettext_noop("true");
+const char* msgstr4 = gettext_noop("false");
+