Changeset 10291

Timestamp:

07/05/08 21:56:10 (5 months ago)

Author:

vboxsync

Message:

configure: detect Sun Qt4 libs

Files:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -143 +143 @@
-strip_l()
-{
--[^l]\([^ ]\+\)
+^-[^l][^ ]*||g; s| -[^l][^ ]*
-}
-
-strip_L()
-{
--[^L]\([^ ]\+\)
+^-[^L][^ ]*||g; s| -[^L][^ ]*
-}
-
-strip_I()
-{
--[^I]\([^ ]\+\)
+^-[^I][^ ]*||g; s| -[^I][^ ]*
-}
-
@@ -236 +236 @@
-  if [ $rc -ne 0 ]; then
-    fail $1
+    return 1
+  fi
+  echo >> $LOG
+  echo >> $LOG
+  return 0
+}
+
+# Execute a compiled test binary
+test_execute_path()
+{
+  echo "executing the binary (LD_LIBRARY_PATH=$1)" >> $LOG
+  LD_LIBRARY_PATH=$1 ./.tmp_out > .test_execute.log
+  rc=$?
+  cat .test_execute.log | tee -a $LOG
+  if [ $rc -ne 0 ]; then
+    fail
-    return 1
-  fi
@@ -1276 +1292 @@
-      for q in $QT4DIR; do
-        INCQT4="$q/include $q/include/QtCore"
-        LIBQT4="-L$q/lib -lQtCore"
-        FLGQT4="-DQT_SHARED"
-        I_INCQT4=`prefix_I "$INCQT4"`
+        LIBQT4="-L$q/lib -lVBoxQtCore"
+        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
+          foundqt4=2
+          break;
+        fi
+        LIBQT4="-L$q/lib -lQtCore"
-        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
-          foundqt4=1
@@ -1303 +1324 @@
-    [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
-    if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
-
+_path "`strip_L "$LIBQT4"`"
-        if [ "$OS" != "darwin" ]; then
-          # strip .../QtCore as we add components ourself
@@ -1309 +1330 @@
-          cnf_append "VBOX_PATH_QT4_INCLUDE" "$INCQT4"
-          cnf_append "VBOX_PATH_QT4_LIB" "`strip_L "$LIBQT4"`"
+          if [ "$foundqt4" = "2" ]; then
+            cnf_append "VBOX_WITH_QT4_SUN" "1"
+          fi
-          test_header "Qt4 devtools"
-          for q in $QT4DIR; do