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

[Lubos Lunak]

 configure.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7c19c13c179cf21906453ddbb3d27c51e35b4136
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Oct 15 19:48:39 2010 +0200

    first try to find moc in the Qt3/Qt4 location where the libs are
    
    now it's possible to build with both KDE3 and KDE4 support
    without having to set up anything specially

diff --git a/configure.in b/configure.in
index 636515e..7bd0f65 100644
--- a/configure.in
+++ b/configure.in
@@ -6600,7 +6600,7 @@ your Qt installation by exporting QTDIR before running "configure".])
     fi
 
     dnl Check for Meta Object Compiler
-    AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
+    AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
     if test "$MOC" = "no" ; then
         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QTDIR before running "configure".])
@@ -6736,7 +6736,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    fi
 
    dnl Check for Meta Object Compiler
-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+   AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$PATH:$QT4DIR/bin] )
    if test "$MOC4" = "no" ; then
       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running "configure".])
commit fb7048a7c5cc8da412fd4d8406ccbdc5a7f657c1
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Oct 15 19:48:24 2010 +0200

    check for KDE3-specific files in the KDE3 configure check

diff --git a/configure.in b/configure.in
index 8956246..636515e 100644
--- a/configure.in
+++ b/configure.in
@@ -6566,8 +6566,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     dnl What to test
     qt_test_include="qstyle.h"
     qt_test_library="libqt-mt.so"
-    kde_test_include="ksharedptr.h"
-    kde_test_library="libkdeui.so"
+    kde_test_include="kapp.h"
+    kde_test_library="libDCOP.so"
 
     dnl Check for Qt headers
     AC_MSG_CHECKING([for Qt headers])