2009-10-20 Marcus Brinkmann <[email protected]>

	* configure.ac: Replace internal libassuan by external libassuan.
	* m4/libassuan.m4: New file.
	* Makefile.am (assuan): Remove variable.
	(SUBDIRS): Remove ${assuan}.
	* assuan/: Removed.

src/
2009-10-20  Marcus Brinkmann  <[email protected]>

	* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
	(gpgsm_components): Move engine-assuan.c to ...
	(assuan_components): ... this new variable.
	(main_sources): Add this new variable.
	(AM_CPPFLAGS): Remove $(assuan_cppflags).
	(AM_CFLAGS): Add @LIBASSUAN_CFLAGS@.
	(libgpgme_la_DEPENDENCIES, libgpgme_pth_la_DEPENDENCIES)
	(libgpgme_glib_la_DEPENDENCIES, libgpgme_qt_la_DEPENDENCIES)
	(libgpgme_pthread_la_DEPENDENCIES): Remove $(assuan_libobjs).
	(libgpgme_la_LIBADD, libgpgme_pth_la_LIBADD)
	(libgpgme_glib_la_LIBADD, libgpgme_qt_la_LIBADD))
	(libgpgme_pthread_la_LIBADD): Replace $(assuan_libobjs) by
	@LIBASSUAN_LIBS@.
	* priv-io.h [!HAVE_W32_SYSTEM]: Declare _gpgme_io_recvmsg,
	_gpgme_io_sendmsg, _gpgme_io_waitpid.
	* engine-backend.h: Define with [ENABLE_ASSUAN] instead
	of [ENABLE_GPGSM].
	* posix-io.c (_gpgme_io_waitpid): Make non-static.
	* util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks,
	_gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb.
	* engine-gpgsm.c: Don't map assuan error codes.  Use
	assuan_release instead of assuan_disconnect.
	(map_assuan_error): Remove function.
	(gpgsm_new): Use new assuan context interface.
	* engine-assuan.c: Use assuan_release instead of
	assuan_disconnect.
	(llass_new): Use new assuan context interface.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 08ae388d..74cde99c 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -161,7 +161,7 @@ llass_cancel (void *engine)
 
   if (llass->assuan_ctx)
     {
-      assuan_disconnect (llass->assuan_ctx);
+      assuan_release (llass->assuan_ctx);
       llass->assuan_ctx = NULL;
     }
 
@@ -213,7 +213,10 @@ llass_new (void **engine, const char *file_name, const char *home_dir)
         llass->opt.gpg_agent = 1;
     }
 
-  err = assuan_socket_connect (&llass->assuan_ctx, file_name, 0);
+  err = assuan_new (&llass->assuan_ctx);
+  if (err)
+    goto leave;
+  err = assuan_socket_connect (llass->assuan_ctx, file_name, 0);
   if (err)
     goto leave;