libx11: move keysymdefdir option to .inc

(From OE-Core rev: 375cdaf2cc03a4784991999e6a302fe37678809b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb

@@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
 
-EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
+EXTRA_OECONF += "--disable-xlocale"
 CFLAGS += "-D_GNU_SOURCE"
 

meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb

@@ -18,5 +18,3 @@ RPROVIDES_${PN}-locale = "libx11-locale"
 
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
-
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"

meta/recipes-graphics/xorg-lib/libx11.inc

@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 inherit siteinfo
 
 PE = "1"
-INC_PR = "r3"
+INC_PR = "r4"
 
 PROVIDES = "virtual/libx11"
 
@@ -23,6 +23,8 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X
 FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
 FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
+
 # Almost nothing uses XCMS
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"

meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb

@@ -5,8 +5,6 @@ PR = "${INC_PR}.0"
 
 BBCLASSEXTEND = "native nativesdk"
 
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
-
 DEPENDS += "util-macros xtrans libxdmcp libxau \
             bigreqsproto xproto xextproto xcmiscproto \
             xf86bigfontproto kbproto inputproto libxcb \