Changeset 57819 in vbox for trunk/configure

Timestamp:

Sep 18, 2015 9:51:10 AM (10 years ago)

Author:

vboxsync

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

102768

Message:

configure: give Qt from tools priority if present.

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -1490 +1490 @@
     fi
   else
-    if [ $QT4DIR_PKGCONFIG -eq 1 ]; then
+    if ! test -d "$PWD/tools/linux.$TARGET_MACHINE/qt" &&
+      test $QT4DIR_PKGCONFIG -eq 1; then
       # default is to use pkg-config
       if which_wrapper pkg-config > /dev/null; then
@@ -1532 +1533 @@
 }
 EOF
-      for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
+      for q in "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.* $QT4DIR; do
         INCQT4="$q/include $q/include/QtCore"
         FLGQT4="-DQT_SHARED"
@@ -1597 +1598 @@
           fi
           test_header "Qt4 devtools"
-          for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
+          for q in "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.* $QT4DIR; do
             # first try it with a suffix, some platforms use that
             if which_wrapper "$q/bin/moc-qt4" > /dev/null; then