[PATCH 6/6] Clean up some configure/autoconf symbols

[Tomas Carnecky]

DMX_INCLUDES is not used anywhere, remove it.
UTILS_SYS_LIBS is not used by anyone, remove it.

KDRIVE_PURE_INCS is already included in KDRIVE_INCS so there is no
point in exporting that. Also, some includes in KDRIVE_PURE_INCS are
already in XSERVER_CFLAGS so remove them from KDRIVE_PURE_INCS.

DIX_CFLAGS already includes XSERVER_FLAGS.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
---
 configure.ac               |    7 +------
 miext/rootless/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 786ff39..7644230 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1471,9 +1471,6 @@ XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
 XSERVER_LIBS="$XKB_LIB $XI_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $DIX_LIB $MI_LIB $OS_LIB $FIXES_LIB"
 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
 
-UTILS_SYS_LIBS="${SYS_LIBS}"
-AC_SUBST([UTILS_SYS_LIBS])
-
 # The Xorg binary needs to export symbols so that they can be used from modules
 # Some platforms require extra flags to do this.   libtool should set the
 # necessary flags for each platform when -export-dynamic is passed to it.
@@ -1979,7 +1976,6 @@ if test "x$DMX" = xyes; then
 		AC_MSG_ERROR([Xdmx build explicitly requested, but required
 		              modules not found.])
 	fi
-	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
 	XDMX_LIBS="$MAIN_LIB $FB_LIB $RECORD_LIB $MIEXT_SHADOW_LIB $XSERVER_LIBS $XEXT_LIB $XKB_STUB_LIB"
 	XDMX_SYS_LIBS="$DMXMODULES_LIBS $XSERVER_SYS_LIBS"
@@ -2083,7 +2079,7 @@ if test "$KDRIVE" = yes; then
     
     # damage shadow extension glx (NOTYET) fb mi
     KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SHADOW_INC"
     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
     
@@ -2125,7 +2121,6 @@ if test "$KDRIVE" = yes; then
     AC_SUBST([XEPHYR_INCS])
 fi
 AC_SUBST([KDRIVE_INCS])
-AC_SUBST([KDRIVE_PURE_INCS])
 AC_SUBST([KDRIVE_CFLAGS])
 AC_SUBST([KDRIVE_LIBS])
 AC_SUBST([KDRIVE_SYS_LIBS])
diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am
index f09300d..0b8d41a 100644
--- a/miext/rootless/Makefile.am
+++ b/miext/rootless/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support
 
 noinst_LTLIBRARIES = librootless.la
-- 
1.7.2.1.g43c6fa