libtextstyle: Don't use a C++ compiler.

* libtextstyle/gnulib-local/modules/fd-styled-ostream.diff: New file.
* libtextstyle/gnulib-local/modules/html-styled-ostream.diff: New file.
* libtextstyle/gnulib-local/modules/term-styled-ostream.diff: New file.
* libtextstyle/lib/Makefile.am (libtextstyle_la_LINK): Use the C compiler
always.
* libtextstyle/configure.ac: Remove LT_LANG([C++]), AC_PROG_CXX, and related
invocations.

diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac
index 166022bc69b8e1cb5814518cbb1b0b04629d4776..80bd04661f010eb738397db14c5d8b1120112c69 100644 (file)
--- a/libtextstyle/configure.ac
+++ b/libtextstyle/configure.ac
@@ -54,9 +54,6 @@ gl_WOE32_DLL
 
 LT_INIT([win32-dll])
 
-dnl Make "libtool --tag=CXX ..." work when needed.
-LT_LANG([C++])
-
 dnl Prepares the libtool configuration for handling of Windows resources, and
 dnl sets the RC variable to a program that compiles Windows resource files.
 LT_LANG([Windows Resource])
@@ -99,13 +96,6 @@ else
   DLL_VARIABLE=
 fi
 AC_SUBST([DLL_VARIABLE])
-dnl Some parts of the source have to be compiled with the C++ compiler.
-if test $is_woe32dll = yes; then
-  AC_PROG_CXX
-  _AM_DEPENDENCIES([CXX])
-else
-  AM_CONDITIONAL([am__fastdepCXX], [false])
-fi
 
 dnl Put some default definitions into config.h.
 AH_BOTTOM([

diff --git a/libtextstyle/gnulib-local/modules/fd-styled-ostream.diff b/libtextstyle/gnulib-local/modules/fd-styled-ostream.diff
new file mode 100644 (file)
index 0000000..cb6d948
--- /dev/null
+++ b/libtextstyle/gnulib-local/modules/fd-styled-ostream.diff
@@ -0,0 +1,23 @@
+*** fd-styled-ostream.orig
+--- fd-styled-ostream
+***************
+*** 13,23 ****
+  configure.ac:
+  
+  Makefile.am:
+- if !WOE32DLL
+  lib_SOURCES += fd-styled-ostream.c
+- else
+- lib_SOURCES += ../woe32dll/c++fd-styled-ostream.cc
+- endif
+  # This is a Makefile rule that generates multiple files at once; see the
+  # automake documentation, node "Multiple Outputs", for details.
+  $(srcdir)/fd-styled-ostream.h : $(top_srcdir)/build-aux/moopp fd-styled-ostream.oo.h fd-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
+--- 13,19 ----
+  configure.ac:
+  
+  Makefile.am:
+  lib_SOURCES += fd-styled-ostream.c
+  # This is a Makefile rule that generates multiple files at once; see the
+  # automake documentation, node "Multiple Outputs", for details.
+  $(srcdir)/fd-styled-ostream.h : $(top_srcdir)/build-aux/moopp fd-styled-ostream.oo.h fd-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h

diff --git a/libtextstyle/gnulib-local/modules/html-styled-ostream.diff b/libtextstyle/gnulib-local/modules/html-styled-ostream.diff
new file mode 100644 (file)
index 0000000..90d3439
--- /dev/null
+++ b/libtextstyle/gnulib-local/modules/html-styled-ostream.diff
@@ -0,0 +1,23 @@
+*** html-styled-ostream.orig
+--- html-styled-ostream
+***************
+*** 20,30 ****
+  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.
+  $(srcdir)/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
+--- 20,26 ----
+  configure.ac:
+  
+  Makefile.am:
+  lib_SOURCES += html-styled-ostream.c
+  # This is a Makefile rule that generates multiple files at once; see the
+  # automake documentation, node "Multiple Outputs", for details.
+  $(srcdir)/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/libtextstyle/gnulib-local/modules/term-styled-ostream.diff b/libtextstyle/gnulib-local/modules/term-styled-ostream.diff
new file mode 100644 (file)
index 0000000..976c4f8
--- /dev/null
+++ b/libtextstyle/gnulib-local/modules/term-styled-ostream.diff
@@ -0,0 +1,23 @@
+*** term-styled-ostream.orig
+--- term-styled-ostream
+***************
+*** 16,26 ****
+  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.
+  $(srcdir)/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
+--- 16,22 ----
+  configure.ac:
+  
+  Makefile.am:
+  lib_SOURCES += term-styled-ostream.c
+  # This is a Makefile rule that generates multiple files at once; see the
+  # automake documentation, node "Multiple Outputs", for details.
+  $(srcdir)/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

diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
index 51df1c57a9f610003ba75d8f0106f532a5cf3d34..a698245ca179090394328fee159f00de2ce256f0 100644 (file)
--- a/libtextstyle/lib/Makefile.am
+++ b/libtextstyle/lib/Makefile.am
@@ -265,12 +265,6 @@ libtextstyle_la_LDFLAGS += \
   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
   -rpath $(libdir)
 # Use the C++ compiler only when needed.
-if WOE32DLL
-libtextstyle_la_LINK = \
-  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-  $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(libtextstyle_la_LDFLAGS) $(LDFLAGS) -o $@
-else
 libtextstyle_la_LINK = \
   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
   $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libtextstyle_la_LDFLAGS) $(LDFLAGS) -o $@
-endif