# HG changeset patch # User Paul Eggert # Date 1120665527 0 # Node ID cd3c62f1332e73e6f0760e206776e0b55b50f22c # Parent 111f78a515163b413b4305d34200d040aa4b2152 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2005-07-06 Paul Eggert + + 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 * gnulib-tool (func_import): Add support for 'public domain' license. diff --git a/MODULES.html.sh b/MODULES.html.sh --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1908,6 +1908,7 @@ 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 --- a/modules/argmatch +++ b/modules/argmatch @@ -6,7 +6,7 @@ lib/argmatch.c Depends-on: -gettext +gettext-h error quotearg quote diff --git a/modules/c-stack b/modules/c-stack --- a/modules/c-stack +++ b/modules/c-stack @@ -7,7 +7,7 @@ m4/c-stack.m4 Depends-on: -gettext +gettext-h exitfail configure.ac: @@ -24,4 +24,3 @@ Maintainer: Paul Eggert - diff --git a/modules/closeout b/modules/closeout --- a/modules/closeout +++ b/modules/closeout @@ -8,7 +8,7 @@ Depends-on: atexit -gettext +gettext-h error quotearg fpending diff --git a/modules/copy-file b/modules/copy-file --- a/modules/copy-file +++ b/modules/copy-file @@ -12,7 +12,7 @@ full-write binary-io exit -gettext +gettext-h configure.ac: gl_COPY_FILE @@ -28,4 +28,3 @@ Maintainer: Bruno Haible - diff --git a/modules/csharpcomp b/modules/csharpcomp --- a/modules/csharpcomp +++ b/modules/csharpcomp @@ -18,7 +18,7 @@ sh-quote safe-read error -gettext +gettext-h configure.ac: gt_CSHARPCOMP @@ -35,4 +35,3 @@ Maintainer: Bruno Haible - diff --git a/modules/csharpexec b/modules/csharpexec --- a/modules/csharpexec +++ b/modules/csharpexec @@ -18,7 +18,7 @@ xalloc xallocsa error -gettext +gettext-h configure.ac: gt_CSHARPEXEC @@ -36,4 +36,3 @@ Maintainer: Bruno Haible - diff --git a/modules/execute b/modules/execute --- a/modules/execute +++ b/modules/execute @@ -12,7 +12,7 @@ exit fatal-signal wait-process -gettext +gettext-h stdbool strpbrk @@ -30,4 +30,3 @@ Maintainer: Bruno Haible - diff --git a/modules/file-type b/modules/file-type --- a/modules/file-type +++ b/modules/file-type @@ -7,7 +7,7 @@ m4/file-type.m4 Depends-on: -gettext +gettext-h stat-macros configure.ac: diff --git a/modules/getaddrinfo b/modules/getaddrinfo --- a/modules/getaddrinfo +++ b/modules/getaddrinfo @@ -10,7 +10,7 @@ Depends-on: restrict -gettext +gettext-h stdbool configure.ac: diff --git a/modules/getopt b/modules/getopt --- a/modules/getopt +++ b/modules/getopt @@ -9,7 +9,7 @@ m4/getopt.m4 Depends-on: -gettext +gettext-h configure.ac: gl_GETOPT @@ -34,4 +34,3 @@ Maintainer: all, glibc - diff --git a/modules/gettext b/modules/gettext --- a/modules/gettext +++ b/modules/gettext @@ -2,7 +2,6 @@ Translate messages to user's native language. Files: -lib/gettext.h m4/codeset.m4 m4/gettext.m4 m4/glibc2.m4 @@ -35,12 +34,12 @@ 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 @@ Maintainer: Bruno Haible - diff --git a/modules/gettext-h b/modules/gettext-h new file mode 100644 --- /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 --- a/modules/human +++ b/modules/human @@ -13,7 +13,7 @@ m4/human.m4 Depends-on: -gettext +gettext-h argmatch error xstrtol diff --git a/modules/javacomp b/modules/javacomp --- a/modules/javacomp +++ b/modules/javacomp @@ -19,7 +19,7 @@ safe-read xalloc error -gettext +gettext-h configure.ac: gt_JAVACOMP diff --git a/modules/javaexec b/modules/javaexec --- a/modules/javaexec +++ b/modules/javaexec @@ -17,7 +17,7 @@ xalloc xallocsa error -gettext +gettext-h configure.ac: gt_JAVAEXEC diff --git a/modules/mkdir-p b/modules/mkdir-p --- a/modules/mkdir-p +++ b/modules/mkdir-p @@ -10,7 +10,7 @@ Depends-on: alloca chown -gettext +gettext-h save-cwd dirname error diff --git a/modules/obstack b/modules/obstack --- a/modules/obstack +++ b/modules/obstack @@ -10,7 +10,7 @@ m4/uintmax_t.m4 Depends-on: -gettext +gettext-h exit exitfail diff --git a/modules/openat b/modules/openat --- a/modules/openat +++ b/modules/openat @@ -8,7 +8,7 @@ Depends-on: save-cwd -gettext +gettext-h error exitfail extensions diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc --- a/modules/pagealign_alloc +++ b/modules/pagealign_alloc @@ -11,7 +11,7 @@ error exit getpagesize -gettext +gettext-h xalloc configure.ac: diff --git a/modules/pipe b/modules/pipe --- a/modules/pipe +++ b/modules/pipe @@ -12,7 +12,7 @@ error exit fatal-signal -gettext +gettext-h stdbool strpbrk diff --git a/modules/quotearg b/modules/quotearg --- a/modules/quotearg +++ b/modules/quotearg @@ -10,7 +10,7 @@ Depends-on: xalloc -gettext +gettext-h stdbool configure.ac: diff --git a/modules/regex b/modules/regex --- a/modules/regex +++ b/modules/regex @@ -8,7 +8,7 @@ Depends-on: alloca -gettext +gettext-h restrict configure.ac: diff --git a/modules/rpmatch b/modules/rpmatch --- a/modules/rpmatch +++ b/modules/rpmatch @@ -6,7 +6,7 @@ m4/rpmatch.m4 Depends-on: -gettext +gettext-h regex configure.ac: diff --git a/modules/unicodeio b/modules/unicodeio --- a/modules/unicodeio +++ b/modules/unicodeio @@ -8,7 +8,7 @@ Depends-on: iconv -gettext +gettext-h localcharset error diff --git a/modules/userspec b/modules/userspec --- a/modules/userspec +++ b/modules/userspec @@ -13,7 +13,7 @@ xalloc xstrtol strdup -gettext +gettext-h stdbool configure.ac: diff --git a/modules/version-etc b/modules/version-etc --- a/modules/version-etc +++ b/modules/version-etc @@ -6,7 +6,7 @@ lib/version-etc.c Depends-on: -gettext +gettext-h configure.ac: diff --git a/modules/wait-process b/modules/wait-process --- a/modules/wait-process +++ b/modules/wait-process @@ -12,7 +12,7 @@ error exit xalloc -gettext +gettext-h stdbool configure.ac: diff --git a/modules/xalloc-die b/modules/xalloc-die --- a/modules/xalloc-die +++ b/modules/xalloc-die @@ -7,7 +7,7 @@ Depends-on: xalloc error -gettext +gettext-h exitfail configure.ac: diff --git a/modules/xmemcoll b/modules/xmemcoll --- a/modules/xmemcoll +++ b/modules/xmemcoll @@ -7,7 +7,7 @@ Depends-on: memcoll -gettext +gettext-h error quotearg exitfail diff --git a/modules/xsetenv b/modules/xsetenv --- a/modules/xsetenv +++ b/modules/xsetenv @@ -10,7 +10,7 @@ setenv error exit -gettext +gettext-h configure.ac: @@ -25,4 +25,3 @@ Maintainer: Bruno Haible -