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

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

2 files changed, 33 insertions, 2 deletions

diff --git a/meta/packages/gnome/gnome-settings-daemon/configurefix.patch b/meta/packages/gnome/gnome-settings-daemon/configurefix.patch
new file mode 100644
index 0000000000..01b4f64191
--- /dev/null
+++ b/meta/packages/gnome/gnome-settings-daemon/configurefix.patch
@@ -0,0 +1,30 @@
+Index: gnome-settings-daemon-2.26.1/configure.ac
+===================================================================
+--- gnome-settings-daemon-2.26.1.orig/configure.ac      2009-09-16 22:57:31.000000000 +0100
++++ gnome-settings-daemon-2.26.1/configure.ac   2009-09-16 22:58:45.000000000 +0100
+@@ -133,9 +133,6 @@
+ #
+ AC_DEFUN([AC_CHECK_X_HEADERS], [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -148,15 +145,9 @@
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+ 
+-  if test \! -z "$includedir" ; then
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+-  if test \! -z "$libdir" ; then
+-    LDFLAGS="$LDFLAGS -L$libdir"
+-  fi
+   # note: $X_LIBS includes $x_libraries
+   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
+ 
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 \