Changeset 57803 in vbox for trunk/configure

Timestamp:

Sep 17, 2015 11:05:12 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102746

Message:

configure: small Qt detection fixes.

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -153 +153 @@
 PYTHONDIR="/usr /usr/local"
 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr /usr/local"
-QT4DIR_PKGCONFIG=1
+if pkg-config QtCore 2>/dev/null; then
+ QT4DIR_PKGCONFIG=1
+else
+ QT4DIR_PKGCONFIG=0
+fi
 QT4UIC3DIR="/usr/bin"
 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
@@ -1528 +1532 @@
 }
 EOF
-      for q in $QT4DIR `pwd`/tools/linux."$TARGET_MACHINE"/qt/v4.8.*; do
+      for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
         INCQT4="$q/include $q/include/QtCore"
         FLGQT4="-DQT_SHARED"
@@ -1593 +1597 @@
           fi
           test_header "Qt4 devtools"
-          for q in $QT4DIR; do
+          for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
             # first try it with a suffix, some platforms use that
             if which_wrapper "$q/bin/moc-qt4" > /dev/null; then