Index: xorg-server-1.3.0.0/configure.ac =================================================================== --- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200 +++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200 @@ -520,7 +520,11 @@ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. +if test "$KDRIVE" = yes; then +REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" +else REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" +fi REQUIRED_LIBS="xfont xau fontenc" AM_CONDITIONAL(XV, [test "x$XV" = xyes]) @@ -1603,7 +1607,9 @@ AC_SUBST(XKB_COMPILED_DIR) dnl and the rest of these are generic, so they're in config.h +if test ! x"$KDRIVE" = xyes; then AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) +fi AC_DEFINE(XResExtension, 1, [Build XRes extension]) AC_TRY_COMPILE([ @@ -1616,10 +1622,12 @@ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) +if test ! "x$KDRIVE" = xyes ; then dnl xorgconfig CLI configuration utility PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) AC_SUBST(XORGCONFIG_DEP_CFLAGS) AC_SUBST(XORGCONFIG_DEP_LIBS) +fi dnl xorgcfg GUI configuration utility AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],