From: Marcus Brinkmann Date: Tue, 22 Jan 2002 16:36:08 +0000 (+0000) Subject: 2002-01-22 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~1130 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=906bb9b22f27c6065dd4798877cf1ab4e681e870;p=gpgme.git 2002-01-22 Marcus Brinkmann * 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 2e3f4f1..1dc060c 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,12 @@ +2002-01-22 Marcus Brinkmann + + * 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 * gpgme.h (GpgmePassphraseCb): Change type of R_HD from void* to diff --git a/trunk/gpgme/Makefile.am b/trunk/gpgme/Makefile.am index 8f7343a..e6c1dd7 100644 --- 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 ea54dd2..b66ceaa 100644 --- 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);