xserver-kdrive-xomap: Bandaid for configure issues and modern autotools

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

2 files changed, 16 insertions, 0 deletions

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap/configfix.patch b/meta/packages/xorg-xserver/xserver-kdrive-xomap/configfix.patch
new file mode 100644
index 0000000000..ada8f3a788
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap/configfix.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.1.99.3/configure.ac
+===================================================================
+--- xorg-server-1.1.99.3.orig/configure.ac      2010-06-09 12:52:26.000000000 +0100
++++ xorg-server-1.1.99.3/configure.ac   2010-06-09 12:52:51.000000000 +0100
+@@ -1731,7 +1731,9 @@
+ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H"
+ AC_SUBST([DIX_CFLAGS])
+ 
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+ 
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index bbec18fbd7..d1e955f9d3 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -24,6 +24,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1
         file://button_only.patch;patch=1 \
         file://calibrateext.patch;patch=1 \
         file://disable-xkb.patch;patch=1 \
+        file://configfix.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1"
 #       file://kdrive-evdev.patch;patch=1  \
 #       file://kdrive-use-evdev.patch;patch=1  \