From: Bruno Haible <bruno@clisp.org>
Date: Wed, 31 Aug 2005 10:35:12 +0000 (+0000)
Subject: When used in libglocale, don't declare textdomain() and bindtextdomain().
X-Git-Tag: v0.15~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647abd211d5f73a9058a1b48f0190fe2a3a1ef6b;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 6833920c1..72f646e30 100644
--- 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 9904a34ba..77db5b116 100644
--- 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 3d20e17ae..66816927b 100644
--- 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 20ebd611d..dd91102f0 100644
--- 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 f85e80c6a..b0f874b92 100644
--- 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 1743a2782..b824076cc 100644
--- 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.