Changeset 11134 in vbox for trunk

Timestamp:

Aug 5, 2008 2:09:34 PM (17 years ago)

Author:

vboxsync

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

34090

Message:

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

Location:

trunk

Files:

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

trunk/configure

@@ -34 +34 @@
 WITH_XPCOM=1
 WITH_LIBIDL=1
-WITH_QT=1
+WITH_QT3=1
 WITH_QT4=1
 WITH_SDL=1
@@ -1717 +1717 @@
       ;;
     --disable-qt)
-      WITH_QT=0
+      WITH_QT3=0
       WITH_QT4=0
+      ;;
+    --disable-qt3)
+      WITH_QT3=0
       ;;
     --disable-qt4)
@@ -1749 +1752 @@
       WITH_SDL_TTF=0
       WITH_X11=0
-      WITH_QT=0
+      WITH_QT3=0
       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.)
-  WITH_QT=0
+  WITH_QT3=0
   # 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" ""
-[ $WITH_QT -eq 0    ]   && cnf_append "VBOX_WITH_QTGUI" ""
+[ $WITH_QT3 -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" ""
@@ -1890 +1893 @@
 [ $WITH_X11 -eq 1    ] && check_x
 [ $WITH_X11 -eq 1    ] && check_xcursor
-[ $WITH_QT -eq 1     ] && check_qt3
+[ $WITH_QT3 -eq 1    ] && check_qt3
 [ $WITH_QT4 -eq 1    ] && check_qt4
 

trunk/debian/rules

@@ -72 +72 @@
 debian/configure-stamp:
         dh_testdir
-        cd $(vboxroot) && ./configure --odir=$(current)/debian $(if \
+        cd $(vboxroot) && ./configure --odir=$(current)/debian --disable-qt3 $(if \
             $(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) \
-            $(if $(HEADLESS),,VirtualBox3 VirtualBox) $(if $(ose),,VBoxVRDP) \
+            $(if $(HEADLESS),,VirtualBox) $(if $(ose),,VBoxVRDP) \
             VBoxHeadless; do \
             mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done