aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-06-26 13:48:44 +0000
committerWerner Koch <[email protected]>2007-06-26 13:48:44 +0000
commita7fe86bc02f5b33cfc3c48a4d2e15d3ff94ffa16 (patch)
tree56d859ed11c7dc6faec9df7d6c55fbdf3b334b87 /sm
parentFixed a problem in estream-printf.c. (diff)
downloadgnupg-a7fe86bc02f5b33cfc3c48a4d2e15d3ff94ffa16.tar.gz
gnupg-a7fe86bc02f5b33cfc3c48a4d2e15d3ff94ffa16.zip
More W32 related changes
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog5
-rw-r--r--sm/Makefile.am4
-rw-r--r--sm/gpgsm.c1
3 files changed, 8 insertions, 2 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index a57af3cfb..ab9b89977 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-26 Werner Koch <[email protected]>
+
+ * gpgsm.c (main): Call gnupg_rl_initialize.
+ * Makefile.am (gpgsm_LDADD): Add LIBREADLINE and libgpgrl.a.
+
2007-06-25 Werner Koch <[email protected]>
* gpgsm.c (check_special_filename): Use translate_sys2libc_fd and
diff --git a/sm/Makefile.am b/sm/Makefile.am
index e56064812..8171af54b 100644
--- a/sm/Makefile.am
+++ b/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.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index d3be015c7..08f08049b 100644
--- a/sm/gpgsm.c
+++ b/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