diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2019-02-26 20:57:21 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 22:01:46 +0200 |
commit | 475d6c1f26fa44a4b4e2ee25b40656e4a8f3eac6 (patch) | |
tree | a3c27da16fe6475df0e1f1335d4214b8df3eff97 /nx-X11/lib/configure.ac | |
parent | d121f2a9c2cc156fa63bba83d2cbcb0c7fbb6631 (diff) | |
download | nx-libs-475d6c1f26fa44a4b4e2ee25b40656e4a8f3eac6.tar.gz nx-libs-475d6c1f26fa44a4b4e2ee25b40656e4a8f3eac6.tar.bz2 nx-libs-475d6c1f26fa44a4b4e2ee25b40656e4a8f3eac6.zip |
libNX_X11: reintroduce HASXDMAUTH
Fixes ArcticaProject/nx-libs#779
Diffstat (limited to 'nx-X11/lib/configure.ac')
-rw-r--r-- | nx-X11/lib/configure.ac | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/nx-X11/lib/configure.ac b/nx-X11/lib/configure.ac index 025d27111..205a4f1f9 100644 --- a/nx-X11/lib/configure.ac +++ b/nx-X11/lib/configure.ac @@ -42,6 +42,19 @@ PKG_PROG_PKG_CONFIG X11_REQUIRES='nx-xproto nx-xextproto nx-xtrans' X11_EXTRA_DEPS="" +X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto" +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_SUBST(X11_EXTRA_DEPS) # Silence warning: ar: 'u' modifier ignored since 'D' is the default @@ -156,6 +169,17 @@ fi AC_SUBST(XTHREADLIB) AC_SUBST(XTHREAD_CFLAGS) +case x$xdmauth in +xyes) + XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH" + ;; +xno) + XDMCP_LIBS="" + ;; +esac +AC_SUBST(XDMCP_CFLAGS) +AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [has_poll="yes"], [has_poll="no"]) AC_ARG_ENABLE([poll], |