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

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 47824090419d4841abfc7c021c7ac5b7986adb25..1baa887e86cd42341009ae4e49f2590bb8ad52f6 100644 (file)
--- 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 46d2919c34910bb937b3385e1e3cba83f41ea1bf..12dc03c20e0d9627774394f8835a26690a5e8480 100644 (file)
--- 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 c96343f3fb50eb842fe090d07758d12a89c4b2b2..ce36722f0b43d783c8e3f70ae2cbaad63d888ca2 100644 (file)
--- 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 9246e6e51ff44ee95c0d051ed82ba93b4f5c36b9..6bcd4b68e68b195cf23ddc8585617399e0aa7b8f 100644 (file)
--- 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