From d84d632583c1c61180d40ce9b91f185160ab02d6 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 6 Apr 2004 10:01:04 +0000
Subject: * configure.ac: Require libgcrypt 1.1.94. Introduce PACKAGE_GT and
 set it to gnupg2.

* gpg-agent.c (main): Use new libgcrypt thread library register
scheme.

* Makevars (DOMAIN): Init from PACKAGE_GT
---
 g10/g10.c        |  6 +++---
 g10/gpgv.c       |  6 +++---
 g10/passphrase.c | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'g10')

diff --git a/g10/g10.c b/g10/g10.c
index 2fbc7e625..006e88ad2 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -783,12 +783,12 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
     setlocale( LC_ALL, "" );
-    bindtextdomain( PACKAGE, LOCALEDIR );
-    textdomain( PACKAGE );
+    bindtextdomain( PACKAGE_GT, LOCALEDIR );
+    textdomain( PACKAGE_GT );
 #endif
 #endif
 }
diff --git a/g10/gpgv.c b/g10/gpgv.c
index d020bda62..9bd954c6f 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -116,7 +116,7 @@ static void
 i18n_init(void)
 {
 #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
+    set_gettext_file( PACKAGE_GT );
 #else
 #ifdef ENABLE_NLS
 #ifdef HAVE_LC_MESSAGES
@@ -125,8 +125,8 @@ i18n_init(void)
 #else
        setlocale( LC_ALL, "" );
 #endif
-    bindtextdomain( PACKAGE, LOCALEDIR );
-    textdomain( PACKAGE );
+    bindtextdomain( PACKAGE_GT, LOCALEDIR );
+    textdomain( PACKAGE_GT );
 #endif
 #endif
 }
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 27ffcad97..986070a16 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -649,8 +649,8 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
     }
   
 #ifdef ENABLE_NLS
-  /* The Assuan agent protol requires us to trasnmit utf-8 strings */
-  orig_codeset = bind_textdomain_codeset (PACKAGE, NULL);
+  /* The Assuan agent protocol requires us to transmit utf-8 strings */
+  orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
 #ifdef HAVE_LANGINFO_CODESET
   if (!orig_codeset)
     orig_codeset = nl_langinfo (CODESET);
@@ -658,7 +658,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
   if (orig_codeset)
     { /* We only switch when we are able to restore the codeset later. */
       orig_codeset = xstrdup (orig_codeset);
-      if (!bind_textdomain_codeset (PACKAGE, "utf-8"))
+      if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
         orig_codeset = NULL; 
     }
 #endif
@@ -765,7 +765,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
           free_public_key( pk );
 #ifdef ENABLE_NLS
           if (orig_codeset)
-            bind_textdomain_codeset (PACKAGE, orig_codeset);
+            bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
           xfree (orig_codeset);
           return pw;
@@ -857,7 +857,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
           free_public_key( pk );
 #ifdef ENABLE_NLS
           if (orig_codeset)
-            bind_textdomain_codeset (PACKAGE, orig_codeset);
+            bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
           xfree (orig_codeset);
           return pw;
@@ -880,7 +880,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
  failure:
 #ifdef ENABLE_NLS
   if (orig_codeset)
-    bind_textdomain_codeset (PACKAGE, orig_codeset);
+    bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
 #endif
   xfree (atext);
   if ( fd != -1 )
-- 
cgit v1.2.3