When used in libglocale, don't declare textdomain() and bindtextdomain().

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 6833920c1067a60414fae2127663730a2fedc0b2..72f646e304d9386a0e41ffea27b0215586ac1cf0 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (intl/libgnuintl.h_vms, intl/libgnuintl.h.msvc-static,
+       intl/libgnuintl.h.msvc-shared): Remove the IN_LIBGLOCALE conditional.
+
 2008-08-28  Bruno Haible  <bruno@clisp.org>
 
        * glocale: Remove directory, moved to separate project.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 9904a34ba16c09d201b80c4ec251d00b7714211c..77db5b1169b29a6f5a7fcce135b5ebb180b43c02 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -116,7 +116,8 @@ config.h_vms: config.h.in ../version.sh
 # KEEP_CRTL_SETLOCALE tells it to not override the native locale support.
 
 intl/libgnuintl.h_vms: intl/libgnuintl.h.in
-       sed -e 's,@''HAVE_POSIX_PRINTF''@,1,g ' \
+       sed -e '/IN_LIBGLOCALE/d' \
+           -e 's,@''HAVE_POSIX_PRINTF''@,1,g ' \
            -e 's,@''HAVE_ASPRINTF''@,0,g' \
            -e 's,@''HAVE_SNPRINTF''@,0,g' \
            -e 's,@''HAVE_WPRINTF''@,1,g' \
@@ -178,14 +179,16 @@ config.h.msvc: config.h.in ../version.sh
          < $(srcdir)/config.h.in > $@
 
 intl/libgnuintl.h.msvc-static: intl/libgnuintl.h.in
-       sed -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
+       sed -e '/IN_LIBGLOCALE/d' \
+           -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
            -e 's,@''HAVE_ASPRINTF''@,0,g' \
            -e 's,@''HAVE_SNPRINTF''@,0,g' \
            -e 's,@''HAVE_WPRINTF''@,1,g' \
          < $(srcdir)/intl/libgnuintl.h.in > $@
 
 intl/libgnuintl.h.msvc-shared: intl/libgnuintl.h.in windows/dllexport.h
-       sed -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
+       sed -e '/IN_LIBGLOCALE/d' \
+           -e 's,@''HAVE_POSIX_PRINTF''@,0,g ' \
            -e 's,@''HAVE_ASPRINTF''@,0,g' \
            -e 's,@''HAVE_SNPRINTF''@,0,g' \
            -e 's,@''HAVE_WPRINTF''@,1,g' \

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 3d20e17aef379fe231c18c765a59492097f3a735..66816927ba222f23fb0877572cc1fb09e8cfd114 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * libgnuintl.h.in: Add IN_LIBGLOCALE conditional.
+       * Makefile.in (libgnuintl.h, libintl.h): Remove the IN_LIBGLOCALE
+       conditional.
+       * dcigettext.c [IN_LIBGLOCALE]: Include also <libintl.h>, for
+       bindtextdomain().
+
 2005-08-25  Bruno Haible  <bruno@clisp.org>
 
        * libintl.glibc: Update from current glibc.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 20ebd611de5ae10a92fd36d9251aea4efe51e494..dd91102f010c897768971d5bca52cff473aef06d 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -265,7 +265,8 @@ ref-del.sed: $(srcdir)/ref-del.sin
 INCLUDES = -I. -I$(srcdir) -I..
 
 libgnuintl.h: $(srcdir)/libgnuintl.h.in
-       sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+       sed -e '/IN_LIBGLOCALE/d' \
+           -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
            -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
            -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
            -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
@@ -276,7 +277,8 @@ libgnuintl.h: $(srcdir)/libgnuintl.h.in
          > libgnuintl.h
 
 libintl.h: $(srcdir)/libgnuintl.h.in
-       sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+       sed -e '/IN_LIBGLOCALE/d' \
+           -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
            -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
            -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
            -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index f85e80c6a6ff0c99661a585b8f6f46990b3fff61..b0f874b929601b3c6390ec7c1b0b9fe5102caf7a 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -96,6 +96,9 @@ extern int errno;
 #ifdef _LIBC
 # include <libintl.h>
 #else
+# ifdef IN_LIBGLOCALE
+#  include <libintl.h>
+# endif
 # include "libgnuintl.h"
 #endif
 #include "hash-string.h"

diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.h.in
index 1743a27825658c32f60105404c91c950c98f6215..b824076cc01ada9f1feccbbd280d93ae4ce8c735 100644 (file)
--- a/gettext-runtime/intl/libgnuintl.h.in
+++ b/gettext-runtime/intl/libgnuintl.h.in
@@ -243,6 +243,8 @@ extern char *dcngettext (const char *__domainname,
 #endif
 
 
+#ifndef IN_LIBGLOCALE
+
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
@@ -297,6 +299,8 @@ extern char *bind_textdomain_codeset (const char *__domainname,
        _INTL_ASM (libintl_bind_textdomain_codeset);
 #endif
 
+#endif /* IN_LIBGLOCALE */
+
 
 /* Support for format strings with positions in *printf(), following the
    POSIX/XSI specification.