Changeset 57930 in vbox

Timestamp:

Sep 28, 2015 3:14:09 PM (10 years ago)

Author:

vboxsync

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

102902

Message:

configure: remove pkg-config support for Qt4. We can't use it to detect the Qt directory anyway to detect the location of the Qt4 dev tools

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"
-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"
 DEVDIR="`cd \`dirname $0\`; pwd`/tools"
@@ -1507 +1501 @@
     fi
   else
-    if test $QT4DIR_PKGCONFIG -eq 1; then
-      # default is to use pkg-config
-      if which_wrapper pkg-config > /dev/null; then
-        # this braindead path is necessary for mdv2008.1
-        qt4_ver=`\
-            PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
-            pkg-config QtCore --modversion 2>> $LOG`
-        if [ $? -ne 0 ]; then
-          log_failure "QtCore not found"
-          fail
-        else
-          FLGQT4=`\
-              PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
-              pkg-config QtCore --cflags`
-          INCQT4=`strip_I "$FLGQT4"`
-          LIBQT4=`\
-              PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
-              PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-              pkg-config QtCore --libs`
-          test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal &&
-            test_execute_path "`strip_L "$LIBQT4"`" nofatal && foundqt4=1
-        fi
-      else
-        log_failure "pkg-config not found"
-        fail
-      fi
-    fi
     if test -z "${foundqt4}"; then
       # do it the old way (e.g. user has specified QT4DIR)
@@ -2423 +2390 @@
     --with-qt-dir=*|--with-qt4-dir=*)
       QT4DIR=`echo $option | cut -d'=' -f2`
-      QT4DIR_PKGCONFIG=0
       ;;
     --with-openssl-dir=*)