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.
2025-08-08 17:22:05 +03:00 · 2005-07-06 15:58:47 +00:00
parent 68f9ae59fe
commit abe574726d
32 changed files with 71 additions and 38 deletions
--- a/20
+++ b/20
@@ -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.
--- 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
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -6,7 +6,7 @@ lib/argmatch.h
 lib/argmatch.c

 Depends-on:
-gettext
+gettext-h
 error
 quotearg
 quote
--- 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
-
--- a/modules/closeout
+++ b/modules/closeout
@@ -8,7 +8,7 @@ m4/closeout.m4

 Depends-on:
 atexit
-gettext
+gettext-h
 error
 quotearg
 fpending
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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:
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -10,7 +10,7 @@ m4/sockpfaf.m4

 Depends-on:
 restrict
-gettext
+gettext-h
 stdbool

 configure.ac:
--- 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
-
--- 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
-
--- a/modules/gettext-h
+++ 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
--- 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
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -19,7 +19,7 @@ sh-quote
 safe-read
 xalloc
 error
-gettext
+gettext-h

 configure.ac:
 gt_JAVACOMP
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -17,7 +17,7 @@ pathname
 xalloc
 xallocsa
 error
-gettext
+gettext-h

 configure.ac:
 gt_JAVAEXEC
--- 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
--- 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

--- a/modules/openat
+++ b/modules/openat
@@ -8,7 +8,7 @@ m4/openat.m4

 Depends-on:
 save-cwd
-gettext
+gettext-h
 error
 exitfail
 extensions
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -11,7 +11,7 @@ Depends-on:
 error
 exit
 getpagesize
-gettext
+gettext-h
 xalloc

 configure.ac:
--- a/modules/pipe
+++ b/modules/pipe
@@ -12,7 +12,7 @@ wait-process
 error
 exit
 fatal-signal
-gettext
+gettext-h
 stdbool
 strpbrk

--- a/modules/quotearg
+++ b/modules/quotearg
@@ -10,7 +10,7 @@ m4/quotearg.m4

 Depends-on:
 xalloc
-gettext
+gettext-h
 stdbool

 configure.ac:
--- a/modules/regex
+++ b/modules/regex
@@ -8,7 +8,7 @@ m4/regex.m4

 Depends-on:
 alloca
-gettext
+gettext-h
 restrict

 configure.ac:
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -6,7 +6,7 @@ lib/rpmatch.c
 m4/rpmatch.m4

 Depends-on:
-gettext
+gettext-h
 regex

 configure.ac:
--- a/modules/unicodeio
+++ b/modules/unicodeio
@@ -8,7 +8,7 @@ m4/unicodeio.m4

 Depends-on:
 iconv
-gettext
+gettext-h
 localcharset
 error

--- a/modules/userspec
+++ b/modules/userspec
@@ -13,7 +13,7 @@ posixver
 xalloc
 xstrtol
 strdup
-gettext
+gettext-h
 stdbool

 configure.ac:
--- 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:

--- a/modules/wait-process
+++ b/modules/wait-process
@@ -12,7 +12,7 @@ fatal-signal
 error
 exit
 xalloc
-gettext
+gettext-h
 stdbool

 configure.ac:
--- 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:
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -7,7 +7,7 @@ lib/xmemcoll.c

 Depends-on:
 memcoll
-gettext
+gettext-h
 error
 quotearg
 exitfail
--- 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
-