gnome-settings-daemon: Fix problems with bad paths creeping into the configure paths

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb b/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb
index 82216834af..cb216b2753 100644
--- a/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb
+++ b/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME settings daemon"
 LICENSE = "GPL"
 DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl"
 
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 
@@ -10,9 +10,10 @@ SRC_URI += "file://desktop-moblin.patch;patch=1 \
             file://gnome-settings-daemon-fix-gthread.patch;patch=1 \
             file://mount-plugin.patch;patch=1 \
             file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \
+            file://configurefix.patch;patch=1 \
             file://mojito-cleanup.patch;patch=1"
 
-EXTRA_OECONF = "--disable-esd"
+EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
 ASNEEDED = ""
 
 FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \