diff options
| author | Paul Bender <pebender@gmail.com> | 2009-09-04 09:57:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-04 10:05:21 +1000 |
| commit | 615220a312b9430a580fe6dcf51703c6ef244f66 (patch) | |
| tree | 0163d73c564eb87cbc87b4d646681adba3b21dcb | |
| parent | 20f9ecd86ad2a9ac6966f7eee32234cb5ef77c29 (diff) | |
Don't require xdmcp in configure.ac (#22583)
X.Org Bug 22583 <http://bugs.freedesktop.org/show_bug.cgi?id=22583>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/ConnDis.c | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 45e9d74c..3735837a 100644 --- a/configure.ac +++ b/configure.ac @@ -54,9 +54,18 @@ AC_SUBST(XPROTO_CFLAGS) case "$ac_cv_use_xcb" in no) X11_REQUIRES="xau xcmiscproto bigreqsproto" - X11_EXTRA_DEPS="xau xdmcp" - PKG_CHECK_MODULES(XDMCP, xdmcp) - AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) + X11_EXTRA_DEPS="xau" + PKG_CHECK_MODULES(XDMCP, xdmcp, + AC_CHECK_LIB(Xdmcp, XdmcpWrap, + [ + AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) + X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp" + ], + [ + XDMCP_CFLAGS= + XDMCP_LIBS= + ], [$XDMCP_LIBS]), + [AC_MSG_RESULT(no)]) AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation]) ;; *) diff --git a/src/ConnDis.c b/src/ConnDis.c index 0ecd71c3..0cc170e8 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -39,7 +39,9 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xlibint.h> #include <X11/Xtrans/Xtrans.h> #include <X11/Xauth.h> +#ifdef HASXDMAUTH #include <X11/Xdmcp.h> +#endif #include <stdio.h> #include <ctype.h> #include <unistd.h> |