xserver: Branch 'master'

[Keith Packard]

 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f847f3c0a956c0aec8ade8e32f770daae147f40b (from 27ffd7e03c05dd2083a10e5acebd2b385d729eeb)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Jul 6 15:33:31 2006 -0700

    xorgcfg now needs libxkbui version 1.0.2 or better.
    
    Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer;
    the server fails to link with that version of the libkbui library, so
    require the current version (1.0.2).

diff --git a/configure.ac b/configure.ac
index fae6d7b..6d056fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1536,7 +1536,7 @@ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([-
 	[XORGCFG=$enableval],[XORGCFG=yes])
 if test x$XORGCFG = xyes ; then
 	PKG_CHECK_MODULES([XORGCFG_DEP], 
-	    [xkbui xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11])
+	    [xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11])
 	AC_CHECK_LIB([curses],[waddstr],
 	    [XORGCFG_DEP_LIBS="$XORGCFG_DEP_LIBS -lcurses"; CURSES=yes],
 	    AC_CHECK_LIB([ncurses],[waddstr],