incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179069 - /incubator/ooo/trunk/main/configure.in
Date Wed, 05 Oct 2011 07:05:05 GMT
Author: hdu
Date: Wed Oct  5 07:05:04 2011
New Revision: 1179069

URL: http://svn.apache.org/viewvc?rev=1179069&view=rev
Log:
fix Qt4/Kde4 detection in configure (author=ariel)

Modified:
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1179069&r1=1179068&r2=1179069&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Oct  5 07:05:04 2011
@@ -6480,12 +6480,12 @@ if test "$test_kde4" = "yes" -a "$ENABLE
    qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
    
-   kde_incdirs="/usr/include $x_includes"
-   kde_libdirs="/usr/lib $x_libraries"
+   kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
+   kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
    
    if test "$build_cpu" = "x86_64" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
    fi
 
    if test -n "$KDE4DIR" ; then
@@ -6532,10 +6532,13 @@ if test "$test_kde4" = "yes" -a "$ENABLE
    fi
 
    dnl Check for Meta Object Compiler
-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+   AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] )
+   MOC4="$MOCQT4"
    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".])
+      AC_PATH_PROG( MOC4, moc, no, [$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".])
+      fi
    fi
 
    dnl Check for KDE4 headers



Mime
View raw message