libgettextpo: Use a dummy replacement for libtextstyle.

* gnulib-local/modules/libtextstyle-dummy: New file, based on gnulib's
modules/libtextstyle-optional.
* gnulib-local/Makefile.am (EXTRA_DIST): Add it.
* autogen.sh (GNULIB_MODULES_LIBGETTEXTPO): Add libtextstyle-dummy. Remove
file-ostream, ostream.
* gettext-tools/src/write-catalog.h: Include <textstyle.h> always.
* gettext-tools/src/write-catalog.c: Likewise.
* gettext-tools/src/write-po.h: Likewise.
* gettext-tools/src/write-po.c: Likewise.

diff --git a/.gitignore b/.gitignore
index 59a18b3679682997df1499b20611fb921a3acdf1..61249af8f53f0f93348a22f7703740514f1dbe48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -99,8 +99,6 @@
 /gettext-tools/libgettextpo/fcntl.in.h
 /gettext-tools/libgettextpo/fd-hook.c
 /gettext-tools/libgettextpo/fd-hook.h
-/gettext-tools/libgettextpo/file-ostream.oo.c
-/gettext-tools/libgettextpo/file-ostream.oo.h
 /gettext-tools/libgettextpo/filename.h
 /gettext-tools/libgettextpo/float+.h
 /gettext-tools/libgettextpo/float.c
@@ -160,7 +158,6 @@
 /gettext-tools/libgettextpo/memchr.c
 /gettext-tools/libgettextpo/memchr.valgrind
 /gettext-tools/libgettextpo/minmax.h
-/gettext-tools/libgettextpo/moo.h
 /gettext-tools/libgettextpo/msvc-inval.c
 /gettext-tools/libgettextpo/msvc-inval.h
 /gettext-tools/libgettextpo/msvc-nothrow.c
@@ -168,8 +165,6 @@
 /gettext-tools/libgettextpo/obstack.c
 /gettext-tools/libgettextpo/obstack.h
 /gettext-tools/libgettextpo/open.c
-/gettext-tools/libgettextpo/ostream.oo.c
-/gettext-tools/libgettextpo/ostream.oo.h
 /gettext-tools/libgettextpo/pathmax.h
 /gettext-tools/libgettextpo/printf-args.c
 /gettext-tools/libgettextpo/printf-args.h
@@ -219,6 +214,7 @@
 /gettext-tools/libgettextpo/strstr.c
 /gettext-tools/libgettextpo/sys_stat.in.h
 /gettext-tools/libgettextpo/sys_types.in.h
+/gettext-tools/libgettextpo/textstyle.in.h
 /gettext-tools/libgettextpo/time.in.h
 /gettext-tools/libgettextpo/uniconv.in.h
 /gettext-tools/libgettextpo/unictype.in.h
@@ -445,15 +441,6 @@
 /gettext-tools/libgettextpo/iconv_open-irix.h
 /gettext-tools/libgettextpo/iconv_open-osf.h
 /gettext-tools/libgettextpo/iconv_open-solaris.h
-# Files generated by "make", using moopp:
-/gettext-tools/libgettextpo/file-ostream.c
-/gettext-tools/libgettextpo/file-ostream.h
-/gettext-tools/libgettextpo/file_ostream.priv.h
-/gettext-tools/libgettextpo/file_ostream.vt.h
-/gettext-tools/libgettextpo/ostream.c
-/gettext-tools/libgettextpo/ostream.h
-/gettext-tools/libgettextpo/ostream.priv.h
-/gettext-tools/libgettextpo/ostream.vt.h
 # Files generated by "make", using bison.
 /gettext-runtime/intl/plural.c
 /gettext-tools/src/cldr-plural.c
@@ -780,6 +767,7 @@ core
 /gettext-tools/libgettextpo/sys/stat.h
 /gettext-tools/libgettextpo/sys/time.h
 /gettext-tools/libgettextpo/sys/types.h
+/gettext-tools/libgettextpo/textstyle.h
 /gettext-tools/libgettextpo/time.h
 /gettext-tools/libgettextpo/uniconv.h
 /gettext-tools/libgettextpo/unictype.h

diff --git a/autogen.sh b/autogen.sh
index fb0af6e970250c9deb192137ba7e58850cd80080..8d98a7b72c629e9e38c41a91f01f2a90228537c2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -281,7 +281,6 @@ if ! $skip_gnulib; then
     c-strstr
     error
     error-progname
-    file-ostream
     filename
     fopen
     fstrcmp
@@ -291,11 +290,11 @@ if ! $skip_gnulib; then
     gettext-h
     hash
     iconv
+    libtextstyle-dummy
     libunistring-optional
     markup
     minmax
     open
-    ostream
     progname
     relocatable-lib
     sigpipe

diff --git a/gettext-tools/src/write-catalog.c b/gettext-tools/src/write-catalog.c
index 354f7be12972b39ee05de87c1afaf9dd3eabce97..384fedcc461fdf63e52f1e09c1190010dc43e572 100644 (file)
--- a/gettext-tools/src/write-catalog.c
+++ b/gettext-tools/src/write-catalog.c
@@ -34,12 +34,7 @@
 # define STDOUT_FILENO 1
 #endif
 
-#ifdef GETTEXTDATADIR
-# include <textstyle.h>
-#else
-# include "ostream.h"
-# include "file-ostream.h"
-#endif
+#include <textstyle.h>
 
 #include "fwriteerror.h"
 #include "error-progname.h"

diff --git a/gettext-tools/src/write-catalog.h b/gettext-tools/src/write-catalog.h
index 5f8138fe6adbfe31658d487da963b98179cd560b..5813429fb0ed851388101271a83a34ce23834204 100644 (file)
--- a/gettext-tools/src/write-catalog.h
+++ b/gettext-tools/src/write-catalog.h
@@ -19,11 +19,7 @@
 
 #include <stdbool.h>
 
-#ifdef GETTEXTDATADIR
-# include <textstyle.h>
-#else
-# include "ostream.h"
-#endif
+#include <textstyle.h>
 
 #include "message.h"
 

diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 1e2642a0aa1f76ecf8c2661f07a4921046490545..07f2977a93d66c567a5cb8a4e2ae0d78c414e276 100644 (file)
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -35,11 +35,7 @@
 # include <iconv.h>
 #endif
 
-#ifdef GETTEXTDATADIR
-# include <textstyle.h>
-#else
-# include "ostream.h"
-#endif
+#include <textstyle.h>
 
 #include "c-ctype.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/write-po.h b/gettext-tools/src/write-po.h
index 37f676146fa889c698d085ca84f29d54ed5775ce..fdebd061e73d6f487a1c1c575afae6c3247de57e 100644 (file)
--- a/gettext-tools/src/write-po.h
+++ b/gettext-tools/src/write-po.h
@@ -22,11 +22,7 @@
 
 #include <stdbool.h>
 
-#ifdef GETTEXTDATADIR
-# include <textstyle.h>
-#else
-# include "ostream.h"
-#endif
+#include <textstyle.h>
 
 #include "message.h"
 

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 2d110d8f9f92e5745d908c88a66c70f4b8c8dfcf..f738226b517d16a3df9a4549de40ceb65099395d 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -281,6 +281,7 @@ modules/iconv-ostream \
 modules/java \
 modules/libcroco \
 modules/libglib \
+modules/libtextstyle-dummy \
 modules/libxml \
 modules/markup \
 modules/memory-ostream \

diff --git a/gnulib-local/modules/libtextstyle-dummy b/gnulib-local/modules/libtextstyle-dummy
new file mode 100644 (file)
index 0000000..372d3b4
--- /dev/null
+++ b/gnulib-local/modules/libtextstyle-dummy
@@ -0,0 +1,33 @@
+Description:
+A dummy replacement for libtextstyle.
+
+Files:
+lib/textstyle.in.h
+
+Depends-on:
+stdbool
+unistd
+fsync
+
+configure.ac:
+AC_REQUIRE([AC_C_INLINE])
+AC_CHECK_FUNCS_ONCE([tcdrain])
+
+Makefile.am:
+BUILT_SOURCES += textstyle.h
+
+# We need the following in order to create a dummy placeholder for
+# <textstyle.h>.
+textstyle.h: textstyle.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         cat $(srcdir)/textstyle.in.h; \
+       } > $@-t && \
+       mv $@-t $@
+MOSTLYCLEANFILES += textstyle.h textstyle.h-t
+
+Include:
+#include <textstyle.h>
+
+License:
+GPL