2007-09-07 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 6 Sep 2007 22:41:11 +0000 (22:41 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 6 Sep 2007 22:41:11 +0000 (22:41 +0000)
commit8e3aeae8050a065ae08ef6b98b85b6f4b22c84b4
tree76ba1f472f9a1156a3b2af3d6c9e3b591f77eb3a
parent772b8bfead46f2b20f85eda28ab713911cb88d09
2007-09-07  Marcus Brinkmann  <marcus@g10code.de>

* configure.ac: Check for C++, Qt and support --enable-w32-qt.
* m4/pkg.m4: New file.

gpgme/
2007-09-07  Marcus Brinkmann  <marcus@g10code.de>

* kdpipeiodevice.h, kdpipeiodevice.cpp, moc_kdpipeiodevice.cpp,
kdpipeiodevice.moc, w32-qt-io.c: New files.
* Makefile.am (ltlib_gpgme_extra): Rename to ltlib_gpgme_glib.
(ltlib_gpgme_qt): New variable.
(lib_LTLIBRARIES): Add $(ltlib_gpgme_qt).
(libgpgme_qt_la_SOURCES): New variable.
(AM_CPPFLAGS): Add @QT4_CORE_INCLUDES@
(AM_CFLAGS): Add @QT4_CORE_CFLAGS@.
(libgpgme_qt_la_LDFLAGS, libgpgme_qt_la_DEPENDENCIES)
(libgpgme_qt_la_LIBADD): New variables.
* sema.h (struct critsect_s): Rename "private" to "priv" to make
C++ users happy.  Change users.
* posix-sema.c (_gpgme_sema_cs_enter, _gpgme_sema_cs_leave)
(_gpgme_sema_cs_destroy): Likewise.
* w32-sema.c (critsect_init, _gpgme_sema_cs_enter)
(_gpgme_sema_cs_leave, _gpgme_sema_cs_destroy): Likewise.
* w32-glib-io.c (gpgme_get_giochannel): Change return type to
void*.
(gpgme_get_fdptr): New function.
* w32-io.c (gpgme_get_fdptr): New function
* gpgme.def: Add gpgme_get_fdptr.
16 files changed:
trunk/ChangeLog
trunk/configure.ac
trunk/gpgme/ChangeLog
trunk/gpgme/Makefile.am
trunk/gpgme/gpgme.def
trunk/gpgme/kdpipeiodevice.cpp [new file with mode: 0644]
trunk/gpgme/kdpipeiodevice.h [new file with mode: 0644]
trunk/gpgme/kdpipeiodevice.moc [new file with mode: 0644]
trunk/gpgme/moc_kdpipeiodevice.cpp [new file with mode: 0644]
trunk/gpgme/posix-sema.c
trunk/gpgme/sema.h
trunk/gpgme/w32-glib-io.c
trunk/gpgme/w32-io.c
trunk/gpgme/w32-qt-io.cpp [new file with mode: 0644]
trunk/gpgme/w32-sema.c
trunk/m4/pkg.m4 [new file with mode: 0644]