[Libreoffice-commits] .: 2 commits - configure.in set_soenv.in

[Lubos Lunak]

 configure.in |   12 ++++++++++++
 set_soenv.in |    3 +++
 2 files changed, 15 insertions(+)

New commits:
commit d051ad5a82d33a10bb196b11d83e9e9c89acdc63
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Oct 14 17:54:14 2010 +0200

    support for Qt's event loop Glib integration

diff --git a/configure.in b/configure.in
index d6794ff..1ce2cf6 100644
--- a/configure.in
+++ b/configure.in
@@ -6642,6 +6642,9 @@ dnl ===================================================================
 KDE4_CFLAGS=""
 KDE4_LIBS=""
 MOC4="moc"
+KDE_GLIB_CFLAGS=""
+KDE_GLIB_LIBS=""
+KDE_HAVE_GLIB=""
 if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
@@ -6761,10 +6764,18 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
    KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+
+   # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
+   PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
+    [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)
 AC_SUBST(KDE4_LIBS)
 AC_SUBST(MOC4)
+AC_SUBST(KDE_GLIB_CFLAGS)
+AC_SUBST(KDE_GLIB_LIBS)
+AC_SUBST(KDE_HAVE_GLIB)
 
 dnl ===================================================================
 dnl Test for the enabling the lockdown pieces
diff --git a/set_soenv.in b/set_soenv.in
index d837e2f..0631665 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1664,6 +1664,9 @@ ToFile( "ENABLE_KDE4",       "@ENABLE_KDE4@",      "e" );
 ToFile( "KDE4_CFLAGS",       "@KDE4_CFLAGS@",      "e" );
 ToFile( "KDE4_LIBS",         "@KDE4_LIBS@",        "e" );
 ToFile( "MOC4",              "@MOC4@",             "e" );
+ToFile( "KDE_GLIB_CFLAGS",   "@KDE_GLIB_CFLAGS@",  "e" );
+ToFile( "KDE_GLIB_LIBS",     "@KDE_GLIB_LIBS@",    "e" );
+ToFile( "KDE_HAVE_GLIB",     "@KDE_HAVE_GLIB@",    "e" );
 ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
commit 4df1a4e0efb81bffbc940dcb938f8dfdeb98241a
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Oct 13 15:15:24 2010 +0200

    set PKG_CONFIG_PATH for extra Qt4 locations
    
    If also extra paths are used and pkg-config is used later, then I suppose
    those paths need to be made available.

diff --git a/configure.in b/configure.in
index 3dbb359..d6794ff 100644
--- a/configure.in
+++ b/configure.in
@@ -6712,6 +6712,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    for lib_dir in $qt_libdirs ; do
       if test -r "$lib_dir/$qt_test_library" ; then
          qt_lib_dir="$lib_dir"
+         PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
          break
       fi
    done