Make all assignments conditional and fix a missing quote

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1108 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 1ca605a..7637a0d 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -5,17 +5,17 @@ PREFERRED_VERSION_cairo ?= "1.3.10"
 PREFERRED_VERSION_pango ?= "1.15.2"
 PREFERRED_VERSION_gtk+ ?= "2.10.6"
 
-PREFERRED_VERSION_dbus = "1.0.1"
-PREFERRED_VERSION_dbus-native = "1.0.1"
+PREFERRED_VERSION_dbus ?= "1.0.1"
+PREFERRED_VERSION_dbus-native ?= "1.0.1"
 
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
-PREFERRED_VERSION_dbus-glib = "0.7.2
-PREFERRED_VERSION_dbus-glib-native = "0.7.2
+PREFERRED_VERSION_dbus-glib ?= "0.7.2"
+PREFERRED_VERSION_dbus-glib-native ?= "0.7.2"
 
 SRCDATE_gconf-dbus ?= "20061219"
 
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
-PREFERRED_VERSION_gnome-vfs = "2.16.3"
-PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
+PREFERRED_PROVIDER_gnome-vfs-plugin-dbus ?= "gnome-vfs"
 
 require conf/distro/poky.conf