From ccd69b9c62e801eff5b79a5107552aac4435725f Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 5 Dec 2006 12:10:55 +0000
Subject: [PATCH] Remove useless options

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1004 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/dbus/dbus-native_1.0.1.bb | 5 ++---
 meta/packages/dbus/dbus_1.0.1.bb        | 9 +++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta/packages/dbus/dbus-native_1.0.1.bb b/meta/packages/dbus/dbus-native_1.0.1.bb
index 7e5e4df9dd..1176a56ef6 100644
--- a/meta/packages/dbus/dbus-native_1.0.1.bb
+++ b/meta/packages/dbus/dbus-native_1.0.1.bb
@@ -18,9 +18,8 @@ inherit autotools pkgconfig gettext native
 
 S = "${WORKDIR}/dbus-${PV}"
 
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+                 --disable-doxygen-docs --with-xml=expat --without-x"
 
 do_stage () {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus_1.0.1.bb b/meta/packages/dbus/dbus_1.0.1.bb
index 4b25589435..7a1a8a6ef9 100644
--- a/meta/packages/dbus/dbus_1.0.1.bb
+++ b/meta/packages/dbus/dbus_1.0.1.bb
@@ -8,13 +8,11 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
 	   file://dbus-1.init \
 	   file://fix-segfault.patch;patch=1 \
-           file://cross.patch;patch=1 \
+	   file://cross.patch;patch=1 \
 	   file://fix-install-daemon.patch;patch=1"
 
 inherit autotools pkgconfig update-rc.d gettext
@@ -43,9 +41,8 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 }
 
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+                 --disable-doxygen-docs --with-xml=expat --without-x"
 
 do_stage () {
 	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}