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, 0 insertions, 45 deletions

diff --git a/assuan/README.1st b/assuan/README.1st
deleted file mode 100644
index 46f1bb05..00000000
--- a/assuan/README.1st
+++ /dev/null
@@ -1,45 +0,0 @@
-This is a modified copy of the libassuan library.  Don't modify it,
-but instead modify the original Assuan library and merge the changes
-back into this copy.
-
-The changes to the original libassuan, that have to preserved when
-updating this directory, are:
-
-* Makefile.am
-** Build the library with libtool as a convenience library, which can
-   be linked into the shared library GPGME.
-** Do not install the library or the header file.
-** Define -D_ASSUAN_IN_GPGME_BUILD_ASSUAN to wrap some POSIX functions
-   with ATH replacements.
-
-* assuan.h
-** Preserve the block between "Begin/End GPGME specific modifications".
-   In particular make sure that
-     #define _ASSUAN_EXT_SYM_PREFIX _gpgme_
-     #define _ASSUAN_NO_PTH 
-     #define _ASSUAN_NO_FIXED_SIGNALS 
-     #define _ASSUAN_USE_DOUBLE_FORK
-   are defined.  This puts all exported Assuan functions in the _gpgme
-   namespace.  It also wraps all system functions that are wrapped by
-   GNU Pth to _gpgme wrappers.
-
-* assuan-io-pth.c
-  We don't need this file as GPGME doesn't use sendmsg and recvmsg.
-  If it would, we would need to pick up the W32 implementation.
-
-* assuan-io.c
-** _assuan_simple_read() and _assuan_simple_write() must always use
-   read()/write() (which actually translates to _gpgme_io_read() and
-   _gpgme_io_write()).  _assuan_close must always() use close() (which
-   translates to _gpgme_io_close()).
-
-
- Copyright 2004, 2007 g10 Code GmbH
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.