2009-10-20 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 20 Oct 2009 15:39:15 +0000 (15:39 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 20 Oct 2009 15:39:15 +0000 (15:39 +0000)
commite782b1ab06a2d3325bc487c28ab678c95d9675b3
tree87aacb82e59e4d7d8b60d2c55d66b12eed01af2e
parent06e22ca339ab409ff114db43c2b1986c762b0b10
2009-10-20  Marcus Brinkmann  <marcus@g10code.de>

* 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  <marcus@g10code.de>

* 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.
33 files changed:
ChangeLog
Makefile.am
assuan/ChangeLog [deleted file]
assuan/Makefile.am [deleted file]
assuan/README.1st [deleted file]
assuan/assuan-buffer.c [deleted file]
assuan/assuan-client.c [deleted file]
assuan/assuan-connect.c [deleted file]
assuan/assuan-defs.h [deleted file]
assuan/assuan-handler.c [deleted file]
assuan/assuan-inquire.c [deleted file]
assuan/assuan-io.c [deleted file]
assuan/assuan-listen.c [deleted file]
assuan/assuan-logging.c [deleted file]
assuan/assuan-pipe-connect.c [deleted file]
assuan/assuan-pipe-server.c [deleted file]
assuan/assuan-socket-connect.c [deleted file]
assuan/assuan-socket-server.c [deleted file]
assuan/assuan-socket.c [deleted file]
assuan/assuan-uds.c [deleted file]
assuan/assuan-util.c [deleted file]
assuan/assuan.h [deleted file]
assuan/mkerrors [deleted file]
configure.ac
m4/libassuan.m4 [new file with mode: 0644]
src/ChangeLog
src/Makefile.am
src/engine-assuan.c
src/engine-backend.h
src/engine-gpgsm.c
src/posix-io.c
src/priv-io.h
src/util.h