new module gettext-h for programs that don't use i18n

[Paul Eggert]

I'm trying to have Emacs use gnulib a bit more (one module at a
time...)  and discovered that many modules currently depend on gettext
even though they only need the gettext.h file.  gettext is a fairly
heavyweight module, and it's not time yet for me to add it to Emacs
(it's on the todo list, but Not Yet), so I thought it better to remove
the dependency of these other modules on gettext.  So I introduced a
new module gettext-h that contains only lib/gettext.h, and modified
the other modules to depend only on gettext-h if they can be used
without AM_GNU_GETTEXT and friends.  I installed this patch
accordingly.

Comments are welcome.  I'm not particularly happy with the approach I
took, but I couldn't think of a better one.

2005-07-06  Paul Eggert  <address@hidden>

        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.

--- /dev/null   2005-06-27 15:40:05.000000000 -0700
+++ modules/gettext-h   2005-07-06 08:52:28.000000000 -0700
@@ -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
Index: MODULES.html.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/MODULES.html.sh,v
retrieving revision 1.90
diff -p -u -r1.90 MODULES.html.sh
--- MODULES.html.sh     24 Jun 2005 14:53:03 -0000      1.90
+++ MODULES.html.sh     6 Jul 2005 15:54:12 -0000
@@ -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
Index: modules/argmatch
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/argmatch,v
retrieving revision 1.9
diff -p -u -r1.9 argmatch
--- modules/argmatch    6 May 2005 17:22:45 -0000       1.9
+++ modules/argmatch    6 Jul 2005 15:54:12 -0000
@@ -6,7 +6,7 @@ lib/argmatch.h
 lib/argmatch.c
 
 Depends-on:
-gettext
+gettext-h
 error
 quotearg
 quote
Index: modules/c-stack
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/c-stack,v
retrieving revision 1.4
diff -p -u -r1.4 c-stack
--- modules/c-stack     22 Sep 2004 15:11:04 -0000      1.4
+++ modules/c-stack     6 Jul 2005 15:54:12 -0000
@@ -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
-
Index: modules/closeout
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/closeout,v
retrieving revision 1.11
diff -p -u -r1.11 closeout
--- modules/closeout    6 May 2005 17:22:45 -0000       1.11
+++ modules/closeout    6 Jul 2005 15:54:12 -0000
@@ -8,7 +8,7 @@ m4/closeout.m4
 
 Depends-on:
 atexit
-gettext
+gettext-h
 error
 quotearg
 fpending
Index: modules/copy-file
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/copy-file,v
retrieving revision 1.2
diff -p -u -r1.2 copy-file
--- modules/copy-file   22 Sep 2004 15:11:04 -0000      1.2
+++ modules/copy-file   6 Jul 2005 15:54:12 -0000
@@ -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
-
Index: modules/csharpcomp
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/csharpcomp,v
retrieving revision 1.1
diff -p -u -r1.1 csharpcomp
--- modules/csharpcomp  8 Jun 2005 12:10:25 -0000       1.1
+++ modules/csharpcomp  6 Jul 2005 15:54:12 -0000
@@ -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
-
Index: modules/csharpexec
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/csharpexec,v
retrieving revision 1.3
diff -p -u -r1.3 csharpexec
--- modules/csharpexec  3 Jun 2005 14:42:32 -0000       1.3
+++ modules/csharpexec  6 Jul 2005 15:54:12 -0000
@@ -18,7 +18,7 @@ sh-quote
 xalloc
 xallocsa
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_CSHARPEXEC
@@ -36,4 +36,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-
Index: modules/execute
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/execute,v
retrieving revision 1.2
diff -p -u -r1.2 execute
--- modules/execute     22 Sep 2004 15:11:04 -0000      1.2
+++ modules/execute     6 Jul 2005 15:54:12 -0000
@@ -12,7 +12,7 @@ error
 exit
 fatal-signal
 wait-process
-gettext
+gettext-h
 stdbool
 strpbrk
 
@@ -30,4 +30,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-
Index: modules/file-type
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/file-type,v
retrieving revision 1.7
diff -p -u -r1.7 file-type
--- modules/file-type   22 Mar 2005 07:44:16 -0000      1.7
+++ modules/file-type   6 Jul 2005 15:54:12 -0000
@@ -7,7 +7,7 @@ lib/file-type.c
 m4/file-type.m4
 
 Depends-on:
-gettext
+gettext-h
 stat-macros
 
 configure.ac:
Index: modules/getaddrinfo
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getaddrinfo,v
retrieving revision 1.2
diff -p -u -r1.2 getaddrinfo
--- modules/getaddrinfo 4 Dec 2004 19:00:46 -0000       1.2
+++ modules/getaddrinfo 6 Jul 2005 15:54:12 -0000
@@ -10,7 +10,7 @@ m4/sockpfaf.m4
 
 Depends-on:
 restrict
-gettext
+gettext-h
 stdbool
 
 configure.ac:
Index: modules/getopt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getopt,v
retrieving revision 1.7
diff -p -u -r1.7 getopt
--- modules/getopt      22 Sep 2004 15:11:04 -0000      1.7
+++ modules/getopt      6 Jul 2005 15:54:12 -0000
@@ -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
-
Index: modules/gettext
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/gettext,v
retrieving revision 1.9
diff -p -u -r1.9 gettext
--- modules/gettext     23 Mar 2005 20:46:11 -0000      1.9
+++ modules/gettext     6 Jul 2005 15:54:12 -0000
@@ -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
-
Index: modules/human
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/human,v
retrieving revision 1.7
diff -p -u -r1.7 human
--- modules/human       21 Mar 2005 22:07:25 -0000      1.7
+++ modules/human       6 Jul 2005 15:54:12 -0000
@@ -13,7 +13,7 @@ m4/uintmax_t.m4
 m4/human.m4
 
 Depends-on:
-gettext
+gettext-h
 argmatch
 error
 xstrtol
Index: modules/javacomp
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/javacomp,v
retrieving revision 1.1
diff -p -u -r1.1 javacomp
--- modules/javacomp    28 Jan 2005 12:08:30 -0000      1.1
+++ modules/javacomp    6 Jul 2005 15:54:12 -0000
@@ -19,7 +19,7 @@ sh-quote
 safe-read
 xalloc
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_JAVACOMP
Index: modules/javaexec
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/javaexec,v
retrieving revision 1.1
diff -p -u -r1.1 javaexec
--- modules/javaexec    26 Jan 2005 17:01:02 -0000      1.1
+++ modules/javaexec    6 Jul 2005 15:54:12 -0000
@@ -17,7 +17,7 @@ pathname
 xalloc
 xallocsa
 error
-gettext
+gettext-h
 
 configure.ac:
 gt_JAVAEXEC
Index: modules/mkdir-p
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mkdir-p,v
retrieving revision 1.1
diff -p -u -r1.1 mkdir-p
--- modules/mkdir-p     2 Jun 2005 20:41:08 -0000       1.1
+++ modules/mkdir-p     6 Jul 2005 15:54:12 -0000
@@ -10,7 +10,7 @@ m4/mkdir-p.m4
 Depends-on:
 alloca
 chown
-gettext
+gettext-h
 save-cwd
 dirname
 error
Index: modules/obstack
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/obstack,v
retrieving revision 1.8
diff -p -u -r1.8 obstack
--- modules/obstack     22 Sep 2004 15:11:04 -0000      1.8
+++ modules/obstack     6 Jul 2005 15:54:12 -0000
@@ -10,7 +10,7 @@ m4/stdint_h.m4
 m4/uintmax_t.m4
 
 Depends-on:
-gettext
+gettext-h
 exit
 exitfail
 
Index: modules/openat
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/openat,v
retrieving revision 1.2
diff -p -u -r1.2 openat
--- modules/openat      2 May 2005 05:29:35 -0000       1.2
+++ modules/openat      6 Jul 2005 15:54:12 -0000
@@ -8,7 +8,7 @@ m4/openat.m4
 
 Depends-on:
 save-cwd
-gettext
+gettext-h
 error
 exitfail
 extensions
Index: modules/pagealign_alloc
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/pagealign_alloc,v
retrieving revision 1.2
diff -p -u -r1.2 pagealign_alloc
--- modules/pagealign_alloc     3 Mar 2005 16:39:16 -0000       1.2
+++ modules/pagealign_alloc     6 Jul 2005 15:54:12 -0000
@@ -11,7 +11,7 @@ Depends-on:
 error
 exit
 getpagesize
-gettext
+gettext-h
 xalloc
 
 configure.ac:
Index: modules/pipe
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/pipe,v
retrieving revision 1.4
diff -p -u -r1.4 pipe
--- modules/pipe        11 Nov 2004 09:29:44 -0000      1.4
+++ modules/pipe        6 Jul 2005 15:54:12 -0000
@@ -12,7 +12,7 @@ wait-process
 error
 exit
 fatal-signal
-gettext
+gettext-h
 stdbool
 strpbrk
 
Index: modules/quotearg
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/quotearg,v
retrieving revision 1.6
diff -p -u -r1.6 quotearg
--- modules/quotearg    6 May 2005 17:22:45 -0000       1.6
+++ modules/quotearg    6 Jul 2005 15:54:12 -0000
@@ -10,7 +10,7 @@ m4/quotearg.m4
 
 Depends-on:
 xalloc
-gettext
+gettext-h
 stdbool
 
 configure.ac:
Index: modules/regex
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/regex,v
retrieving revision 1.8
diff -p -u -r1.8 regex
--- modules/regex       20 Dec 2004 04:25:22 -0000      1.8
+++ modules/regex       6 Jul 2005 15:54:12 -0000
@@ -8,7 +8,7 @@ m4/regex.m4
 
 Depends-on:
 alloca
-gettext
+gettext-h
 restrict
 
 configure.ac:
Index: modules/rpmatch
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/rpmatch,v
retrieving revision 1.4
diff -p -u -r1.4 rpmatch
--- modules/rpmatch     22 Sep 2004 15:11:04 -0000      1.4
+++ modules/rpmatch     6 Jul 2005 15:54:12 -0000
@@ -6,7 +6,7 @@ lib/rpmatch.c
 m4/rpmatch.m4
 
 Depends-on:
-gettext
+gettext-h
 regex
 
 configure.ac:
Index: modules/unicodeio
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/unicodeio,v
retrieving revision 1.5
diff -p -u -r1.5 unicodeio
--- modules/unicodeio   22 Sep 2004 15:11:04 -0000      1.5
+++ modules/unicodeio   6 Jul 2005 15:54:12 -0000
@@ -8,7 +8,7 @@ m4/unicodeio.m4
 
 Depends-on:
 iconv
-gettext
+gettext-h
 localcharset
 error
 
Index: modules/userspec
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/userspec,v
retrieving revision 1.12
diff -p -u -r1.12 userspec
--- modules/userspec    6 May 2005 17:22:45 -0000       1.12
+++ modules/userspec    6 Jul 2005 15:54:12 -0000
@@ -13,7 +13,7 @@ posixver
 xalloc
 xstrtol
 strdup
-gettext
+gettext-h
 stdbool
 
 configure.ac:
Index: modules/version-etc
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/version-etc,v
retrieving revision 1.5
diff -p -u -r1.5 version-etc
--- modules/version-etc 4 Oct 2004 20:17:39 -0000       1.5
+++ modules/version-etc 6 Jul 2005 15:54:12 -0000
@@ -6,7 +6,7 @@ lib/version-etc.h
 lib/version-etc.c
 
 Depends-on:
-gettext
+gettext-h
 
 configure.ac:
 
Index: modules/wait-process
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/wait-process,v
retrieving revision 1.2
diff -p -u -r1.2 wait-process
--- modules/wait-process        22 Sep 2004 15:11:04 -0000      1.2
+++ modules/wait-process        6 Jul 2005 15:54:12 -0000
@@ -12,7 +12,7 @@ fatal-signal
 error
 exit
 xalloc
-gettext
+gettext-h
 stdbool
 
 configure.ac:
Index: modules/xalloc-die
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/xalloc-die,v
retrieving revision 1.2
diff -p -u -r1.2 xalloc-die
--- modules/xalloc-die  22 Sep 2004 15:11:04 -0000      1.2
+++ modules/xalloc-die  6 Jul 2005 15:54:12 -0000
@@ -7,7 +7,7 @@ lib/xalloc-die.c
 Depends-on:
 xalloc
 error
-gettext
+gettext-h
 exitfail
 
 configure.ac:
Index: modules/xmemcoll
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/xmemcoll,v
retrieving revision 1.5
diff -p -u -r1.5 xmemcoll
--- modules/xmemcoll    22 Sep 2004 15:11:04 -0000      1.5
+++ modules/xmemcoll    6 Jul 2005 15:54:12 -0000
@@ -7,7 +7,7 @@ lib/xmemcoll.c
 
 Depends-on:
 memcoll
-gettext
+gettext-h
 error
 quotearg
 exitfail
Index: modules/xsetenv
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/xsetenv,v
retrieving revision 1.2
diff -p -u -r1.2 xsetenv
--- modules/xsetenv     22 Sep 2004 15:11:04 -0000      1.2
+++ modules/xsetenv     6 Jul 2005 15:54:12 -0000
@@ -10,7 +10,7 @@ Depends-on:
 setenv
 error
 exit
-gettext
+gettext-h
 
 configure.ac:
 
@@ -25,4 +25,3 @@ GPL
 
 Maintainer:
 Bruno Haible
-