aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/configure.ac24
-rw-r--r--nx-X11/lib/src/Makefile.am2
2 files changed, 26 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],
diff --git a/nx-X11/lib/src/Makefile.am b/nx-X11/lib/src/Makefile.am
index 90011f602..016dbc5cf 100644
--- a/nx-X11/lib/src/Makefile.am
+++ b/nx-X11/lib/src/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
+ $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS) \
$(NULL)
@@ -364,6 +365,7 @@ libNX_X11_la_LIBADD = \
$(USE_XCMS_LIBS) \
$(USE_XKB_LIBS) \
$(X11_LIBS) \
+ $(XDMCP_LIBS) \
-L$(top_srcdir)/../../nxcomp/src/.libs -lXcomp \
$(NULL)