diff options
| author | Marcus Brinkmann <[email protected]> | 2007-09-06 22:41:11 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-09-06 22:41:11 +0000 |
| commit | becf580f6163889de683500957a0a7cfceb7ed47 (patch) | |
| tree | c3c9b04114345915dc05ca837d274aae4570d28f /configure.ac | |
| parent | 2007-09-03 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-becf580f6163889de683500957a0a7cfceb7ed47.tar.gz gpgme-becf580f6163889de683500957a0a7cfceb7ed47.zip | |
2007-09-07 Marcus Brinkmann <[email protected]>
* configure.ac: Check for C++, Qt and support --enable-w32-qt.
* m4/pkg.m4: New file.
gpgme/
2007-09-07 Marcus Brinkmann <[email protected]>
* 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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 923792c0..a21aaa9b 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ AH_VERBATIM([_REENTRANT], #endif]) AC_PROG_CC +AC_PROG_CXX AC_SUBST(LIBGPGME_LT_CURRENT) AC_SUBST(LIBGPGME_LT_AGE) @@ -162,6 +163,13 @@ AC_ARG_ENABLE(w32-glib, build_w32_glib=$enableval) AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes) +build_w32_qt=no +PKG_CHECK_MODULES(QT4_CORE, QtCore) +AC_ARG_ENABLE(w32-qt, + AC_HELP_STRING([--enable-w32-qt], [build GPGME Qt for W32]), + build_w32_qt=$enableval) +AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes) + AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes") AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes") |