From: Bruno Haible Date: Tue, 2 Apr 2019 15:53:08 +0000 (+0200) Subject: libgettextpo: Use a dummy replacement for libtextstyle. X-Git-Tag: v0.20~87 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b85e17cd47dc1aeda8e3cd3616a94fdba951be11;p=thirdparty%2Fgettext.git 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 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 59a18b367..61249af8f 100644 --- 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 fb0af6e97..8d98a7b72 100755 --- 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 354f7be12..384fedcc4 100644 --- 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 -#else -# include "ostream.h" -# include "file-ostream.h" -#endif +#include #include "fwriteerror.h" #include "error-progname.h" diff --git a/gettext-tools/src/write-catalog.h b/gettext-tools/src/write-catalog.h index 5f8138fe6..5813429fb 100644 --- a/gettext-tools/src/write-catalog.h +++ b/gettext-tools/src/write-catalog.h @@ -19,11 +19,7 @@ #include -#ifdef GETTEXTDATADIR -# include -#else -# include "ostream.h" -#endif +#include #include "message.h" diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c index 1e2642a0a..07f2977a9 100644 --- a/gettext-tools/src/write-po.c +++ b/gettext-tools/src/write-po.c @@ -35,11 +35,7 @@ # include #endif -#ifdef GETTEXTDATADIR -# include -#else -# include "ostream.h" -#endif +#include #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 37f676146..fdebd061e 100644 --- a/gettext-tools/src/write-po.h +++ b/gettext-tools/src/write-po.h @@ -22,11 +22,7 @@ #include -#ifdef GETTEXTDATADIR -# include -#else -# include "ostream.h" -#endif +#include #include "message.h" diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index 2d110d8f9..f738226b5 100644 --- 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 index 000000000..372d3b468 --- /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.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 + +License: +GPL