Revert "Move xdmxconfig modules into DMX conditionals (#25102)"
New package dependency unnecessarily links in a few libraries that Xdmx
doesn't need. This can be fixed more elegantly.
This reverts commit 0ef15ca9d2
.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
eb967ca36c
commit
a2adda7ab3
|
@ -1881,9 +1881,9 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
|
||||||
AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
|
AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
|
||||||
|
|
||||||
dnl DMX DDX
|
dnl DMX DDX
|
||||||
XDMXCONFIG_MODULES="xaw7 xmu xt xpm x11"
|
|
||||||
PKG_CHECK_MODULES([DMXMODULES],
|
PKG_CHECK_MODULES([DMXMODULES],
|
||||||
[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES $XDMXCONFIG_MODULES],
|
[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
|
||||||
[have_dmx=yes], [have_dmx=no])
|
[have_dmx=yes], [have_dmx=no])
|
||||||
AC_MSG_CHECKING([whether to build Xdmx DDX])
|
AC_MSG_CHECKING([whether to build Xdmx DDX])
|
||||||
if test "x$DMX" = xauto; then
|
if test "x$DMX" = xauto; then
|
||||||
|
@ -1917,7 +1917,7 @@ dnl USB sources in DMX require <linux/input.h>
|
||||||
dnl Linux sources in DMX require <linux/keyboard.h>
|
dnl Linux sources in DMX require <linux/keyboard.h>
|
||||||
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
|
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
|
||||||
DMX_BUILD_LNX="no")
|
DMX_BUILD_LNX="no")
|
||||||
PKG_CHECK_MODULES([XDMXCONFIG_DEP], [$XDMXCONFIG_MODULES])
|
PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
|
||||||
AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
|
AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
|
||||||
AC_SUBST(XDMXCONFIG_DEP_LIBS)
|
AC_SUBST(XDMXCONFIG_DEP_LIBS)
|
||||||
PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
|
PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user