xserver-kdrive_1.4.0.90: fix AC_SUBST in configure.ac

 - AC_SUBST is documented to only take one variable
 - was breaking with autotools_2.63
 - bump PR

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
new file mode 100644 (file)
index 0000000..110a2a5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.4.0.90/configure.ac
+===================================================================
+--- xorg-server-1.4.0.90.orig/configure.ac     2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.4.0.90/configure.ac  2009-06-06 23:47:54.000000000 +0200
+@@ -1962,7 +1962,9 @@
+ 
+ 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/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index fe0335d..0b347aa 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
@@ -26,6 +26,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://pkgconfig_fix.patch;patch=1 \
         file://no_xkb.patch;patch=1;pnum=0 \
        file://xorg-1.4-kdrive-rotation.patch;patch=1 \
+       file://split_multiple_AC_SUBST.patch;patch=1 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"