[xserver-commit] xserver configure.ac,3.27,3.28

[Phil Blundell]

Committed by: pb

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

Modified Files:
	configure.ac 
Log Message:
add --enable-xdmcp.



Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -d -r3.27 -r3.28
--- configure.ac	12 Oct 2003 16:11:11 -0000	3.27
+++ configure.ac	30 Oct 2003 23:41:46 -0000	3.28
@@ -82,7 +82,7 @@
 # tslib touchscreen driver
 AC_CHECK_HEADERS([tslib.h])
 
-REQUIRED_MODULES="randr render fixesext xextensions xfont xproto xtrans xau xdmcp"
+REQUIRED_MODULES="randr render fixesext xextensions xfont xproto xtrans xau"
 
 DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
 DEFAULT_VENDOR_STRING="freedesktop.org"
@@ -98,6 +98,7 @@
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
 			     [SCREENSAVER=$enableval],
 			     [SCREENSAVER=yes])
+AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=yes])
 
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
@@ -149,6 +150,11 @@
 	AC_DEFINE(RES,1,[Support X resource extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
 fi
+AM_CONDITIONAL(XDMCP, [test x$XDMCP = xyes])
+if test "$XDMCP" = yes; then
+	AC_DEFINE(XDMCP,1,[Support Xdmcp])
+	REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
+fi
 
 if test "$ac_cv_header_tslib_h" = yes; then
 	AC_DEFINE(TSLIB, 1, [Include tslib touchscreen driver])