Attachment 3395 Details for Bug 4461 – Better fix putting xkb data dir, bin dir and compiled output dir in kbproto.pc

[patch] Better fix putting xkb data dir, bin dir and compiled output dir in kbproto.pc

pkgconfig-plus-configure-flags-solution.patch (text/plain), 25.80 KB, created by Bill Crawford on 2005-09-24 22:38:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Crawford

Created: 2005-09-24 22:38:29 UTC

Size: 25.80 KB

patch

obsolete

>Index: proto/KB/configure.ac
>===================================================================
>RCS file: /cvs/xorg/proto/KB/configure.ac,v
>retrieving revision 1.6
>diff -u -r1.6 configure.ac
>--- proto/KB/configure.ac	29 Jul 2005 21:22:55 -0000	1.6
>+++ proto/KB/configure.ac	25 Sep 2005 05:35:55 -0000
>@@ -1,7 +1,18 @@
> AC_PREREQ([2.57])
>-AC_INIT([KBProto], [1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
>+AC_INIT([KBProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
> AM_INIT_AUTOMAKE([foreign dist-bzip2])
> 
>+AC_ARG_WITH([xkbdatadir], [ --with-xkbdatadir=PATH ],
>+	[ xkbdatadir="$withval" ], [ xkbdatadir="$datadir/X11/xkb" ])
>+AC_ARG_WITH([xkbbindir], [ --with-xkbbindir=PATH ],
>+	[ xkbbindir="$withval" ], [ xkbbindir="$bindir" ])
>+AC_ARG_WITH([xkmoutputdir], [ --with-xkmoutputdir=PATH ],
>+	[ xkmoutputdir="$withval" ], [ xkmoutputdir="$localstatedir/lib/xkb" ])
>+
>+AC_SUBST([xkbbindir])
>+AC_SUBST([xkbdatadir])
>+AC_SUBST([xkmoutputdir])
>+
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([Makefile
>Index: proto/KB/kbproto.pc.in
>===================================================================
>RCS file: /cvs/xorg/proto/KB/kbproto.pc.in,v
>retrieving revision 1.1
>diff -u -r1.1 kbproto.pc.in
>--- proto/KB/kbproto.pc.in	9 May 2005 18:20:05 -0000	1.1
>+++ proto/KB/kbproto.pc.in	25 Sep 2005 05:35:55 -0000
>@@ -2,6 +2,9 @@
> exec_prefix=@exec_prefix@
> libdir=@libdir@
> includedir=@includedir@
>+xkbdatadir=@xkbdatadir@
>+xkbbindir=@xkbbindir@
>+xkmoutputdir=@xkmoutputdir@
>  
> Name: KBProto
> Description: KB extension headers
>Index: data/xkbdata/configure.ac
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/configure.ac,v
>retrieving revision 1.3
>diff -u -r1.3 configure.ac
>--- data/xkbdata/configure.ac	29 Jul 2005 21:22:39 -0000	1.3
>+++ data/xkbdata/configure.ac	25 Sep 2005 05:35:55 -0000
>@@ -1,17 +1,30 @@
> # $XdotOrg: $
> 
> AC_PREREQ([2.57])
>-AC_INIT(xkbdata, [0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xkbdata)
>+AC_INIT(xkbdata, [0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xkbdata)
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
> 
> AM_CONFIG_HEADER(config.h)
> 
>+PKG_PROG_PKG_CONFIG
>+
>+AC_MSG_CHECKING([for kbproto >= 1.1])
>+PKG_CHECK_EXISTS([kbproto >= 1.1], AC_MSG_RESULT([yes]), [dnl
>+	AC_MSG_RESULT([no])
>+	AC_MSG_ERROR([kbproto >= 1.1 required for xkbdatadir variable])dnl
>+])
>+
> AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
> if test x$XKBCOMP = xnot_found ; then
> 	AC_ERROR([xkbcomp is required to install the xkb data files])
> fi
> 
>+AC_ARG_WITH([xkbdatadir],	[  --with-xkbdatadir=PATH ],
>+	    [ xkbdatadir="$withval" ],
>+	    [ xkbdatadir="`$PKG_CONFIG --variable=xkbdatadir kbproto`" ])
>+AC_SUBST(xkbdatadir)
>+
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([
>Index: data/xkbdata/compat/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/compat/Makefile.am,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile.am
>--- data/xkbdata/compat/Makefile.am	21 Sep 2005 19:22:05 -0000	1.5
>+++ data/xkbdata/compat/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_compatdir = $(datadir)/X11/xkb/compat
>+xkbdata_compatdir = $(xkbdatadir)/compat
> dist_xkbdata_compat_DATA = \
> 	accessx \
> 	basic \
>@@ -19,7 +19,6 @@
> 	xfree86 \
> 	xtest
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = compat.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: data/xkbdata/geometry/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/geometry/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- data/xkbdata/geometry/Makefile.am	21 Sep 2005 19:22:06 -0000	1.4
>+++ data/xkbdata/geometry/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,6 +1,6 @@
> SUBDIRS = digital sgi ibm
> 
>-xkbdata_geometrydir = $(datadir)/X11/xkb/geometry
>+xkbdata_geometrydir = $(xkbdatadir)/geometry
> dist_xkbdata_geometry_DATA = \
> 	amiga \
> 	ataritt \
>@@ -21,7 +21,6 @@
> 	sun \
> 	winbook
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = geometry.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: data/xkbdata/geometry/digital/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/geometry/digital/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/geometry/digital/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/geometry/digital/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_geometry_digitaldir = $(datadir)/X11/xkb/geometry/digital
>+xkbdata_geometry_digitaldir = $(xkbdatadir)/geometry/digital
> dist_xkbdata_geometry_digital_DATA = \
> 	lk \
> 	pc \
>Index: data/xkbdata/geometry/ibm/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/geometry/ibm/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/geometry/ibm/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/geometry/ibm/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_geometry_ibmdir = $(datadir)/X11/xkb/geometry/ibm
>+xkbdata_geometry_ibmdir = $(xkbdatadir)/geometry/ibm
> dist_xkbdata_geometry_ibm_DATA = \
> 	thinkpad 
>Index: data/xkbdata/geometry/sgi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/geometry/sgi/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/geometry/sgi/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/geometry/sgi/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_geometry_sgidir = $(datadir)/X11/xkb/geometry/sgi
>+xkbdata_geometry_sgidir = $(xkbdatadir)/geometry/sgi
> dist_xkbdata_geometry_sgi_DATA = \
> 	indigo \
> 	indy \
>Index: data/xkbdata/keycodes/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keycodes/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- data/xkbdata/keycodes/Makefile.am	21 Sep 2005 19:22:06 -0000	1.4
>+++ data/xkbdata/keycodes/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,6 +1,6 @@
> SUBDIRS = digital sgi
> 
>-xkbdata_keycodesdir = $(datadir)/X11/xkb/keycodes
>+xkbdata_keycodesdir = $(xkbdatadir)/keycodes
> dist_xkbdata_keycodes_DATA = \
> 	aliases \
> 	amiga \
>@@ -16,7 +16,6 @@
> 	xfree86 \
> 	xfree98
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = keycodes.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: data/xkbdata/keycodes/digital/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keycodes/digital/Makefile.am,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile.am
>--- data/xkbdata/keycodes/digital/Makefile.am	21 Sep 2005 19:22:06 -0000	1.2
>+++ data/xkbdata/keycodes/digital/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_keycodes_digitaldir = $(datadir)/X11/xkb/keycodes/digital
>+xkbdata_keycodes_digitaldir = $(xkbdatadir)/keycodes/digital
> dist_xkbdata_keycodes_digital_DATA = \
> 	lk \
> 	pc 
>Index: data/xkbdata/keycodes/sgi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keycodes/sgi/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/keycodes/sgi/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/keycodes/sgi/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_keycodes_sgidir = $(datadir)/X11/xkb/keycodes/sgi
>+xkbdata_keycodes_sgidir = $(xkbdatadir)/keycodes/sgi
> dist_xkbdata_keycodes_sgi_DATA = \
> 	indigo \
> 	indy \
>Index: data/xkbdata/keymap/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keymap/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- data/xkbdata/keymap/Makefile.am	21 Sep 2005 19:22:06 -0000	1.4
>+++ data/xkbdata/keymap/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,6 +1,6 @@
> SUBDIRS = sun digital sgi
> 
>-xkbdata_keymapdir = $(datadir)/X11/xkb/keymap
>+xkbdata_keymapdir = $(xkbdatadir)/keymap
> dist_xkbdata_keymap_DATA = \
> 	amiga \
> 	ataritt \
>@@ -10,7 +10,6 @@
> 	xfree86 \
> 	xfree98
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = keymap.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: data/xkbdata/keymap/digital/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keymap/digital/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/keymap/digital/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/keymap/digital/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_keymap_digitaldir = $(datadir)/X11/xkb/keymap/digital
>+xkbdata_keymap_digitaldir = $(xkbdatadir)/keymap/digital
> dist_xkbdata_keymap_digital_DATA = \
> 	us 
>Index: data/xkbdata/keymap/sgi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keymap/sgi/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/keymap/sgi/Makefile.am	21 Sep 2005 19:22:06 -0000	1.3
>+++ data/xkbdata/keymap/sgi/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_keymap_sgidir = $(datadir)/X11/xkb/keymap/sgi
>+xkbdata_keymap_sgidir = $(xkbdatadir)/keymap/sgi
> dist_xkbdata_keymap_sgi_DATA = \
> 	be \
> 	bg \
>Index: data/xkbdata/keymap/sun/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/keymap/sun/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/keymap/sun/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/keymap/sun/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_keymap_sundir = $(datadir)/X11/xkb/keymap/sun
>+xkbdata_keymap_sundir = $(xkbdatadir)/keymap/sun
> dist_xkbdata_keymap_sun_DATA = \
> 	de \
> 	es \
>Index: data/xkbdata/rules/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/rules/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/rules/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/rules/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_rulesdir = $(datadir)/X11/xkb/rules
>+xkbdata_rulesdir = $(xkbdatadir)/rules
> dist_xkbdata_rules_DATA = \
> 	README \
> 	sgi \
>Index: data/xkbdata/semantics/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/semantics/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/semantics/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/semantics/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_semanticsdir = $(datadir)/X11/xkb/semantics
>+xkbdata_semanticsdir = $(xkbdatadir)/semantics
> dist_xkbdata_semantics_DATA = \
> 	basic \
> 	complete \
>Index: data/xkbdata/symbols/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/Makefile.am,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile.am
>--- data/xkbdata/symbols/Makefile.am	21 Sep 2005 19:22:07 -0000	1.5
>+++ data/xkbdata/symbols/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,6 +1,6 @@
> SUBDIRS = pc macintosh sun fujitsu nec digital hp sgi sony xfree68
> 
>-xkbdata_symbolsdir = $(datadir)/X11/xkb/symbols
>+xkbdata_symbolsdir = $(xkbdatadir)/symbols
> dist_xkbdata_symbols_DATA = \
> 	al \
> 	altwin \
>@@ -116,7 +116,6 @@
> 	vn \
> 	yu
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = symbols.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: data/xkbdata/symbols/digital/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/digital/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/digital/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/symbols/digital/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_digitaldir = $(datadir)/X11/xkb/symbols/digital
>+xkbdata_symbols_digitaldir = $(xkbdatadir)/symbols/digital
> dist_xkbdata_symbols_digital_DATA = \
> 	lk \
> 	pc \
>Index: data/xkbdata/symbols/fujitsu/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/fujitsu/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/fujitsu/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/symbols/fujitsu/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_fujitsudir = $(datadir)/X11/xkb/symbols/fujitsu
>+xkbdata_symbols_fujitsudir = $(xkbdatadir)/symbols/fujitsu
> dist_xkbdata_symbols_fujitsu_DATA = \
> 	jp \
> 	us 
>Index: data/xkbdata/symbols/hp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/hp/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/hp/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/symbols/hp/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_symbols_hpdir = $(datadir)/X11/xkb/symbols/hp
>+xkbdata_symbols_hpdir = $(xkbdatadir)/symbols/hp
> dist_xkbdata_symbols_hp_DATA = \
> 	us 
>Index: data/xkbdata/symbols/macintosh/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/macintosh/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/macintosh/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/symbols/macintosh/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_macintoshdir = $(datadir)/X11/xkb/symbols/macintosh
>+xkbdata_symbols_macintoshdir = $(xkbdatadir)/symbols/macintosh
> dist_xkbdata_symbols_macintosh_DATA = \
> 	de \
> 	de_CH \
>Index: data/xkbdata/symbols/nec/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/nec/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/nec/Makefile.am	21 Sep 2005 19:22:07 -0000	1.3
>+++ data/xkbdata/symbols/nec/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_symbols_necdir = $(datadir)/X11/xkb/symbols/nec
>+xkbdata_symbols_necdir = $(xkbdatadir)/symbols/nec
> dist_xkbdata_symbols_nec_DATA = \
> 	jp 
>Index: data/xkbdata/symbols/pc/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/pc/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- data/xkbdata/symbols/pc/Makefile.am	21 Sep 2005 19:22:08 -0000	1.4
>+++ data/xkbdata/symbols/pc/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_pcdir = $(datadir)/X11/xkb/symbols/pc
>+xkbdata_symbols_pcdir = $(xkbdatadir)/symbols/pc
> dist_xkbdata_symbols_pc_DATA = \
> 	al \
> 	am \
>Index: data/xkbdata/symbols/sgi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/sgi/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/sgi/Makefile.am	21 Sep 2005 19:22:08 -0000	1.3
>+++ data/xkbdata/symbols/sgi/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_symbols_sgidir = $(datadir)/X11/xkb/symbols/sgi
>+xkbdata_symbols_sgidir = $(xkbdatadir)/symbols/sgi
> dist_xkbdata_symbols_sgi_DATA = \
> 	jp 
>Index: data/xkbdata/symbols/sony/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/sony/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/sony/Makefile.am	21 Sep 2005 19:22:08 -0000	1.3
>+++ data/xkbdata/symbols/sony/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,3 +1,3 @@
>-xkbdata_symbols_sonydir = $(datadir)/X11/xkb/symbols/sony
>+xkbdata_symbols_sonydir = $(xkbdatadir)/symbols/sony
> dist_xkbdata_symbols_sony_DATA = \
> 	us 
>Index: data/xkbdata/symbols/sun/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/sun/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/sun/Makefile.am	21 Sep 2005 19:22:08 -0000	1.3
>+++ data/xkbdata/symbols/sun/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_sundir = $(datadir)/X11/xkb/symbols/sun
>+xkbdata_symbols_sundir = $(xkbdatadir)/symbols/sun
> dist_xkbdata_symbols_sun_DATA = \
> 	se \
> 	us \
>Index: data/xkbdata/symbols/xfree68/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/symbols/xfree68/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/symbols/xfree68/Makefile.am	21 Sep 2005 19:22:08 -0000	1.3
>+++ data/xkbdata/symbols/xfree68/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_symbols_xfree68dir = $(datadir)/X11/xkb/symbols/xfree68
>+xkbdata_symbols_xfree68dir = $(xkbdatadir)/symbols/xfree68
> dist_xkbdata_symbols_xfree68_DATA = \
> 	amiga \
> 	ataritt
>Index: data/xkbdata/torture/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/torture/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- data/xkbdata/torture/Makefile.am	21 Sep 2005 19:22:08 -0000	1.3
>+++ data/xkbdata/torture/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_torturedir = $(datadir)/X11/xkb/torture
>+xkbdata_torturedir = $(xkbdatadir)/torture
> dist_xkbdata_torture_DATA = \
> 	indicator \
> 	indicator1 \
>Index: data/xkbdata/types/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/data/xkbdata/types/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- data/xkbdata/types/Makefile.am	21 Sep 2005 19:22:08 -0000	1.4
>+++ data/xkbdata/types/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -1,4 +1,4 @@
>-xkbdata_typesdir = $(datadir)/X11/xkb/types
>+xkbdata_typesdir = $(xkbdatadir)/types
> dist_xkbdata_types_DATA = \
> 	basic \
> 	cancel \
>@@ -12,7 +12,6 @@
> 	pc \
> 	README 
> 
>-xkbdatadir = $(datadir)/X11/xkb
> xkbdata_DATA = types.dir
> 
> include $(top_srcdir)/xkbrules.am
>Index: app/xkbcomp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/app/xkbcomp/Makefile.am,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile.am
>--- app/xkbcomp/Makefile.am	1 Sep 2005 19:37:02 -0000	1.6
>+++ app/xkbcomp/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -19,9 +19,9 @@
> #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> #  PERFORMANCE OF THIS SOFTWARE.
> 
>-bin_PROGRAMS = xkbcomp
>+xkbbin_PROGRAMS = xkbcomp
> 
>-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
>+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"@xkbdatadir@"'
> xkbcomp_LDADD = $(XKBCOMP_LIBS)
> 
> xkbcomp_SOURCES = \
>Index: app/xkbcomp/configure.ac
>===================================================================
>RCS file: /cvs/xorg/app/xkbcomp/configure.ac,v
>retrieving revision 1.4
>diff -u -r1.4 configure.ac
>--- app/xkbcomp/configure.ac	29 Jul 2005 21:22:35 -0000	1.4
>+++ app/xkbcomp/configure.ac	25 Sep 2005 05:35:55 -0000
>@@ -22,7 +22,7 @@
> dnl Process this file with autoconf to create configure.
> 
> AC_PREREQ([2.57])
>-AC_INIT(xkbcomp,[0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
>+AC_INIT(xkbcomp,[0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
> 
>@@ -33,10 +33,27 @@
> AC_PROG_INSTALL
> 
> # Checks for pkg-config packages
>+PKG_PROG_PKG_CONFIG
>+
>+AC_MSG_CHECKING([for kbproto >= 1.1])
>+PKG_CHECK_EXISTS([kbproto >= 1.1], AC_MSG_RESULT([yes]), [dnl
>+	AC_MSG_RESULT([no])
>+	AC_MSG_ERROR([kbproto >= 1.1 required for xkbdatadir and xkbbindir])dnl
>+])
>+
> PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
> AC_SUBST(XKBCOMP_CFLAGS)
> AC_SUBST(XKBCOMP_LIBS)
> 
>+AC_ARG_WITH(xkbdatadir,        [  --with-xkbdatadir=PATH ],
>+	[ xkbdatadir="$withval" ],
>+	[ xkbdatadir="`$PKG_CONFIG --variable=xkbdatadir kbproto`" ])
>+AC_ARG_WITH(xkbbindir,      [  --with-xkbbindir=PATH ],
>+	[ xkbbindir="$withval" ],
>+	[ xkbbindir="`$PKG_CONFIG --variable=xkbbindir kbproto`" ])
>+AC_SUBST(xkbdatadir)
>+AC_SUBST(xkbbindir)
>+
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([Makefile])
>Index: app/setxkbmap/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/app/setxkbmap/Makefile.am,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile.am
>--- app/setxkbmap/Makefile.am	27 Jul 2005 01:54:17 -0000	1.3
>+++ app/setxkbmap/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -21,7 +21,7 @@
> 
> bin_PROGRAMS = setxkbmap
> 
>-setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"'
>+setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"@__XKBDEFRULES__@"' -DDFLT_XKB_CONFIG_ROOT='"@xkbdatadir@"'
> setxkbmap_LDADD = $(SETXKBMAP_LIBS)
> 
> setxkbmap_SOURCES =	\
>Index: app/setxkbmap/configure.ac
>===================================================================
>RCS file: /cvs/xorg/app/setxkbmap/configure.ac,v
>retrieving revision 1.3
>diff -u -r1.3 configure.ac
>--- app/setxkbmap/configure.ac	29 Jul 2005 21:22:30 -0000	1.3
>+++ app/setxkbmap/configure.ac	25 Sep 2005 05:35:55 -0000
>@@ -22,7 +22,7 @@
> dnl Process this file with autoconf to create configure.
> 
> AC_PREREQ([2.57])
>-AC_INIT(setxkbmap,[0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap)
>+AC_INIT(setxkbmap,[0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap)
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
> 
>@@ -30,12 +30,27 @@
> 
> AC_PROG_CC
> AC_PROG_INSTALL
>+PKG_PROG_PKG_CONFIG
> 
> # Checks for pkg-config packages
>+AC_MSG_CHECKING([for kbproto >= 1.1])
>+PKG_CHECK_EXISTS([kbproto >= 1.1], AC_MSG_RESULT([yes]), [dnl
>+	AC_MSG_RESULT([no])
>+	AC_MSG_ERROR([kbproto >= 1.1 required for xkbdatadir variable])dnl
>+])
>+
> PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11)
> AC_SUBST(SETXKBMAP_CFLAGS)
> AC_SUBST(SETXKBMAP_LIBS)
> 
>+AC_ARG_WITH(xkbdatadir,        [  --with-xkbdatadir=PATH ],
>+	[ xkbdatadir="$withval" ],
>+	[ xkbdatadir="`$PKG_CONFIG --variable=xkbdatadir kbproto`" ])
>+
>+__XKBDEFRULES__="xorg"
>+AC_SUBST(__XKBDEFRULES__)
>+AC_SUBST(xkbdatadir)
>+
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([Makefile])
>Index: app/xkbevd/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/app/xkbevd/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- app/xkbevd/Makefile.am	2 Aug 2005 18:05:15 -0000	1.4
>+++ app/xkbevd/Makefile.am	25 Sep 2005 05:35:55 -0000
>@@ -20,7 +20,7 @@
> 
> bin_PROGRAMS = xkbevd
> 
>-xkbevd_CFLAGS = $(XKBEVD_CFLAGS)
>+xkbevd_CFLAGS = $(XKBEVD_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"@xkbdatadir@"'
> xkbevd_LDADD = $(XKBEVD_LIBS)
> 
> xkbevd_SOURCES =	\
>Index: app/xkbevd/configure.ac
>===================================================================
>RCS file: /cvs/xorg/app/xkbevd/configure.ac,v
>retrieving revision 1.3
>diff -u -r1.3 configure.ac
>--- app/xkbevd/configure.ac	29 Jul 2005 21:22:35 -0000	1.3
>+++ app/xkbevd/configure.ac	25 Sep 2005 05:35:55 -0000
>@@ -22,7 +22,7 @@
> dnl Process this file with autoconf to create configure.
> 
> AC_PREREQ([2.57])
>-AC_INIT(xkbevd,[0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbevd)
>+AC_INIT(xkbevd,[0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbevd)
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
> 
>@@ -31,12 +31,24 @@
> AC_PROG_CC
> AC_PROG_INSTALL
> AC_PROG_YACC
>+PKG_PROG_PKG_CONFIG
> 
> # Checks for pkg-config packages
>+AC_MSG_CHECKING([for kbproto >= 1.1])
>+PKG_CHECK_EXISTS([kbproto >= 1.1], AC_MSG_RESULT([yes]), [dnl
>+	AC_MSG_RESULT([no])
>+	AC_MSG_ERROR([kbproto >= 1.1 required for xkbdatadir and xkbbindir])dnl
>+])
>+
> PKG_CHECK_MODULES(XKBEVD, xkbfile)
> AC_SUBST(XKBEVD_CFLAGS)
> AC_SUBST(XKBEVD_LIBS)
> 
>+AC_ARG_WITH(xkbdatadir,        [  --with-xkbdatadir=PATH ],
>+	[ xkbdatadir="$withval" ],
>+	[ xkbdatadir="`$PKG_CONFIG --variable=xkbdatadir kbproto`" ])
>+AC_SUBST(xkbdatadir)
>+
> XORG_RELEASE_VERSION
> 
> AC_OUTPUT([Makefile])
>Index: xserver/xorg/configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.86
>diff -u -r1.86 configure.ac
>--- xserver/xorg/configure.ac	24 Sep 2005 02:40:51 -0000	1.86
>+++ xserver/xorg/configure.ac	25 Sep 2005 05:35:56 -0000
>@@ -59,6 +59,12 @@
> AC_PROG_YACC
> XORG_PROG_RAWCPP
> 
>+AC_MSG_CHECKING([for kbproto >= 1.1])
>+PKG_CHECK_EXISTS([kbproto >= 1.1], AC_MSG_RESULT([yes]), [dnl
>+	AC_MSG_RESULT([no])
>+	AC_MSG_ERROR([kbproto >= 1.1 required for XKB path variables])dnl
>+])
>+
> AC_HEADER_DIRENT
> AC_HEADER_STDC
> AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
>@@ -308,12 +314,15 @@
> AC_ARG_WITH(default-font-path, [ --with-default-font-path=PATH ],
> 				[ FONTPATH="$withval" ],
> 				[ FONTPATH="${datadir}/X11/fonts" ])
>-AC_ARG_WITH(xkb-path,        [  --with-xkb-path=PATH ],
>-				[ XKBPATH="$withval" ],
>-				[ XKBPATH="${datadir}/X11/xkb" ])
>-AC_ARG_WITH(xkb-output,      [  --with-xkb-output=PATH ],
>-				[ XKBOUTPUT="$withval" ],
>-				[ XKBOUTPUT="compiled/" ])
>+AC_ARG_WITH(xkbbindir,       [  --with-xkbbindir=PATH ],
>+	[ xkbbindir="$withval" ],
>+	[ xkbbindir="`$PKG_CONFIG --variable=xkbbindir kbproto`" ])
>+AC_ARG_WITH(xkbdatadir,      [  --with-xkbdatadir=PATH ],
>+	[ xkbdatadir="$withval" ],
>+	[ xkbdatadir="`$PKG_CONFIG --variable=xkbdatadir kbproto`" ])
>+AC_ARG_WITH(xkmoutputdir,    [  --with-xkmoutputdir=PATH ],
>+	[ xkmoutputdir="$withval" ],
>+	[ xkmoutputdir="`$PKG_CONFIG --variable=xkmoutputdir kbproto`" ])
> AC_ARG_WITH(rgb-path,        [  --with-rgb-path=PATH ],
> 				[ RGBPATH="$withval" ],
> 				[ RGBPATH="${datadir}/X11/rgb" ])
>@@ -974,9 +983,9 @@
> 
> dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
> AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
>-AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
>-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
>-AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
>+AC_DEFINE_DIR(XKB_BASE_DIRECTORY, xkbdatadir, [Path to XKB data])
>+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, xkbbindir, [Path to XKB bin dir])
>+AC_DEFINE_DIR(XKM_OUTPUT_DIR, xkmoutputdir, [Path to XKB output dir])
> 
> dnl and the rest of these are generic, so they're in config.h
> AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])

Actions: View | Splinter Review

Attachments on bug 4461: 3294 | 3395

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.