[ooo-build-commit] .: 2 commits - configure.in

[Lubos Lunak]

 configure.in |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 5605844ac60ac0c6adcb3abc901b1ad097b5415b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Sep 21 13:46:22 2010 +0200

    use $QTDIR and $KDEDIR for looking for Qt4/KDE4 too
    
    These are the "official" vars even for 4.x versions, so try them too.
    Use 4.x-specific headers and libs to make sure the right version is
    found.

diff --git a/configure.in b/configure.in
index b67a8ca..92d59b1 100644
--- a/configure.in
+++ b/configure.in
@@ -6613,6 +6613,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
 
+   if test -n "$QTDIR" ; then
+      qt_incdirs="$QTDIR/include $qt_incdirs"
+      if test "$build_cpu" != "x86_64" ; then
+         qt_libdirs="$QTDIR/lib $qt_libdirs"
+      else
+         qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
+      fi
+   fi
    if test -n "$QT4DIR" ; then
       qt_incdirs="$QT4DIR/include $qt_incdirs"
       if test "$build_cpu" != "x86_64" ; then
@@ -6622,6 +6630,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
       fi
    fi
 
+   if test -n "$KDEDIR" ; then
+      kde_incdirs="$KDEDIR/include $kde_incdirs"
+      if test "$build_cpu" != "x86_64" ; then
+         kde_libdirs="$KDEDIR/lib $kde_libdirs"
+      else
+         kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
+      fi
+   fi
    if test -n "$KDE4DIR" ; then
       kde_incdirs="$KDE4DIR/include $kde_incdirs"
       if test "$build_cpu" != "x86_64" ; then
@@ -6633,8 +6649,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
 
    qt_test_include="Qt/qobject.h"
    qt_test_library="libQtCore.so"
-   kde_test_include="ksharedptr.h"
-   kde_test_library="libkdeui.so"
+   kde_test_include="kwindowsystem.h"
+   kde_test_library="libkcmutils.so"
    
    AC_MSG_CHECKING([for Qt4 headers])
    qt_header_dir="no"
commit e2223165aa465c3cad64ba4e271bf7b2e5619330
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Sep 21 13:35:05 2010 +0200

    use $QT4DIR properly

diff --git a/configure.in b/configure.in
index 6fc0a61..b67a8ca 100644
--- a/configure.in
+++ b/configure.in
@@ -6602,7 +6602,7 @@ KDE4_CFLAGS=""
 KDE4_LIBS=""
 MOC4="moc"
 if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
+   qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
    
    kde_incdirs="/usr/include $x_includes"
@@ -6613,6 +6613,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
 
+   if test -n "$QT4DIR" ; then
+      qt_incdirs="$QT4DIR/include $qt_incdirs"
+      if test "$build_cpu" != "x86_64" ; then
+         qt_libdirs="$QT4DIR/lib $qt_libdirs"
+      else
+         qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs"
+      fi
+   fi
+
    if test -n "$KDE4DIR" ; then
       kde_incdirs="$KDE4DIR/include $kde_incdirs"
       if test "$build_cpu" != "x86_64" ; then