Attachment 31244 Details for Bug 25102 – 0001-Move-xdmxconfig-modules-into-DMX-conditionals-25102.patch

[patch] 0001-Move-xdmxconfig-modules-into-DMX-conditionals-25102.patch

0001-Move-xdmxconfig-modules-into-DMX-conditionals-25102.patch (text/plain), 1.75 KB, created by Peter Hutterer on 2009-11-16 15:33:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2009-11-16 15:33:18 UTC

Size: 1.75 KB

patch

obsolete

>From 7bbee33c840c84bdd364fff3c4d2a9e0de667ea4 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Tue, 17 Nov 2009 09:25:47 +1000
>Subject: [PATCH] Move xdmxconfig modules into DMX conditionals (#25102)
>
>xdmxconfig requires additional modules not checked for if Xdmx build is set
>to auto (the default). This may lead to build errors if the Xdmx modules are
>installed, but not the extra ones required for xdmxconfig.
>
>X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102>
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> configure.ac |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index dda4f37..ebbfdd2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1880,9 +1880,9 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
> AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
> 
> dnl DMX DDX
>-
>+XDMXCONFIG_MODULES="xaw7 xmu xt xpm x11"
> PKG_CHECK_MODULES([DMXMODULES],
>-    [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
>+    [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES $XDMXCONFIG_MODULES],
>     [have_dmx=yes], [have_dmx=no])
> AC_MSG_CHECKING([whether to build Xdmx DDX])
> if test "x$DMX" = xauto; then
>@@ -1916,7 +1916,7 @@ dnl USB sources in DMX require <linux/input.h>
> dnl Linux sources in DMX require <linux/keyboard.h>
> 	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
> 			DMX_BUILD_LNX="no")
>-	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
>+	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [$XDMXCONFIG_MODULES])
> 	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
> 	AC_SUBST(XDMXCONFIG_DEP_LIBS)
> 	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
>-- 
>1.6.5.2
>

Actions: View | Splinter Review

Attachments on bug 25102: 31244

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.