← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure
612
612
 
613
613
 
614
614
#
615
 
# Check for libxml2, needed by VBoxSettings
 
615
# Check for libxml2, needed by VBoxSettings and Runtime.
616
616
# 2.6.24 is known to NOT work, 2.6.26 is known to work (there is no 2.6.25 release)
617
617
#
618
618
check_libxml2()
2114
2114
    --disable-pulse)
2115
2115
      [ $WITH_PULSE -eq 1 ] && WITH_PULSE=0
2116
2116
      ;;
 
2117
    --enable-pulse)
 
2118
      WITH_PULSE=2
 
2119
      ;;
2117
2120
    --disable-dbus)
2118
2121
      [ $WITH_DBUS -eq 1 ] && WITH_DBUS=0
2119
2122
      ;;
2297
2300
 
2298
2301
# the libraries
2299
2302
[ "$OS" != "darwin"  ] && check_pthread
2300
 
[ $WITH_XPCOM  -eq 1 ] && check_libxml2
 
2303
check_libxml2
2301
2304
[ $WITH_XPCOM  -eq 1 ] && check_libxslt
2302
2305
[ $WITH_LIBIDL -eq 1 ] && check_libidl
2303
2306
check_ssl
2334
2337
  fi
2335
2338
  if [ $WITH_PULSE -eq 1 ]; then
2336
2339
    check_pulse
2337
 
  else
 
2340
  elif [ $WITH_PULSE -eq 0 ]; then
2338
2341
    cnf_append "VBOX_WITH_PULSE" ""
2339
2342
  fi
2340
2343
  if [ $WITH_DBUS -eq 0 ]; then