Changeset 58353 in vbox for trunk/configure

Timestamp:

Oct 21, 2015 9:43:18 AM (10 years ago)

Author:

vboxsync

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

103558

Message:

configure: fix to correctly detect moc prefix.

File:

• trunk/configure (modified) (2 diffs)

trunk/configure

@@ -1592 +1592 @@
           if [ "$foundqt4" = "2" ]; then
             cnf_append "VBOX_WITH_QT4_SUN" "1"
-          elif [ "$foundqt4" = "3" ]; then
-            cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
-            cnf_append "PATH_SDK_QT4" "$TOOLQT4"
-            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
-            return
+          fi
+          if ! [ "$foundqt4" = "3" ]; then
+            TOOLQT4BIN="$TOOLQT4/bin"
           fi
           test_header "Qt4 devtools"
           # try it with a suffix, some platforms use that
-          if which_wrapper "$TOOLQT4/bin/moc-qt4" > /dev/null; then
+          if which_wrapper "$TOOLQT4BIN/moc-qt4" > /dev/null; then
             QT4BINSUFF="-qt4"
           else
             QT4BINSUFF=""
           fi
-          moc_ver=`$TOOLQT4/bin/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
+          moc_ver=`$TOOLQT4BIN/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
           if [ $? -ne 0 ]; then
             log_failure "moc$QT4BINSUFF not working"
@@ -1613 +1611 @@
             cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
             cnf_append "PATH_SDK_QT4" "$TOOLQT4"
-            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4/bin"
+            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
             [ -n "$QT4BINSUFF" ] && cnf_append "TOOL_QT4_BIN_SUFF" "$QT4BINSUFF"
           fi