Renamed intl/libgettext.h to lib/gettext.h.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index d74ce519aa872af1858ff1232b7b1840591a71d1..bf51c0a21ea59ac9139bfa33de88e93acdcb4e95 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * libgettext.h: Moved to ../lib/gettext.h.
+       * Makefile.in (HEADERS): Remove libgettext.h.
+       (DISTFILES.obsolete): Add libgettext.h.
+
 2001-12-21  Bruno Haible  <bruno@clisp.org>
 
        * gmo.h: Renamed from gettext.h.

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 73abfac266f8e0d76612ce15a25267ca9940ff8d..b12e3dca9c207343855d5655ee060c9a683faf75 100644 (file)
--- 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 84e5795f803a7f57432a9c40eaf3de7bfddb0a35..2b428dba03a300e717cc8f47cd3838d730d7f600 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,19 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <bruno@clisp.org>
 
        * execute.c (nonintr_open): Omit prototype. On some platforms mode_t

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 40141d3fe7b9e52b4bd7e126c730c4be50a27795..dd11b2e4136beccfb22454bf132dcf322d7de3fb 100644 (file)
--- 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 10670771d20720409e7592b23eeeb5678ae05f26..3ac67ac4454ab8422f752328df982a504de2e9a4 100644 (file)
--- 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 793727f439c41ce2d64137e9c968d9cce46b90da..0b5e7bf69133ccf9e6e5f21ec4f750925b9eadfc 100644 (file)
--- 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 d2f9e173dbfc9e105501ea8b1880485fea81605b..53c77697ebf92d6e3b42826a25cf69478cc7172c 100644 (file)
--- 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 b72042adefbad84265232346d2a6b6594de8ed86..b21516e29e9f45cb6b8f9938fcf63bbb8c35b1b4 100644 (file)
--- 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 d0523f107b712c500b1933d50446adabcb405033..a6fa72c2f02bd81e68dc001232df1dc8ad86f4aa 100644 (file)
--- 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 d36cb84ba8ce7f46189dd06c0b5d3c7e2ddbbe3f..1d24b9dbd37e43e7e8ba919c7493880a18d02ada 100644 (file)
--- 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 461017d424965edebf61dac4aa99ec058e6ee99d..a54fc2c2a9ddf86592a287529716fab4497a7009 100644 (file)
--- 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 b48dc269c5a083b06c82513641d18b481288f2f5..2b2dd98a8544943abcdd8791180af791d679c91a 100644 (file)
--- 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 e74a57fa761d853bdc34145b7740274950cf54ba..1ea6d1afb3b88d1b4d19aba21a4abc91afada8d1 100644 (file)
--- 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 f0e1eea17a3a5efe3568a1fb93a1fcf0055f2d1c..367e9effe14337845243f57cc5ed9c35323bd565 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #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 5c3d108037f84d0df22ce827ab32015b4f5f7afd..94e11f6596b11d627742b33fa0d615828a5f9253 100644 (file)
--- 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 2d7362f344fda96918eddb0ab2e01d9dd8f789e1..83f73a0a1d5d49570f6dffb15b228075a640bc94 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,52 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <bruno@clisp.org>
 
        * message.h (message_merge): Remove declaration.

diff --git a/src/file-list.c b/src/file-list.c
index cfe8edd1c690f717bfe83ec7f576cfdfb89e14f6..9711ceddc12ed6a0281fa250ce538dc1d93c1db8 100644 (file)
--- 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 d8e4da227c6e7679ba95eed8d501a68dc212b868..b4a8b5856b52c3294e4463fb570eff20b624afbb 100644 (file)
--- 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 4ea0cf98ac6803f4186440972ab3b8c4713778c8..2f5bd3cc42354fdb1e5e7bc0cd3dcfaeed1c9f8c 100644 (file)
--- 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 e336640c7a514dcb383e551ee9cccc5d4aa9a07b..03c5242ab49c06d2a51ace1e1ad6d7f610ef8799 100644 (file)
--- 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 e83829bd67d33f9dfc55a0d524d08226684368a5..79f3db6c0f221cb0b87e1e83897acb4874d308e4 100644 (file)
--- 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 a3aa95785fda60513353848f3f7021992efc95ab..7372a11aaf6b1cab6e99683f821f5548b2c10bf0 100644 (file)
--- 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 e0648096ba0f325a77a21152a6355834523d2244..b59bddf0494ee138c9b1ecc86170e57c2a2f915b 100644 (file)
--- 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 494effd09ac5cd6344e83faa609f3d5c84662744..4010fdb8885a694e09de856c5a57b81960346bdf 100644 (file)
--- 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 dc365eaebe1d5773b0d0eec55583218d54257651..b604f2ee715704b501c4130a4881601cb0dbebd0 100644 (file)
--- 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 e6e5cd08b80a411e2ca3cad691c51b469fe21f93..8d21a819b94bdeb359e94b6fe414181b08cb4848 100644 (file)
--- 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 61d5d7cd556b6b292639c499c280c9a0e7cf0d81..300cc142522b09df417ee423f4e405e687b9405c 100644 (file)
--- 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 6efed5dd22b9ee4ddbded25a364feba03faaa9c5..19fb0fa56b8ea6a6e83d40dec41d3a8913a117b8 100644 (file)
--- 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 621eea5120078b42042560d797542e56ffffd5c7..0d3dc458f7ccaa9d0852b46d6742afce32bf6ac9 100644 (file)
--- 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 ab0c14976e5fbddb7228a3aaed9671dafadbd759..4e759d9c5ee6fd07cc4497452d0259ca9758a757 100644 (file)
--- 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 0681d0917b5d3a9063818f0620c8e6c64119981f..7ef8dcf6f8c093debaa2cf4158ce0e0a0f7d330b 100644 (file)
--- 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 e65f02c9317d9f676d8d5a202f160de53b33ad08..7f3eeebd7ad6aff172635886fa96072d509fbcb5 100644 (file)
--- 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 40f3a9009bdba5dc80b9e7f6ebfd455dd294e92f..54716d368572ed3b6139f6d66d44054f1d739093 100644 (file)
--- 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 58a4077c617843a5c851a496f4a476ceda25903d..225518ac8ba7c17ebdc0135db00ebb4d178f21e0 100644 (file)
--- 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 6d0d4a66f6d1246ea80093e6b9c36b8fa2c08708..23e5798e08bebde2a442576f1a6f8dff5748e7e1 100644 (file)
--- 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 bd061c20bcf2d8d0a385de8daab4408a25c140ea..ec356d8ec7b98b486787f6704717c8772017e1ae 100644 (file)
--- 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 22ee36a13e08d460d62e9d194768f8bce3d68f17..3d2f562f013ba244821d90fd8434d15f85fcd7e5 100644 (file)
--- 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 5baced9e9fb7d328b5ff664491c9b37b0e4a6ed2..8bc0883eb7a7ec1e76873cecd661d0c6501a8f0c 100644 (file)
--- 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 6f800bea90ed0509532ae3a20cedd5a58990748b..b77e0bcece618df2b3d8a1c788b1d2958edc7ef7 100644 (file)
--- 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 c2967b5971f3e805c8c4f8a41d0d527a6b5f1b90..32b1f13311493c700ff7ddf1b990423c33f0d363 100644 (file)
--- 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 c14ae39db5003ed16bdc062ff573d11886cec3ef..0ec4e1e9ff4efe3a5bfab68aae0cfcce16c53c7c 100644 (file)
--- 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 6c7f9ca366b3ab93112eb3542dab246ddf8e47f4..caa940525f1ac1d38d2d9f34987515bf27c94f95 100644 (file)
--- 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 34824e4471a7c7be6fed0ef319cc01a2a89dd536..11a05ffa19d67c9fa3c099e1385f56264e2452c6 100644 (file)
--- 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 210de0d76cc39b40a2994b0e7676d3df787ed7b5..4df8e93b7ff42f84896c567fd65793bd1338f604 100644 (file)
--- 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 f8ffb69142b2f43b37fef7431be31095f0d73f89..6612fd345a6264d0fce263902e5d323aafcb170f 100644 (file)
--- 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 fc3608d8ef3f9a8b2c9bf771f2fdc50babb571eb..1d6573fef3755e66c56201c5fd7e60690bcc42c6 100644 (file)
--- 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 256291a381e0916195053353e700e69811eb00b2..5efd51a6e6f6bc153cdd78033482b0f66f4a91f1 100644 (file)
--- 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 c90e21a96f59dc89d16849f80f026755b1cea720..6191f34f73112d0caf124127c1ae049e2474e8d1 100644 (file)
--- 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 a20ef37cefdbfb5a1b41fb17933b42efa57e9eb1..8b46089eb35ea757e9a4da6d5d7b775ec93ecb2f 100644 (file)
--- 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 3d81e3b866d74f344511de47300b190c012badbf..7b4c4542a5628388471686e7f901c7af3dc34fd9 100644 (file)
--- 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 c38fa0b67c68f88cf48776dda7048c37ccef5c0e..75215f17f83a5d959d850b1170209700fd3faa34 100644 (file)
--- 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 2db7b8b47daeaf67dca7da88cb61bc92096c06df..7f1e618fd2991b636763745880638803e29c3bd5 100644 (file)
--- 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 e19763c8ff877548a166067abfc47194adc4da1a..dc238e589133ffcf5921b54c846e996171f4fa26 100644 (file)
--- 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 795c3d9fc6a2a4331426ab2c991c47a0a93fb40e..7d1fc6b44637bf6d91568a0e6a14f761361505cc 100644 (file)
--- 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 8096dde83a568737bac33f74536d5f1dfc5f3b94..e1ca1b25279e91dc6ceb3fc2a605658fb5919c54 100644 (file)
--- 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 521ae1f840c104b9058d202d4df9d6f2c8955199..074ce0550a207e3b0d096145e82365a4fdf04abd 100644 (file)
--- 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 972c2b4ba0d02e350df98c2e29b39e6bacdf6aec..a00a18652a023605bf0e5f0d192d21a08eed41b4 100644 (file)
--- 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 15c7dd1a1635747cea1630678273228b73d09a75..03d338234f572c00a60e6db059f1e381c34d9e9a 100644 (file)
--- 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 f4bd18f9b67a419d97e0df9fa87db07429873f30..85f334a2ec44f619f8a7b85acf157a3a8ba1da45 100644 (file)
--- 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 b8177baff2354ab0a7d3723f8a4b7fbd7de9b3ab..8a0a92a084100a3acff3944c2e4af4f522bc6d37 100644 (file)
--- 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 1624ec8634e31974392d5429a36899adbb51d1b1..cea6463348261d9e98cded29887899d389ec5c80 100644 (file)
--- 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 6e34d9bea7b2ffb5e25dfbd94f11890e0ab1aa9d..eef07c68151849631d835f7a92f294c07e5e3537 100644 (file)
--- 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 ();