Changeset 19452 in vbox for trunk

Timestamp:

May 6, 2009 6:16:11 PM (16 years ago)

Author:

vboxsync

Message:

configure: fix picking up qt3 tools instead of the qt4 ones on FreeBSD. they use the suffix approach there.

File:

• trunk/configure (modified) (1 diff)

trunk/configure

@@ -1425 +1425 @@
           test_header "Qt4 devtools"
           for q in $QT4DIR; do
-            if which_wrapper "$q/bin/moc" > /dev/null; then
+            # first try it with a suffix, some platforms use that
+            if which_wrapper "$q/bin/moc-qt4" > /dev/null; then
+              moc_ver=`$q/bin/moc-qt4 -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
+              if [ $? -ne 0 ]; then
+                log_failure "not found"
+                fail
+              else
+                log_success "found version $moc_ver"
+                cnf_append "VBOX_PATH_QT4" "$q"
+                cnf_append "PATH_SDK_QT4" "$q"
+                cnf_append "PATH_TOOL_QT4" "$q"
+                cnf_append "PATH_TOOL_QT4_BIN" "$q/bin"
+                cnf_append "TOOL_QT4_BIN_SUFF" "-qt4"
+                return
+              fi
+            elif which_wrapper "$q/bin/moc" > /dev/null; then
               moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
               if [ $? -ne 0 ]; then