Changeset 11134

Timestamp:

08/05/08 16:09:34 (4 months ago)

Author:

vboxsync

Message:

don't build the Qt3 stuff for .deb and .rpms anymore

Files:

• trunk/configure (modified) (6 diffs)
• trunk/debian/rules (modified) (2 diffs)

trunk/configure

@@ -34 +34 @@
-WITH_XPCOM=1
-WITH_LIBIDL=1
-
+3
-WITH_QT4=1
-WITH_SDL=1
@@ -1717 +1717 @@
-      ;;
-    --disable-qt)
-
+3
-      WITH_QT4=0
+      ;;
+    --disable-qt3)
+      WITH_QT3=0
-      ;;
-    --disable-qt4)
@@ -1749 +1752 @@
-      WITH_SDL_TTF=0
-      WITH_X11=0
-
+3
-      WITH_QT4=0
-      ;;
@@ -1853 +1856 @@
-  # (Qt3 builds for Intel Macs are usually not threaded or for X11. And they
-  #  don't contain our patches, which means the result isn't really usable.)
-
+3
-  # No Qt4 for OSE yet.
-  [ $OSE -ge 1 ] && WITH_QT4=0
@@ -1862 +1865 @@
-# emit disable directives corresponding to any --disable-xxx options.
-[ $WITH_XPCOM -eq 0 ]   && cnf_append "VBOX_WITH_MAIN" ""
- -eq 0 
+3 -eq 0
-[ $WITH_QT4 -eq 0   ]   && cnf_append "VBOX_WITH_QT4GUI" ""
-[ $WITH_SDL_TTF -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
@@ -1890 +1893 @@
-[ $WITH_X11 -eq 1    ] && check_x
-[ $WITH_X11 -eq 1    ] && check_xcursor
- -eq 1 
+3 -eq 1
-[ $WITH_QT4 -eq 1    ] && check_qt4
-

trunk/debian/rules

@@ -72 +72 @@
-debian/configure-stamp:
-        dh_testdir
-
+--disable-qt3 
-            $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) $(if \
-            $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) $(if \
@@ -179 +179 @@
-        mv $(archdir)/VBoxAddIF.sh $(prefix)/usr/bin/VBoxTAP
-        for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
-3 VirtualBox
+
-            VBoxHeadless; do \
-            mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done