Support programs like Emacs that use gnulib but not gettext.

* MODULES.html.sh (Internationalization functions): Add gettext-h.
* modules/gettext-h: New file.
* modules/gettext (Files): Remove lib/gettext.h.
(Depends-on): Add gettext-h.
(Makefile.am): Remove lib_SOURCES.
* modules/argmatch, modules/c-stack, modules/closeout:
* modules/copy-file, modules/csharpcomp, modules/csharpexec:
* modules/execute, modules/file-type, modules/getaddrinfo:
* modules/getopt, modules/human, modules/javacomp:
* modules/javaexec, modules/mkdir-p, modules/obstack:
* modules/openat, modules/pagealign_alloc, modules/pipe:
* modules/quotearg, modules/regex, modules/rpmatch:
* modules/unicodeio, modules/userspec, modules/version-etc:
* modules/wait-process, modules/xalloc-die, modules/xmemcoll:
* modules/xsetenv:
Depend on gettext-h, not gettext.

diff --git a/ChangeLog b/ChangeLog
index 2de24631e079b3f20484b25ce7029b58495c7e95..54216ff40dda8ccef0b39423f02fb14b733ae13d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Support programs like Emacs that use gnulib but not gettext.
+       * MODULES.html.sh (Internationalization functions): Add gettext-h.
+       * modules/gettext-h: New file.
+       * modules/gettext (Files): Remove lib/gettext.h.
+       (Depends-on): Add gettext-h.
+       (Makefile.am): Remove lib_SOURCES.
+       * modules/argmatch, modules/c-stack, modules/closeout:
+       * modules/copy-file, modules/csharpcomp, modules/csharpexec:
+       * modules/execute, modules/file-type, modules/getaddrinfo:
+       * modules/getopt, modules/human, modules/javacomp:
+       * modules/javaexec, modules/mkdir-p, modules/obstack:
+       * modules/openat, modules/pagealign_alloc, modules/pipe:
+       * modules/quotearg, modules/regex, modules/rpmatch:
+       * modules/unicodeio, modules/userspec, modules/version-etc:
+       * modules/wait-process, modules/xalloc-die, modules/xmemcoll:
+       * modules/xsetenv:
+       Depend on gettext-h, not gettext.
+
 2005-07-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        * gnulib-tool (func_import): Add support for 'public domain' license.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 96370c4aedf9b08301169e4bebe177d0679cc2fb..5ec1672b075af90ff35a10570507edc1d23055a8 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1908,6 +1908,7 @@ func_all_modules ()
 
   func_begin_table
   func_module gettext
+  func_module gettext-h
   func_module iconv
   func_module iconvme
   func_module localcharset

diff --git a/modules/argmatch b/modules/argmatch
index 27e2b7561ebb03402d6fcee3ce3cfba7d231b0ae..04ce4df493a08c80b80851480f35bfed76242182 100644 (file)
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -6,7 +6,7 @@ lib/argmatch.h
 lib/argmatch.c
 
 Depends-on:
-gettext
+gettext-h
 error
 quotearg
 quote

diff --git a/modules/c-stack b/modules/c-stack
index cd9c78143f15f29dcda149c3a48c09bcbd47a4dd..03e97a5fb60abfa00e9ff9e094eec9c7c16cca50 100644 (file)
--- a/modules/c-stack
+++ b/modules/c-stack
@@ -7,7 +7,7 @@ lib/c-stack.c
 m4/c-stack.m4
 
 Depends-on:
-gettext
+gettext-h
 exitfail
 
 configure.ac:
@@ -24,4 +24,3 @@ GPL
 
 Maintainer:
 Paul Eggert
-

diff --git a/modules/closeout b/modules/closeout
index a030d452e1b6db7b00016a9ae142714232b2afe8..3d62ed61401c9ab939da28852a1efb2fc80c50a2 100644 (file)
--- a/modules/closeout
+++ b/modules/closeout
@@ -8,7 +8,7 @@ m4/closeout.m4
 
 Depends-on:
 atexit
-gettext
+gettext-h
 error
 quotearg
 fpending

diff --git a/modules/copy-file b/modules/copy-file
index 11fb40a0312a4dfbf66bf7b12f83b050a2a1e12d..3b9b751eb3cc2b65464648eb8473b6ad06d0fcb8 100644 (file)
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -12,7 +12,7 @@ safe-read
 full-write
 binary-io
 exit
-gettext
+gettext-h
 
 configure.ac:
 gl_COPY_FILE
@@ -28,4 +28,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-

diff --git a/modules/csharpcomp b/modules/csharpcomp
index 9bf0bcaf886facf1cc9a3fc7c315abc04b489e31..c37b98371117bc88e5955d36b6e8e33412dd3a7f 100644 (file)
--- a/modules/csharpcomp
+++ b/modules/csharpcomp
@@ -18,7 +18,7 @@ getline
 sh-quote
 safe-read
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_CSHARPCOMP
@@ -35,4 +35,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-

diff --git a/modules/csharpexec b/modules/csharpexec
index ad52dac510c10c8c664a329840d0713029158597..4c70453413ce4d1d6d040316650200741ac5c737 100644 (file)
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -18,7 +18,7 @@ sh-quote
 xalloc
 xallocsa
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_CSHARPEXEC
@@ -36,4 +36,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-

diff --git a/modules/execute b/modules/execute
index 6deada935d79dd84fdd24a978e97d903e87d3915..d7708740cebab8199d4077c99acb930b7162b80e 100644 (file)
--- a/modules/execute
+++ b/modules/execute
@@ -12,7 +12,7 @@ error
 exit
 fatal-signal
 wait-process
-gettext
+gettext-h
 stdbool
 strpbrk
 
@@ -30,4 +30,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-

diff --git a/modules/file-type b/modules/file-type
index fcfc67248906fc6da4a6e3fd7db70558520fb63f..9dc1763de9ea313d4e3d66cb8e8e38992e22c631 100644 (file)
--- a/modules/file-type
+++ b/modules/file-type
@@ -7,7 +7,7 @@ lib/file-type.c
 m4/file-type.m4
 
 Depends-on:
-gettext
+gettext-h
 stat-macros
 
 configure.ac:

diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index 22c079da8bb041d18e3ca5e34be9b759410a34d9..cb00690af3b630cea98dcea9ba5e8fad8254069e 100644 (file)
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -10,7 +10,7 @@ m4/sockpfaf.m4
 
 Depends-on:
 restrict
-gettext
+gettext-h
 stdbool
 
 configure.ac:

diff --git a/modules/getopt b/modules/getopt
index 0446a4aeb7ee8c106304e253f09651b3163b35da..87022d1b558b9ee06aec84a5c4042f591ff1d6a7 100644 (file)
--- a/modules/getopt
+++ b/modules/getopt
@@ -9,7 +9,7 @@ lib/getopt_int.h
 m4/getopt.m4
 
 Depends-on:
-gettext
+gettext-h
 
 configure.ac:
 gl_GETOPT
@@ -34,4 +34,3 @@ LGPL
 
 Maintainer:
 all, glibc
-

diff --git a/modules/gettext b/modules/gettext
index d0d965c80dc11ed4b9ff4dd21bfbd04e34d787f9..a72b490a6ce57e8ce1156ff348ee408b3a7c3163 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -2,7 +2,6 @@ Description:
 Translate messages to user's native language.
 
 Files:
-lib/gettext.h
 m4/codeset.m4
 m4/gettext.m4
 m4/glibc2.m4
@@ -35,12 +34,12 @@ m4/xsize.m4
 build-aux/config.rpath
 
 Depends-on:
+gettext-h
 
 configure.ac:
 AM_GNU_GETTEXT([external])
 
 Makefile.am:
-lib_SOURCES += gettext.h
 
 Include:
 "gettext.h"
@@ -50,4 +49,3 @@ LGPL
 
 Maintainer:
 Bruno Haible
-

diff --git a/modules/gettext-h b/modules/gettext-h
new file mode 100644 (file)
index 0000000..3f6981d
--- /dev/null
+++ b/modules/gettext-h
@@ -0,0 +1,21 @@
+Description:
+Translate messages to user's native language if the gettext module is also used.
+
+Files:
+lib/gettext.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += gettext.h
+
+Include:
+"gettext.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible

diff --git a/modules/human b/modules/human
index 439c32e32a01c930cb747a5a7f24aaafe7e9b4fa..bbf181893a55468cff8cc4619236189e067f90ec 100644 (file)
--- a/modules/human
+++ b/modules/human
@@ -13,7 +13,7 @@ m4/uintmax_t.m4
 m4/human.m4
 
 Depends-on:
-gettext
+gettext-h
 argmatch
 error
 xstrtol

diff --git a/modules/javacomp b/modules/javacomp
index eabf71e524063185d0e7ea7971726b72a1de0d5d..4a483c241713d3f2aff90b6030c16a046a6f25c7 100644 (file)
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -19,7 +19,7 @@ sh-quote
 safe-read
 xalloc
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_JAVACOMP

diff --git a/modules/javaexec b/modules/javaexec
index 0504133b78e557634e140d479ecd3e0a756ffe63..d2962301f8795759a98188b0cf4f7f5d2e2b7e35 100644 (file)
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -17,7 +17,7 @@ pathname
 xalloc
 xallocsa
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_JAVAEXEC

diff --git a/modules/mkdir-p b/modules/mkdir-p
index b3f787bdad760232d70ff3e8de593359cc48fa09..61e4f9456f3c3658f4f89f8afff031f50ed0b59e 100644 (file)
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -10,7 +10,7 @@ m4/mkdir-p.m4
 Depends-on:
 alloca
 chown
-gettext
+gettext-h
 save-cwd
 dirname
 error

diff --git a/modules/obstack b/modules/obstack
index 7544bbb2380985b0294d7b745b76aca61b972154..984b883f1184b77fe3812e4097dc6b83a3d5f469 100644 (file)
--- a/modules/obstack
+++ b/modules/obstack
@@ -10,7 +10,7 @@ m4/stdint_h.m4
 m4/uintmax_t.m4
 
 Depends-on:
-gettext
+gettext-h
 exit
 exitfail
 

diff --git a/modules/openat b/modules/openat
index ddbc82c169e3eda0312973de06915be1d10e4707..69eff3b3d790c8208a7d368c85385c456acafd6d 100644 (file)
--- a/modules/openat
+++ b/modules/openat
@@ -8,7 +8,7 @@ m4/openat.m4
 
 Depends-on:
 save-cwd
-gettext
+gettext-h
 error
 exitfail
 extensions

diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc
index 1b92794e8ac8ec1cc2766dd2f47af087e29f59e3..acb9abee681848f47306c208bc028cf010716511 100644 (file)
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -11,7 +11,7 @@ Depends-on:
 error
 exit
 getpagesize
-gettext
+gettext-h
 xalloc
 
 configure.ac:

diff --git a/modules/pipe b/modules/pipe
index baf0a738186cdf78b90336b6e9a0a242107cbe19..52155ba38779d2c4f213f15d1ade35ae2ccabe32 100644 (file)
--- a/modules/pipe
+++ b/modules/pipe
@@ -12,7 +12,7 @@ wait-process
 error
 exit
 fatal-signal
-gettext
+gettext-h
 stdbool
 strpbrk
 

diff --git a/modules/quotearg b/modules/quotearg
index 6ad71a92f03e612f4b15b379641ab0f45510a537..bc0b32fb633d983aaf5c3f4eff3b68b2335fbf4a 100644 (file)
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -10,7 +10,7 @@ m4/quotearg.m4
 
 Depends-on:
 xalloc
-gettext
+gettext-h
 stdbool
 
 configure.ac:

diff --git a/modules/regex b/modules/regex
index 7d87df9b5dde22fa1378a2e568e64f78b8bd5cd5..b1fadd46cac96dc9a0c69671bc6444e69754354d 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -8,7 +8,7 @@ m4/regex.m4
 
 Depends-on:
 alloca
-gettext
+gettext-h
 restrict
 
 configure.ac:

diff --git a/modules/rpmatch b/modules/rpmatch
index f9be55da29d88093e0e3e867b0ccff4c569421e3..9462372677d3b5d5033ca0b01b5c072790a44bef 100644 (file)
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -6,7 +6,7 @@ lib/rpmatch.c
 m4/rpmatch.m4
 
 Depends-on:
-gettext
+gettext-h
 regex
 
 configure.ac:

diff --git a/modules/unicodeio b/modules/unicodeio
index 4eb262275d7631b7fc89cdb9f4c62c6e79d9c391..ace240e275a4d1306ace4793b47faeac34e30077 100644 (file)
--- a/modules/unicodeio
+++ b/modules/unicodeio
@@ -8,7 +8,7 @@ m4/unicodeio.m4
 
 Depends-on:
 iconv
-gettext
+gettext-h
 localcharset
 error
 

diff --git a/modules/userspec b/modules/userspec
index 6166bb8a7b4bb6d21a0b298f86704ae2b96011a0..041f341b708131d89655448d95664dc922e834d0 100644 (file)
--- a/modules/userspec
+++ b/modules/userspec
@@ -13,7 +13,7 @@ posixver
 xalloc
 xstrtol
 strdup
-gettext
+gettext-h
 stdbool
 
 configure.ac:

diff --git a/modules/version-etc b/modules/version-etc
index b136108e8a50312114dcfe0e7782d774904eeb78..a73be3c6fc2527de1b0efb4de04efa874dc4a3a9 100644 (file)
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -6,7 +6,7 @@ lib/version-etc.h
 lib/version-etc.c
 
 Depends-on:
-gettext
+gettext-h
 
 configure.ac:
 

diff --git a/modules/wait-process b/modules/wait-process
index 5a9cd65e5c1f7daf1f16285dd50ba3845e4df7ae..9eed9a518221f0b92c8efb41dad37eb1b826f695 100644 (file)
--- a/modules/wait-process
+++ b/modules/wait-process
@@ -12,7 +12,7 @@ fatal-signal
 error
 exit
 xalloc
-gettext
+gettext-h
 stdbool
 
 configure.ac:

diff --git a/modules/xalloc-die b/modules/xalloc-die
index 62078b95f795bc0d8320137385ece7b396d82555..23ba5a69a011154128238847c992c379bf4acbbb 100644 (file)
--- a/modules/xalloc-die
+++ b/modules/xalloc-die
@@ -7,7 +7,7 @@ lib/xalloc-die.c
 Depends-on:
 xalloc
 error
-gettext
+gettext-h
 exitfail
 
 configure.ac:

diff --git a/modules/xmemcoll b/modules/xmemcoll
index f66e8bc80a9199f706dc8c93d66af1950c56a12b..06d06a3207b31c382fee9a966f774bfa5eec83c7 100644 (file)
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -7,7 +7,7 @@ lib/xmemcoll.c
 
 Depends-on:
 memcoll
-gettext
+gettext-h
 error
 quotearg
 exitfail

diff --git a/modules/xsetenv b/modules/xsetenv
index d92583f5df0b785cd5b3d2e3025858763096751b..ea313e7fe2f9bff6038542d2eb51b214bf9a821e 100644 (file)
--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -10,7 +10,7 @@ Depends-on:
 setenv
 error
 exit
-gettext
+gettext-h
 
 configure.ac:
 
@@ -25,4 +25,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-