--- xorg-server-X11R7.0-1.0.1/hw/dmx/config/Makefile.am.ark	2006-01-24 15:08:29.000000000 +0100
+++ xorg-server-X11R7.0-1.0.1/hw/dmx/config/Makefile.am	2006-01-24 15:08:55.000000000 +0100
@@ -38,8 +38,8 @@
 	Canvas.c \
 	Canvas.h \
 	CanvasP.h
-xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@
-xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@
+xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@ @XDMXCONFIG_XAW_LIBS@
+xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@ @XDMXCONFIG_XAW_CFLAGS@
 
 vdltodmx_DEPENDENCIES = libdmxconfig.a
 vdltodmx_SOURCES = vdltodmx.c
--- xorg-server-X11R7.0-1.0.1/configure.ac.ark	2006-01-24 15:01:53.000000000 +0100
+++ xorg-server-X11R7.0-1.0.1/configure.ac	2006-01-24 15:06:45.000000000 +0100
@@ -826,9 +826,14 @@
 	if test "x$GLX" = xyes; then
 		PKG_CHECK_MODULES([GL], [glproto])
 	fi
-	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
+	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xmu xt xpm x11])
+	dnl both xaw7 and xaw8 will do... Unfortunately pkg-config doesn't handle
+	dnl this by itself
+	PKG_CHECK_MODULES([XDMXCONFIG_XAW], [xaw7], [], [PKG_CHECK_MODULES([XDMXCONFIG_XAW], [xaw8])])
 	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
 	AC_SUBST(XDMXCONFIG_DEP_LIBS)
+	AC_SUBST(XDMXCONFIG_XAW_CFLAGS)
+	AC_SUBST(XDMXCONFIG_XAW_LIBS)
 	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
 	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
 	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])