Changeset 9671 in vbox for trunk

Timestamp:

Jun 13, 2008 7:43:52 AM (17 years ago)

Author:

vboxsync

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

32007

Message:

configure: allow the user to specify the QT4 directory

File:

• trunk/configure (modified) (4 diffs)

trunk/configure

@@ -69 +69 @@
 QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
+QT4DIR_PKGCONFIG=1
 QT4UIC3DIR="/usr/bin"
 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
@@ -1251 +1252 @@
     fi
   else
-    if which_wrapper pkg-config > /dev/null; then
-      qt4_ver=`pkg-config QtCore --modversion 2>> $LOG`
-      if [ $? -ne 0 ]; then
-        log_failure "not found"
-  #      fail
+    if [ $QT4DIR_PKGCONFIG -eq 1 ]; then
+      # default is to use pkg-config
+      if which_wrapper pkg-config > /dev/null; then
+        qt4_ver=`pkg-config QtCore --modversion 2>> $LOG`
+        if [ $? -ne 0 ]; then
+          log_failure "not found"
+    #      fail
+        else
+          FLGQT4=`pkg-config QtCore --cflags`
+          INCQT4=`strip_I "$FLGQT4"`
+          LIBQT4=`pkg-config QtCore --libs`
+          foundqt4=1
+        fi
       else
-        FLGQT4=`pkg-config QtCore --cflags`
-        INCQT4=`strip_I "$FLGQT4"`
-        LIBQT4=`pkg-config QtCore --libs`
-        foundqt4=1
+        log_failure "pkg-config not found"
+# not yet
+#       fail
       fi
     else
-      log_failure "pkg-config not found"
-# not yet
-#     fail
+      # do it the old way (e.g. user has specified QT4DIR)
+      for q in $QT4DIR; do
+        INCQT4="$q/include $q/include/QtCore"
+        LIBQT4="-L$q/lib -lQtCore"
+        FLGQT4="-DQT_SHARED"
+        I_INCQT4=`prefix_I "$INCQT4"`
+        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then
+          foundqt4=1
+          break;
+        fi
+      done
     fi
   fi
@@ -1611 +1627 @@
   --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
   --with-qt-dir=DIR        directory for Qt3 headers/libraries [$QT3DIR]
-  --with-qt4-dir=DIR       directory for Qt4 headers/libraries [$QT4DIR]
+  --with-qt4-dir=DIR       directory for Qt4 headers/libraries [pkgconfig]
 
 Build type:
@@ -1656 +1672 @@
     --with-qt4-dir=*)
       QT4DIR=`echo $option | cut -d'=' -f2`
+      QT4DIR_PKGCONFIG=0
       ;;
     --with-iasl=*)