[xserver-commit] xserver configure.ac,3.64,3.65
Daniel Stone
xserver-commit@pdx.freedesktop.org
Committed by: daniel
Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv4957
Modified Files:
configure.ac
Log Message:
OK, I tested a KDrive build and it worked. Anything you may encounter is thus
your own problem. ;)
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -d -r3.64 -r3.65
--- a/configure.ac 9 Mar 2004 12:41:18 -0000 3.64
+++ b/configure.ac 9 Mar 2004 13:43:10 -0000 3.65
@@ -154,6 +154,11 @@
XNEST_REQUIRED_MODULES="x11 xext"
fi
+AM_CONDITIONAL(XSDLSERVER, [test x$XSDLSERVER = xyes])
+if test "$XSDLSERVER" = yes; then
+ AC_DEFINE(XSDLSERVER,,[Build XSDL server])
+fi
+
AM_CONDITIONAL(XWINSERVER, [test x$XWINSERVER = xyes])
if test "$XWINSERVER" = yes; then
AC_DEFINE(XWINSERVER,,[Build XWin server])
@@ -354,14 +359,13 @@
KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
-
KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
$FB_LIB $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB \
$SHADOW_LIB $XPSTUBS_LIB"
KDRIVE_PURE_INCS="$KDRIVE_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
$FB_INC $MI_INC"
KDRIVE_LIBS="$KDRIVE_PURE_LIBS $KDRIVE_OS_LIB"
- KDRIVE_INCS="$KDRIVE_PURE_INCS"
+ KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
fi
AC_SUBST([KDRIVE_PURE_LIBS])
AC_SUBST([KDRIVE_PURE_INCS])