* asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname.

* w32-pth.c, w32-pth.h: New.

* Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because
under W32 we need the w32 pth code from jnlib.

* misc.c (setup_pinentry_env) [W32]: Disabled.

3 files changed, 12 insertions, 3 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index 02f0014e8..c1e445e4e 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-07  Werner Koch  <[email protected]>
+
+	* Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because
+	under W32 we need the w32 pth code from jnlib.
+
+	* misc.c (setup_pinentry_env) [W32]: Disabled.
+
 2004-12-06  Werner Koch  <[email protected]>
 
 	* gpgsm.c (run_protect_tool) [_WIN32]: Disabled.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 0cb96c57f..ff4524fc7 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -51,8 +51,9 @@ gpgsm_SOURCES = \
 	certreqgen.c 
 
 
-gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a ../common/libcommon.a \
-               $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(KSBA_LIBS) -lgpg-error \
+gpgsm_LDADD = $(LIBASSUAN_LIBS) ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
+               ../common/libcommon.a \
+               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) -lgpg-error \
 	       $(LIBINTL)
 
 
diff --git a/sm/misc.c b/sm/misc.c
index bfe8191fd..36c4dda70 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -38,6 +38,7 @@
 void
 setup_pinentry_env (void)
 {
+#ifndef HAVE_W32_SYSTEM
   char *lc;
 
   if (opt.display)
@@ -75,6 +76,6 @@ setup_pinentry_env (void)
   else if ( (lc = setlocale (LC_MESSAGES, "")) )
     setenv ("LC_MESSAGES", lc, 1);
 #endif
-
+#endif /*!HAVE_W32_SYSTEM*/
 }