From: Bruno Haible <bruno@clisp.org>
Date: Thu, 11 May 2006 18:38:09 +0000 (+0000)
Subject: Simplify compiling format.c in C++ mode.
X-Git-Tag: v0.15~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef13fb827b86c2e07c051c322b74433d6d4bc00f;p=thirdparty%2Fgettext.git

Simplify compiling format.c in C++ mode.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 9b4da9c34..1fd85b9d0 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Makefile.am (format_CFLAGS): Remove variable.
 	(format.lo): Remove variable.
+	(FORMAT_SOURCE) [MINGW]: Use ../mingw/c++format.cc instead of format.c.
 
 2006-05-09  Bruno Haible  <bruno@clisp.org>
 
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index b411e3264..f2fdb7a20 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -110,7 +110,12 @@ read-po-abstract.c po-lex.c po-gram-gen.y po-charset.c \
 read-properties.c read-stringtable.c open-po.c dir-list.c str-list.c
 
 # xgettext and msgfmt deal with format strings.
-FORMAT_SOURCE = format.c format-invalid.h \
+if !MINGW
+FORMAT_SOURCE = format.c
+else
+FORMAT_SOURCE = ../mingw/c++format.cc
+endif
+FORMAT_SOURCE += format-invalid.h \
 format-c.c format-sh.c format-python.c format-lisp.c format-elisp.c \
 format-librep.c format-scheme.c format-java.c format-csharp.c format-awk.c \
 format-pascal.c format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \