From 2d50fe3edc095e1bd1a79c03123ea5d826e6a52e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 21 Dec 2001 16:50:19 +0000 Subject: [PATCH] Renamed intl/libgettext.h to lib/gettext.h. --- intl/ChangeLog | 6 ++++++ intl/Makefile.in | 4 ++-- lib/ChangeLog | 16 +++++++++++++++ lib/Makefile.am | 8 +++++++- lib/copy-file.c | 2 +- lib/execute.c | 2 +- lib/javacomp.c | 2 +- lib/javaexec.c | 2 +- lib/pipe-bidi.c | 2 +- lib/pipe-in.c | 2 +- lib/pipe-out.c | 2 +- lib/wait-process.c | 2 +- lib/xerror.c | 2 +- lib/xmalloc.c | 2 +- os2/Makefile | 12 +++++------ src/ChangeLog | 49 +++++++++++++++++++++++++++++++++++++++++++++ src/file-list.c | 2 +- src/format-c.c | 2 +- src/format-java.c | 2 +- src/format-librep.c | 2 +- src/format-lisp.c | 2 +- src/format-pascal.c | 2 +- src/format-python.c | 2 +- src/format-ycp.c | 2 +- src/gettext.c | 2 +- src/hostname.c | 2 +- src/msgattrib.c | 2 +- src/msgcat.c | 2 +- src/msgcmp.c | 2 +- src/msgcomm.c | 2 +- src/msgconv.c | 2 +- src/msgen.c | 2 +- src/msgexec.c | 2 +- src/msgfilter.c | 2 +- src/msgfmt.c | 2 +- src/msggrep.c | 2 +- src/msginit.c | 2 +- src/msgl-cat.c | 2 +- src/msgl-charset.c | 2 +- src/msgl-iconv.c | 2 +- src/msgmerge.c | 2 +- src/msgunfmt.c | 2 +- src/msguniq.c | 2 +- src/ngettext.c | 2 +- src/open-po.c | 2 +- src/po-charset.c | 2 +- src/po-gram-gen.y | 2 +- src/po-lex.c | 2 +- src/read-java.c | 2 +- src/read-mo.c | 2 +- src/read-po.c | 2 +- src/urlget.c | 2 +- src/write-java.c | 2 +- src/write-mo.c | 2 +- src/write-po.c | 2 +- src/x-c.c | 2 +- src/x-librep.c | 2 +- src/x-lisp.c | 2 +- src/x-po.c | 2 +- src/x-rst.c | 2 +- src/x-ycp.c | 2 +- src/xgettext.c | 2 +- 62 files changed, 142 insertions(+), 65 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index d74ce519a..bf51c0a21 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2001-12-21 Bruno Haible + + * libgettext.h: Moved to ../lib/gettext.h. + * Makefile.in (HEADERS): Remove libgettext.h. + (DISTFILES.obsolete): Add libgettext.h. + 2001-12-21 Bruno Haible * gmo.h: Renamed from gettext.h. diff --git a/intl/Makefile.in b/intl/Makefile.in index 73abfac26..b12e3dca9 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -59,7 +59,7 @@ LDFLAGS = @LDFLAGS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h +HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h plural-eval.c SOURCES = $(COMSRCS) intl-compat.c COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ @@ -77,7 +77,7 @@ DISTFILES.generated = plural.c DISTFILES.normal = VERSION DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ -COPYING.LIB-2 gettext.h +COPYING.LIB-2 gettext.h libgettext.h # Libtool's library version information for libintl. # Before making a gettext release, the gettext maintainer must change this diff --git a/lib/ChangeLog b/lib/ChangeLog index 84e5795f8..2b428dba0 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,19 @@ +2001-12-21 Bruno Haible + + * gettext.h: Moved here from ../intl/libgettext.h. + * Makefile.am (noinst_HEADERS): Add it. + (gettextsrcdir, gettextsrc_DATA): New variables. + * copy-file.c: Include gettext.h instead of libgettext.h. + * execute.c: Likewise. + * javacomp.c: Likewise. + * javaexec.c: Likewise. + * pipe-bidi.c: Likewise. + * pipe-in.c: Likewise. + * pipe-out.c: Likewise. + * wait-process.c: Likewise. + * xerror.c: Likewise. + * xmalloc.c: Likewise. + 2001-12-20 Bruno Haible * execute.c (nonintr_open): Omit prototype. On some platforms mode_t diff --git a/lib/Makefile.am b/lib/Makefile.am index 40141d3fe..dd11b2e41 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -61,9 +61,15 @@ libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @INTLLIBS@ @LIBICONV@ -no-undefined +# Extra files to be installed. + +gettextsrcdir = $(datadir)/gettext +gettextsrc_DATA = gettext.h + # List of files to be distributed. -noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) +noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) \ +gettext.h EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \ $(LIBADD_SOURCE) $(UNUSED_SOURCE) \ diff --git a/lib/copy-file.c b/lib/copy-file.c index 10670771d..3ac67ac44 100644 --- a/lib/copy-file.c +++ b/lib/copy-file.c @@ -35,7 +35,7 @@ #include "error.h" #include "full-write.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/lib/execute.c b/lib/execute.c index 793727f43..0b5e7bf69 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -43,7 +43,7 @@ #include "error.h" #include "wait-process.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/javacomp.c b/lib/javacomp.c index d2f9e173d..53c77697e 100644 --- a/lib/javacomp.c +++ b/lib/javacomp.c @@ -35,7 +35,7 @@ #include "safe-read.h" #include "xmalloc.h" #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifdef __GNUC__ # ifndef alloca diff --git a/lib/javaexec.c b/lib/javaexec.c index b72042ade..b21516e29 100644 --- a/lib/javaexec.c +++ b/lib/javaexec.c @@ -32,7 +32,7 @@ #include "sh-quote.h" #include "xmalloc.h" #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifdef __GNUC__ # ifndef alloca diff --git a/lib/pipe-bidi.c b/lib/pipe-bidi.c index d0523f107..a6fa72c2f 100644 --- a/lib/pipe-bidi.c +++ b/lib/pipe-bidi.c @@ -41,7 +41,7 @@ #endif #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/pipe-in.c b/lib/pipe-in.c index d36cb84ba..1d24b9dbd 100644 --- a/lib/pipe-in.c +++ b/lib/pipe-in.c @@ -41,7 +41,7 @@ #endif #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/pipe-out.c b/lib/pipe-out.c index 461017d42..a54fc2c2a 100644 --- a/lib/pipe-out.c +++ b/lib/pipe-out.c @@ -41,7 +41,7 @@ #endif #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/wait-process.c b/lib/wait-process.c index b48dc269c..2b2dd98a8 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -75,7 +75,7 @@ #endif #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/xerror.c b/lib/xerror.c index e74a57fa7..1ea6d1afb 100644 --- a/lib/xerror.c +++ b/lib/xerror.c @@ -31,7 +31,7 @@ #include "error.h" #include "progname.h" #include "mbswidth.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/lib/xmalloc.c b/lib/xmalloc.c index f0e1eea17..367e9effe 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -25,7 +25,7 @@ #include #include "error.h" -#include "libgettext.h" +#include "gettext.h" #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 diff --git a/os2/Makefile b/os2/Makefile index 5c3d10803..94e11f659 100644 --- a/os2/Makefile +++ b/os2/Makefile @@ -248,21 +248,21 @@ $(OUT)dir-list.o: ../lib/system.h ../src/dir-list.h \ $(OUT)message.o: ../lib/fstrcmp.h ../src/message.h ../src/str-list.h \ ../src/pos.h ../lib/system.h $(OUT)open-po.o: ../src/open-po.h ../src/dir-list.h ../lib/error.h \ - ../lib/system.h ../intl/libgettext.h + ../lib/system.h ../lib/gettext.h $(OUT)po-gram-gen.o: ../src/po-lex.h ../lib/error.h ../src/pos.h \ - ../src/po-gram.h ../lib/system.h ../intl/libgettext.h \ + ../src/po-gram.h ../lib/system.h ../lib/gettext.h \ ../src/po.h $(OUT)po-hash-gen.o: ../src/po-hash.h ../src/po.h ../src/po-lex.h \ ../lib/error.h ../src/pos.h -$(OUT)po-lex.o: ../intl/libgettext.h ../src/po-lex.h ../lib/error.h \ +$(OUT)po-lex.o: ../lib/gettext.h ../src/po-lex.h ../lib/error.h \ ../src/pos.h ../src/open-po.h ../src/po-gram-gen2.h $(OUT)po.o: ../src/po.h ../src/po-lex.h ../lib/error.h \ ../src/pos.h ../src/po-hash.h ../lib/mbswidth.h \ - ../intl/libgettext.h + ../lib/gettext.h $(OUT)str-list.o: ../src/str-list.h $(OUT)write-po.o: ../src/write-po.h ../src/message.h \ ../src/str-list.h ../src/pos.h ../lib/c-ctype.h \ - ../lib/linebreak.h ../lib/error.h ../intl/libgettext.h + ../lib/linebreak.h ../lib/error.h ../lib/gettext.h $(OUT)xget-lex.o: ../src/dir-list.h ../lib/error.h \ - ../intl/libgettext.h ../lib/hash.h ../src/str-list.h \ + ../lib/gettext.h ../lib/hash.h ../src/str-list.h \ ../src/xget-lex.h diff --git a/src/ChangeLog b/src/ChangeLog index 2d7362f34..83f73a0a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,52 @@ +2001-12-21 Bruno Haible + + * file-list.c: Include gettext.h instead of libgettext.h. + * format-c.c: Likewise. + * format-java.c: Likewise. + * format-librep.c: Likewise. + * format-lisp.c: Likewise. + * format-pascal.c: Likewise. + * format-python.c: Likewise. + * format-ycp.c: Likewise. + * gettext.c: Likewise. + * hostname.c: Likewise. + * msgattrib.c: Likewise. + * msgcat.c: Likewise. + * msgcmp.c: Likewise. + * msgcomm.c: Likewise. + * msgconv.c: Likewise. + * msgen.c: Likewise. + * msgexec.c: Likewise. + * msgfilter.c: Likewise. + * msgfmt.c: Likewise. + * msggrep.c: Likewise. + * msginit.c: Likewise. + * msgl-cat.c: Likewise. + * msgl-charset.c: Likewise. + * msgl-iconv.c: Likewise. + * msgmerge.c: Likewise. + * msgunfmt.c: Likewise. + * msguniq.c: Likewise. + * ngettext.c: Likewise. + * open-po.c: Likewise. + * po-charset.c: Likewise. + * po-gram-gen.y: Likewise. + * po-lex.c: Likewise. + * read-java.c: Likewise. + * read-mo.c: Likewise. + * read-po.c: Likewise. + * urlget.c: Likewise. + * write-java.c: Likewise. + * write-mo.c: Likewise. + * write-po.c: Likewise. + * x-c.c: Likewise. + * x-librep.c: Likewise. + * x-lisp.c: Likewise. + * x-po.c: Likewise. + * x-rst.c: Likewise. + * x-ycp.c: Likewise. + * xgettext.c: Likewise. + 2001-12-21 Bruno Haible * message.h (message_merge): Remove declaration. diff --git a/src/file-list.c b/src/file-list.c index cfe8edd1c..9711ceddc 100644 --- a/src/file-list.c +++ b/src/file-list.c @@ -31,7 +31,7 @@ #include "error.h" #include "system.h" #include "getline.h" -#include "libgettext.h" +#include "gettext.h" /* A convenience macro. I don't like writing gettext() every time. */ #define _(str) gettext (str) diff --git a/src/format-c.c b/src/format-c.c index d8e4da227..b4a8b5856 100644 --- a/src/format-c.c +++ b/src/format-c.c @@ -27,7 +27,7 @@ #include "xmalloc.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-java.c b/src/format-java.c index 4ea0cf98a..2f5bd3cc4 100644 --- a/src/format-java.c +++ b/src/format-java.c @@ -30,7 +30,7 @@ #include "system.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-librep.c b/src/format-librep.c index e336640c7..03c5242ab 100644 --- a/src/format-librep.c +++ b/src/format-librep.c @@ -27,7 +27,7 @@ #include "xmalloc.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-lisp.c b/src/format-lisp.c index e83829bd6..79f3db6c0 100644 --- a/src/format-lisp.c +++ b/src/format-lisp.c @@ -30,7 +30,7 @@ #include "system.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-pascal.c b/src/format-pascal.c index a3aa95785..7372a11aa 100644 --- a/src/format-pascal.c +++ b/src/format-pascal.c @@ -28,7 +28,7 @@ #include "xmalloc.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-python.c b/src/format-python.c index e0648096b..b59bddf04 100644 --- a/src/format-python.c +++ b/src/format-python.c @@ -28,7 +28,7 @@ #include "xmalloc.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/format-ycp.c b/src/format-ycp.c index 494effd09..4010fdb88 100644 --- a/src/format-ycp.c +++ b/src/format-ycp.c @@ -27,7 +27,7 @@ #include "xmalloc.h" #include "error.h" #include "progname.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/gettext.c b/src/gettext.c index dc365eaeb..b604f2ee7 100644 --- a/src/gettext.c +++ b/src/gettext.c @@ -41,7 +41,7 @@ # undef _LIBINTL_H # include "libgnuintl.h" #else -# include "libgettext.h" +# include "gettext.h" #endif #define _(str) gettext (str) diff --git a/src/hostname.c b/src/hostname.c index e6e5cd08b..8d21a819b 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -75,7 +75,7 @@ #include "basename.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgattrib.c b/src/msgattrib.c index 61d5d7cd5..300cc1425 100644 --- a/src/msgattrib.c +++ b/src/msgattrib.c @@ -35,7 +35,7 @@ #include "read-po.h" #include "write-po.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgcat.c b/src/msgcat.c index 6efed5dd2..19fb0fa56 100644 --- a/src/msgcat.c +++ b/src/msgcat.c @@ -38,7 +38,7 @@ #include "write-po.h" #include "msgl-cat.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgcmp.c b/src/msgcmp.c index 621eea512..0d3dc458f 100644 --- a/src/msgcmp.c +++ b/src/msgcmp.c @@ -33,7 +33,7 @@ #include "basename.h" #include "message.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #include "po.h" #include "str-list.h" diff --git a/src/msgcomm.c b/src/msgcomm.c index ab0c14976..4e759d9c5 100644 --- a/src/msgcomm.c +++ b/src/msgcomm.c @@ -38,7 +38,7 @@ #include "write-po.h" #include "msgl-cat.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" /* A convenience macro. I don't like writing gettext() every time. */ diff --git a/src/msgconv.c b/src/msgconv.c index 0681d0917..7ef8dcf6f 100644 --- a/src/msgconv.c +++ b/src/msgconv.c @@ -35,7 +35,7 @@ #include "write-po.h" #include "msgl-iconv.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgen.c b/src/msgen.c index e65f02c93..7f3eeebd7 100644 --- a/src/msgen.c +++ b/src/msgen.c @@ -36,7 +36,7 @@ #include "write-po.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgexec.c b/src/msgexec.c index 40f3a9009..54716d368 100644 --- a/src/msgexec.c +++ b/src/msgexec.c @@ -47,7 +47,7 @@ #include "pipe.h" #include "wait-process.h" #include "setenv.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgfilter.c b/src/msgfilter.c index 58a4077c6..225518ac8 100644 --- a/src/msgfilter.c +++ b/src/msgfilter.c @@ -55,7 +55,7 @@ #include "findprog.h" #include "pipe.h" #include "wait-process.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgfmt.c b/src/msgfmt.c index 6d0d4a66f..23e5798e0 100644 --- a/src/msgfmt.c +++ b/src/msgfmt.c @@ -46,7 +46,7 @@ #include "write-mo.h" #include "write-java.h" -#include "libgettext.h" +#include "gettext.h" #include "message.h" #include "po.h" diff --git a/src/msggrep.c b/src/msggrep.c index bd061c20b..ec356d8ec 100644 --- a/src/msggrep.c +++ b/src/msggrep.c @@ -51,7 +51,7 @@ #include "findprog.h" #include "pipe.h" #include "wait-process.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msginit.c b/src/msginit.c index 22ee36a13..3d2f562f0 100644 --- a/src/msginit.c +++ b/src/msginit.c @@ -81,7 +81,7 @@ #include "getline.h" #include "setenv.h" #include "str-list.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) #define N_(str) (str) diff --git a/src/msgl-cat.c b/src/msgl-cat.c index 5baced9e9..8bc0883eb 100644 --- a/src/msgl-cat.c +++ b/src/msgl-cat.c @@ -40,7 +40,7 @@ #include "strstr.h" #include "basename.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgl-charset.c b/src/msgl-charset.c index 6f800bea9..b77e0bcec 100644 --- a/src/msgl-charset.c +++ b/src/msgl-charset.c @@ -35,7 +35,7 @@ #include "message.h" #include "strstr.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgl-iconv.c b/src/msgl-iconv.c index c2967b597..32b1f1331 100644 --- a/src/msgl-iconv.c +++ b/src/msgl-iconv.c @@ -41,7 +41,7 @@ #include "xmalloc.h" #include "strstr.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgmerge.c b/src/msgmerge.c index c14ae39db..0ec4e1e9f 100644 --- a/src/msgmerge.c +++ b/src/msgmerge.c @@ -44,7 +44,7 @@ #include "plural-exp.h" #include "backupfile.h" #include "copy-file.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msgunfmt.c b/src/msgunfmt.c index 6c7f9ca36..caa940525 100644 --- a/src/msgunfmt.c +++ b/src/msgunfmt.c @@ -35,7 +35,7 @@ #include "read-mo.h" #include "read-java.h" #include "write-po.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/msguniq.c b/src/msguniq.c index 34824e447..11a05ffa1 100644 --- a/src/msguniq.c +++ b/src/msguniq.c @@ -37,7 +37,7 @@ #include "write-po.h" #include "msgl-cat.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/ngettext.c b/src/ngettext.c index 210de0d76..4df8e93b7 100644 --- a/src/ngettext.c +++ b/src/ngettext.c @@ -31,7 +31,7 @@ #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/open-po.c b/src/open-po.c index f8ffb6914..6612fd345 100644 --- a/src/open-po.c +++ b/src/open-po.c @@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "error.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/po-charset.c b/src/po-charset.c index fc3608d8e..1d6573fef 100644 --- a/src/po-charset.c +++ b/src/po-charset.c @@ -31,7 +31,7 @@ #include "basename.h" #include "strstr.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" extern const char *program_name; diff --git a/src/po-gram-gen.y b/src/po-gram-gen.y index 256291a38..5efd51a6e 100644 --- a/src/po-gram-gen.y +++ b/src/po-gram-gen.y @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "po-lex.h" #include "error.h" #include "xmalloc.h" -#include "libgettext.h" +#include "gettext.h" #include "po.h" #define _(str) gettext (str) diff --git a/src/po-lex.c b/src/po-lex.c index c90e21a96..6191f34f7 100644 --- a/src/po-lex.c +++ b/src/po-lex.c @@ -39,7 +39,7 @@ #include "c-ctype.h" #include "linebreak.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext(str) #if HAVE_VPRINTF || HAVE_DOPRNT diff --git a/src/read-java.c b/src/read-java.c index a20ef37ce..8b46089eb 100644 --- a/src/read-java.c +++ b/src/read-java.c @@ -35,7 +35,7 @@ #include "read-po.h" #include "error.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/read-mo.c b/src/read-mo.c index 3d81e3b86..7b4c4542a 100644 --- a/src/read-mo.c +++ b/src/read-mo.c @@ -35,7 +35,7 @@ #include "xmalloc.h" #include "system.h" #include "message.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/read-po.c b/src/read-po.c index c38fa0b67..75215f17f 100644 --- a/src/read-po.c +++ b/src/read-po.c @@ -29,7 +29,7 @@ #include "po.h" #include "xmalloc.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/urlget.c b/src/urlget.c index 2db7b8b47..7f1e618fd 100644 --- a/src/urlget.c +++ b/src/urlget.c @@ -36,7 +36,7 @@ #include "execute.h" #include "javaexec.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/write-java.c b/src/write-java.c index e19763c8f..dc238e589 100644 --- a/src/write-java.c +++ b/src/write-java.c @@ -75,7 +75,7 @@ #include "system.h" #include "tmpdir.h" #include "utf8-ucs4.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/write-mo.c b/src/write-mo.c index 795c3d9fc..7d1fc6b44 100644 --- a/src/write-mo.c +++ b/src/write-mo.c @@ -45,7 +45,7 @@ #include "hash.h" #include "message.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(str) gettext (str) diff --git a/src/write-po.c b/src/write-po.c index 8096dde83..e1ca1b252 100644 --- a/src/write-po.c +++ b/src/write-po.c @@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" #include "error.h" #include "xerror.h" -#include "libgettext.h" +#include "gettext.h" /* Our regular abbreviation. */ #define _(str) gettext (str) diff --git a/src/x-c.c b/src/x-c.c index 521ae1f84..074ce0550 100644 --- a/src/x-c.c +++ b/src/x-c.c @@ -36,7 +36,7 @@ #include "xmalloc.h" #include "system.h" #include "hash.h" -#include "libgettext.h" +#include "gettext.h" #define _(s) gettext(s) diff --git a/src/x-librep.c b/src/x-librep.c index 972c2b4ba..a00a18652 100644 --- a/src/x-librep.c +++ b/src/x-librep.c @@ -34,7 +34,7 @@ #include "error.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(s) gettext(s) diff --git a/src/x-lisp.c b/src/x-lisp.c index 15c7dd1a1..03d338234 100644 --- a/src/x-lisp.c +++ b/src/x-lisp.c @@ -33,7 +33,7 @@ #include "error.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(s) gettext(s) diff --git a/src/x-po.c b/src/x-po.c index f4bd18f9b..85f334a2e 100644 --- a/src/x-po.c +++ b/src/x-po.c @@ -32,7 +32,7 @@ #include "xmalloc.h" #include "po.h" #include "po-lex.h" -#include "libgettext.h" +#include "gettext.h" /* A convenience macro. I don't like writing gettext() every time. */ #define _(str) gettext (str) diff --git a/src/x-rst.c b/src/x-rst.c index b8177baff..8a0a92a08 100644 --- a/src/x-rst.c +++ b/src/x-rst.c @@ -33,7 +33,7 @@ #include "progname.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(s) gettext(s) diff --git a/src/x-ycp.c b/src/x-ycp.c index 1624ec863..cea646334 100644 --- a/src/x-ycp.c +++ b/src/x-ycp.c @@ -34,7 +34,7 @@ #include "error.h" #include "xmalloc.h" #include "system.h" -#include "libgettext.h" +#include "gettext.h" #define _(s) gettext(s) diff --git a/src/xgettext.c b/src/xgettext.c index 6e34d9bea..eef07c681 100644 --- a/src/xgettext.c +++ b/src/xgettext.c @@ -54,7 +54,7 @@ #include "po-time.h" #include "write-po.h" #include "format.h" -#include "libgettext.h" +#include "gettext.h" #ifndef _POSIX_VERSION struct passwd *getpwuid (); -- 2.47.3