Changeset 8056 in vbox

Timestamp:

Apr 16, 2008 5:59:57 PM (17 years ago)

Author:

vboxsync

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

29734

Message:

configure: build the Qt4 GUI but not the Qt3 GUI on Darwin

File:

• trunk/configure (modified) (7 diffs)

trunk/configure

@@ -35 +35 @@
 WITH_LIBIDL=1
 WITH_QT=1
+WITH_QT4=1
 WITH_SDL=1
 WITH_SDL_TTF=1
@@ -1233 +1234 @@
 #        cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4"
 #        cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`"
-        if [ "$OS" != "darwin" ]; then
+        if [ "$OS" = "darwin" ]; then
+          cnf_append "VBOX_WITH_QT4GUI" "1"
+        else
           test_header "Qt4 devtools"
           for q in $QT4DIR; do
@@ -1568 +1571 @@
     --disable-qt)
       WITH_QT=0
+      WITH_QT4=0
       ;;
     --disable-alsa)
@@ -1596 +1600 @@
       WITH_X11=0
       WITH_QT=0
+      WITH_QT4=0
       ;;
     --ose)
@@ -1691 +1696 @@
 fi
 
+if [ "$OS" = "darwin" ]; then
+  WITH_QT=
+  WITH_QT4=1
+  BUILD_LIBXSLT=1
+  BUILD_LIBXML2=1
+fi
+
 # emit disable directives corresponding to any --disable-xxx options.
 [ $WITH_XPCOM -eq 0 ]   && cnf_append "VBOX_WITH_MAIN" ""
-[ $WITH_QT -eq 0 ]      && cnf_append "VBOX_WITH_QTGUI" ""
+[ $WITH_QT -eq 0    ]   && cnf_append "VBOX_WITH_QTGUI" ""
+[ $WITH_QT4 -eq 0   ]   && cnf_append "VBOX_WITH_QT4GUI" ""
 [ $WITH_SDL_TTF -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
 
@@ -1708 +1721 @@
 # the libraries
 [ "$OS" != "darwin"  ] && check_pthread
-# build libxml2 on Darwin in every case
-[ "$OS" != "darwin"  ] || BUILD_LIBXML2=1
 [ $WITH_XPCOM  -eq 1 ] && check_libxml2
-# build libxslt on Darwin in every case
-[ "$OS" != "darwin"  ] || BUILD_LIBXSLT=1
 [ $WITH_XPCOM  -eq 1 ] && check_libxslt
 [ $WITH_LIBIDL -eq 1 ] && check_libidl
@@ -1724 +1733 @@
 [ $WITH_X11 -eq 1    ] && check_x
 [ $WITH_X11 -eq 1    ] && check_xcursor
-[ $WITH_QT -eq 1 ] && [ "$OS" != "darwin" ] && check_qt3
-[ $WITH_QT -eq 1     ] && check_qt4
+[ $WITH_QT -eq 1     ] && check_qt3
+[ $WITH_QT4 -eq 1    ] && check_qt4
 
 # Linux-specific