diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:04:24 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:05:56 +0100 |
| commit | 6fbd87113576540ff42a03f4b08857bd066f9161 (patch) | |
| tree | 2c944c25e4ad6cf4717c35fcf3daca13da8a9f59 /configure.ac | |
| parent | ba3f6551ce47c690267485f3f6f2b6004aae435c (diff) | |
re-add support for KDE4 Qt+glib eventloop intergration
The necessary build stuff was apparently silently dropped during gbuild
conversion and never noticed.
Change-Id: Ib1f530b92618a9d4f11c54818e984f737abaa283
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 89b55e055330..a017909c145c 100644 --- a/configure.ac +++ b/configure.ac @@ -10278,9 +10278,13 @@ int main(int argc, char **argv) { CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) - # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled + # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled. + # Sets also KDE_GLIB_CFLAGS/KDE_GLIB_LIBS if successful. PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4], - [KDE_HAVE_GLIB=1], + [ + KDE_HAVE_GLIB=1 + AC_DEFINE(KDE_HAVE_GLIB,1) + ], AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]])) fi AC_SUBST(KDE4_CFLAGS) @@ -11722,6 +11726,7 @@ AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffi AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) +AC_CONFIG_HEADERS([config_host/config_kde4.h]) AC_CONFIG_HEADERS([config_host/config_mingw.h]) AC_CONFIG_HEADERS([config_host/config_telepathy.h]) AC_CONFIG_HEADERS([config_host/config_typesizes.h]) |