Changeset 10291 in vbox for trunk/configure

Timestamp:

Jul 5, 2008 7:56:10 PM (17 years ago)

Author:

vboxsync

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

32903

Message:

configure: detect Sun Qt4 libs

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -143 +143 @@
 strip_l()
 {
-  echo "$1"|$KBUILD_SED 's|-l\([^ ]\+\)|\1|g; s|-[^l]\([^ ]\+\)||g; s|^ ||; s| *$||g'
+  echo "$1"|$KBUILD_SED 's|-l\([^ ]\+\)|\1|g; s|^-[^l][^ ]*||g; s| -[^l][^ ]*||g; s|^ ||; s| *$||g'
 }
 
 strip_L()
 {
-  echo "$1"|$KBUILD_SED 's|-L\([^ ]\+\)|\1|g; s|-[^L]\([^ ]\+\)||g; s|^ ||; s| *$||g'
+  echo "$1"|$KBUILD_SED 's|-L\([^ ]\+\)|\1|g; s|^-[^L][^ ]*||g; s| -[^L][^ ]*||g; s|^ ||; s| *$||g'
 }
 
 strip_I()
 {
-  echo "$1"|$KBUILD_SED 's|-I\([^ ]\+\)|\1|g; s|-[^I]\([^ ]\+\)||g; s|^ ||; s| *$||g'
+  echo "$1"|$KBUILD_SED 's|-I\([^ ]\+\)|\1|g; s|^-[^I][^ ]*||g; s| -[^I][^ ]*||g; s|^ ||; s| *$||g'
 }
 
@@ -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
-      if test_execute; then
+      if test_execute_path "`strip_L "$LIBQT4"`"; then
         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