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

[Phil Blundell]

Committed by: pb

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

Modified Files:
	configure.ac 
Log Message:
add --enable-xdm-auth-1 option to control XDM-AUTH*-1.
by default, autodetect both this and --enable-xdmcp, based on
libXdmcp presence and capabilities.



Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -d -r3.28 -r3.29
--- configure.ac	30 Oct 2003 23:41:46 -0000	3.28
+++ configure.ac	31 Oct 2003 23:45:51 -0000	3.29
@@ -98,7 +98,8 @@
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
 			     [SCREENSAVER=$enableval],
 			     [SCREENSAVER=yes])
-AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=yes])
+AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=auto])
+AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
 
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
@@ -150,12 +151,42 @@
 	AC_DEFINE(RES,1,[Support X resource extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
 fi
+
+PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
+
+if test "$have_libxdmcp" = yes; then
+	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
+fi
+
+if test x$XDMCP = xauto; then
+	if test $have_libxdmcp = yes; then
+		XDMCP=yes
+	else
+		XDMCP=no
+	fi
+fi
+if test x$XDMAUTH = xauto; then
+	if test $have_libxdmcp = yes -a $have_xdmcpwrap = yes; then
+		XDMAUTH=yes
+	else
+		XDMAUTH=no
+	fi
+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
 
+AM_CONDITIONAL(XDMAUTH, [test x$XDMAUTH = xyes])
+if test "$XDMAUTH" = yes; then
+	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
+	if test "x$XDMCP" != yes; then
+		REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
+	fi
+fi
+
 if test "$ac_cv_header_tslib_h" = yes; then
 	AC_DEFINE(TSLIB, 1, [Include tslib touchscreen driver])
 	TSLIB=yes