From: Bruno Haible <bruno@clisp.org>
Date: Sat, 23 Dec 2006 16:01:23 +0000 (+0000)
Subject: Compile the styled_ostream subclasses in C++ mode if WOE32DLL.
X-Git-Tag: v0.17~529
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68a17877c6a0860180ff1b2bf1e4cecb20d30167;p=thirdparty%2Fgettext.git

Compile the styled_ostream subclasses in C++ mode if WOE32DLL.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 478240904..1baa887e8 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-22  Bruno Haible  <bruno@clisp.org>
+
+	* woe32dll/c++html-styled-ostream.cc: New file.
+	* woe32dll/c++term-styled-ostream.cc: New file.
+
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-lib/Makefile.am: New file, partially taken from
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 46d2919c3..12dc03c20 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-22  Bruno Haible  <bruno@clisp.org>
+
+	* modules/html-styled-ostream (Makefile.am) [WOE32DLL]: Use a C++
+	wrapper file.
+	* modules/term-styled-ostream (Makefile.am) [WOE32DLL]: Likewise.
+
 2006-12-22  Bruno Haible  <bruno@clisp.org>
 
 	Test for CC=c++ at configure-time.
diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream
index c96343f3f..ce36722f0 100644
--- a/gnulib-local/modules/html-styled-ostream
+++ b/gnulib-local/modules/html-styled-ostream
@@ -19,7 +19,11 @@ gettext-h
 configure.ac:
 
 Makefile.am:
+if !WOE32DLL
 lib_SOURCES += html-styled-ostream.c
+else
+lib_SOURCES += ../woe32dll/c++html-styled-ostream.cc
+endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
 html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream
index 9246e6e51..6bcd4b68e 100644
--- a/gnulib-local/modules/term-styled-ostream
+++ b/gnulib-local/modules/term-styled-ostream
@@ -16,7 +16,11 @@ xalloc
 configure.ac:
 
 Makefile.am:
+if !WOE32DLL
 lib_SOURCES += term-styled-ostream.c
+else
+lib_SOURCES += ../woe32dll/c++term-styled-ostream.cc
+endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
 term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h