2002-01-22 Marcus Brinkmann <marcus@g10code.de>

	* engine-gpgsm.c (_gpgme_gpgsm_release): Call assuan_disconnect,
	not assuan_pipe_disconnect.

	* Makefile.am (libgpgme_la_LIBADD): Change to link assuan and
	jnlib (needed by assuan) statically into libgpgme.  Linking a
	static library into a shared library this way is not portable.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 2e3f4f1052332e24910de43632cc516d6bc85faf..1dc060cb4e75e081efe07b0cc9888e08c712d9ef 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * engine-gpgsm.c (_gpgme_gpgsm_release): Call assuan_disconnect,
+       not assuan_pipe_disconnect.
+
+       * Makefile.am (libgpgme_la_LIBADD): Change to link assuan and
+       jnlib (needed by assuan) statically into libgpgme.  Linking a
+       static library into a shared library this way is not portable.
+
 2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.h (GpgmePassphraseCb): Change type of R_HD from void* to

diff --git a/trunk/gpgme/Makefile.am b/trunk/gpgme/Makefile.am
index 8f7343afc44f127d48f7b4508c66441bfbc7161b..e6c1dd75d64afecf1a651d1be30c99a59d10509d 100644 (file)
--- a/trunk/gpgme/Makefile.am
+++ b/trunk/gpgme/Makefile.am
@@ -31,7 +31,7 @@ libgpgme_la_LDFLAGS = -version-info \
       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 if BUILD_ASSUAN
 AM_CPPFLAGS = -I$(top_srcdir)/assuan
-libgpgme_la_LIBADD = -L../assuan -lassuan
+libgpgme_la_LIBADD = ../assuan/libassuan.a ../jnlib/libjnlib.a
 endif
 
 libgpgme_la_SOURCES = \

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index ea54dd2dcaf32709eaf78703797769550ff3f590..b66ceaa6732af5bfc5c7e6f7ea1bd25d16cece1d 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -236,7 +236,7 @@ _gpgme_gpgsm_release (GpgsmObject gpgsm)
   if (gpgsm->message_fd != -1)
     _gpgme_io_close (gpgsm->message_fd);
 
-  assuan_pipe_disconnect (gpgsm->assuan_ctx);
+  assuan_disconnect (gpgsm->assuan_ctx);
 
   xfree (gpgsm->colon.attic.line);
   xfree (gpgsm->command);