[xserver-commit] xserver Makefile.am,3.12,3.13 configure.ac,3.56,3.57

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv22681

Modified Files:
	Makefile.am configure.ac 
Log Message:
	Add --enable-xinput option.  
	Require xi package
	Add #include <config.h> to all Xi .c files


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -d -r3.12 -r3.13
--- Makefile.am	25 Jan 2004 05:24:09 -0000	3.12
+++ Makefile.am	14 Feb 2004 05:20:47 -0000	3.13
@@ -12,6 +12,10 @@
 COMPOSITE_SUBDIR = composite
 endif
 
+if XINPUT
+XI_SUBDIR = Xi
+endif
+
 SUBDIRS=	\
 	include	\
 	dix 	\
@@ -27,5 +31,6 @@
 	$(GLX_SUBDIR) \
 	$(DRI_SUBDIRS) \
 	$(COMPOSITE_SUBDIR) \
+	$(XI_SUBDIR) \
 	hw
 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -d -r3.56 -r3.57
--- configure.ac	12 Feb 2004 19:18:18 -0000	3.56
+++ configure.ac	14 Feb 2004 05:20:47 -0000	3.57
@@ -101,6 +101,7 @@
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
 AC_ARG_ENABLE(glx,           [  --enable-glx ],[GLX=$enableval],[GLX=no])
 AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
+AC_ARG_ENABLE(xinput,	     [ --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
@@ -177,6 +178,12 @@
 	AC_DEFINE(_XF86DRI_SERVER_,1,[XF86DRI internal define])
 fi
 
+AM_CONDITIONAL(XINPUT, [test x$XINPUT = xyes])
+if test "$XINPUT" = yes; then
+	AC_DEFINE(XINPUT,1,[Support X Input extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES xi"
+fi
+
 PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
 
 if test "$have_libxdmcp" = yes; then
@@ -407,6 +414,7 @@
 damageext/Makefile
 composite/Makefile
 Xext/Makefile
+Xi/Makefile
 hw/Makefile
 hw/kdrive/Makefile
 hw/kdrive/src/Makefile