1 --- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
2 +++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
23 --- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
24 +++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
26 AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
27 AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
28 AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
29 +AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
32 AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
35 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
37 -AC_DEFINE(XKB, 1, [Build XKB])
38 -AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
39 -AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
40 -REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
41 -XKB_LIB='$(top_builddir)/xkb/libxkb.la'
42 -XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
43 +AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
44 +if test "x$XKB" = xyes; then
45 + AC_DEFINE(XKB, 1, [Build XKB])
46 + AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
47 + AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
48 + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
49 + XKB_LIB='$(top_builddir)/xkb/libxkb.la'
50 + XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
53 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
54 [Do not have `strcasecmp'.]))