More W32 related changes

sm/ChangeLog

@@ -1,3 +1,8 @@
+2007-06-26  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (main): Call gnupg_rl_initialize.
+	* Makefile.am (gpgsm_LDADD): Add LIBREADLINE and libgpgrl.a.
+
 2007-06-25  Werner Koch  <wk@g10code.com>
 
 	* gpgsm.c (check_special_filename): Use translate_sys2libc_fd and

sm/Makefile.am

@@ -57,9 +57,9 @@ gpgsm_SOURCES = \
 common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
               $(libcommon) ../gl/libgnu.a
 
-gpgsm_LDADD = $(common_libs) \
+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
-              $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS) $(LIBICONV)
+              $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV)
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.

sm/gpgsm.c

@@ -736,6 +736,7 @@ main ( int argc, char **argv)
   /*mtrace();*/
 
   /* trap_unaligned ();*/
+  gnupg_rl_initialize ();
   set_strusage (my_strusage);
   gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
   /* We don't need any locking in libgcrypt unless we use any kind of