Commit 475d6c1f authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

libNX_X11: reintroduce HASXDMAUTH

Fixes ArcticaProject/nx-libs#779
parent d121f2a9
...@@ -42,6 +42,19 @@ PKG_PROG_PKG_CONFIG ...@@ -42,6 +42,19 @@ PKG_PROG_PKG_CONFIG
X11_REQUIRES='nx-xproto nx-xextproto nx-xtrans' X11_REQUIRES='nx-xproto nx-xextproto nx-xtrans'
X11_EXTRA_DEPS="" 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) AC_SUBST(X11_EXTRA_DEPS)
# Silence warning: ar: 'u' modifier ignored since 'D' is the default # Silence warning: ar: 'u' modifier ignored since 'D' is the default
...@@ -156,6 +169,17 @@ fi ...@@ -156,6 +169,17 @@ fi
AC_SUBST(XTHREADLIB) AC_SUBST(XTHREADLIB)
AC_SUBST(XTHREAD_CFLAGS) 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_CHECK_FUNC(poll, [has_poll="yes"], [has_poll="no"])
AC_ARG_ENABLE([poll], AC_ARG_ENABLE([poll],
......
...@@ -28,6 +28,7 @@ AM_CPPFLAGS= \ ...@@ -28,6 +28,7 @@ AM_CPPFLAGS= \
AM_CFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \ $(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \ $(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \ $(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS) \ $(CWARNFLAGS) \
$(NULL) $(NULL)
...@@ -364,6 +365,7 @@ libNX_X11_la_LIBADD = \ ...@@ -364,6 +365,7 @@ libNX_X11_la_LIBADD = \
$(USE_XCMS_LIBS) \ $(USE_XCMS_LIBS) \
$(USE_XKB_LIBS) \ $(USE_XKB_LIBS) \
$(X11_LIBS) \ $(X11_LIBS) \
$(XDMCP_LIBS) \
-L$(top_srcdir)/../../nxcomp/src/.libs -lXcomp \ -L$(top_srcdir)/../../nxcomp/src/.libs -lXcomp \
$(NULL) $(NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment