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 2de2463..54216ff 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 96370c4..5ec1672 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 27e2b75..04ce4df 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 cd9c781..03e97a5 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 a030d45..3d62ed6 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 11fb40a..3b9b751 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 9bf0bca..c37b983 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 ad52dac..4c70453 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 6deada9..d770874 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 fcfc672..9dc1763 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 22c079d..cb00690 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 0446a4a..87022d1 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 d0d965c..a72b490 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 439c32e..bbf1818 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 eabf71e..4a483c2 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 0504133..d296230 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 b3f787b..61e4f94 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 7544bbb..984b883 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 ddbc82c..69eff3b 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 1b92794..acb9abe 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 baf0a73..52155ba 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 6ad71a9..bc0b32f 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 7d87df9..b1fadd4 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 f9be55d..9462372 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 4eb2622..ace240e 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 6166bb8..041f341 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 b136108..a73be3c 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 5a9cd65..9eed9a5 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 62078b9..23ba5a6 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 f66e8bc..06d06a3 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 d92583f..ea313e7 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
-