From b9ccd89918e1c79d6013fe563c7fa933c1274837 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 27 Jul 2005 08:11:26 +0000
Subject: [PATCH] Fix dmx/glxProxy build

---
 configure.ac                | 17 +++++++------
 hw/dmx/Makefile.am          | 48 +++++++++++++++++++------------------
 hw/dmx/glxProxy/Makefile.am | 25 +++++++++++++++----
 3 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8c58caebe..87fcd0850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ AC_ARG_ENABLE(xf86vidmode,   [  --disable-xf86vidmode ],[XF86VIDMODE=$enableval]
 AC_ARG_ENABLE(xf86misc,      [  --disable-xf86misc ],[XF86MISC=$enableval],[XF86MISC=yes])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity],[Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no])
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg],[Build Xorg server (default: auto)]),[XORG=$enableval],[XORG=auto])
-AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx],[Build DMX server (default: disabled)]),[DMX=$enableval],[DMX=no])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx],[Build DMX server (default: disabled)]),[DMX=$enableval],[DMX=auto])
 AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb],[Build Xvfb server (default: auto)]),[XVFB=$enableval],[XVFB=auto])
 AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest],[Build Xnest server (default: auto)]),[XNEST=$enableval],[XNEST=auto])
 AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin],[Build XWin server (default: auto)]),[XWIN=$enableval],[XWIN=auto])
@@ -213,13 +213,16 @@ AC_SUBST([extdir])
 
 AC_DEFINE(SHAPE,1,[Support SHAPE extension])
 
-AM_CONDITIONAL(DMX, [test x$DMX = xyes])
-if test "$DMX" = yes; then
-	PKG_CHECK_MODULES([DMXMODULES],[xmuu xext x11 xrender xfont xi dmxproto])
-	if test "$GLX" = yes; then
-	    PKG_CHECK_MODULES(GL,gl)
-	fi
+AC_MSG_CHECKING([whether to build Xdmx DDX])
+if test x$DMX = xauto; then
+	DMX="yes"
 fi
+AC_MSG_RESULT([$DMX])
+if test "$DMX" = yes; then
+	PKG_CHECK_MODULES([DMXMODULES],
+                          [xmuu xext x11 xrender xfont xi dmxproto])
+fi
+AM_CONDITIONAL(DMX, [test x$DMX = xyes])
 
 AC_MSG_CHECKING([whether to build Xorg DDX])
 if test x$XORG = xauto; then
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index ecd3383d3..f465b7a3d 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -9,32 +9,33 @@ if GLX
 SUBDIRS += glxProxy
 GLX_LIBS = glxProxy/libglxproxy.a
 GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c
+GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 endif
 
 Xdmx_SOURCES = dmxinit.c \
-	dmxscrinit.c \
-	dmxshadow.c \
-	dmxcursor.c \
-	dmxinput.c \
-	dmxdpms.c \
-	dmxgc.c \
-	dmxgcops.c \
-	dmxwindow.c \
-	dmxpixmap.c \
-	dmxfont.c \
-	dmxcmap.c \
-	dmxvisual.c \
-	dmxlog.c \
-	dmxcb.c \
-	dmxprop.c \
-	dmxstat.c \
-	dmxsync.c \
-	dmxextension.c \
-	dmxpict.c \
-	dmx.c \
-	$(top_srcdir)/fb/fbcmap.c \
-	$(top_srcdir)/mi/miinitext.c \
-	$(GLX_SRCS) 
+               dmxscrinit.c \
+               dmxshadow.c \
+               dmxcursor.c \
+               dmxinput.c \
+               dmxdpms.c \
+               dmxgc.c \
+               dmxgcops.c \
+               dmxwindow.c \
+               dmxpixmap.c \
+               dmxfont.c \
+               dmxcmap.c \
+               dmxvisual.c \
+               dmxlog.c \
+               dmxcb.c \
+               dmxprop.c \
+               dmxstat.c \
+               dmxsync.c \
+               dmxextension.c \
+               dmxpict.c \
+               dmx.c \
+               $(top_srcdir)/fb/fbcmap.c \
+               $(top_srcdir)/mi/miinitext.c \
+               $(GLX_SRCS) 
 
 
 #if COMPOSITE
@@ -51,4 +52,5 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
 
 Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
               -DXFree86Server \
+              $(GLX_INCS) \
               @DMXMODULES_CFLAGS@
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 65735ea3a..9b40f5377 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -1,7 +1,22 @@
 noinst_LIBRARIES = libglxproxy.a
-libglxproxy_a_SOURCES =  g_disptab.c glxcmds.c glxext.c glxutil.c g_renderswap.c \
-                render2swap.c renderpixswap.c global.c glxcmdsswap.c \
-		compsize.c glxscreens.c glxvisuals.c \
-                glxsingle.c glxvendor.c glxfbconfig.c glxswap.c
 
-AM_CFLAGS = -I.. -I$(top_srcdir)/include @GL_CFLAGS@ -UXFree86LOADER 
\ No newline at end of file
+libglxproxy_a_SOURCES = g_disptab.c \
+                        glxcmds.c \
+                        glxext.c \
+                        glxutil.c \
+                        g_renderswap.c \
+                        render2swap.c \
+                        renderpixswap.c \
+                        global.c \
+                        glxcmdsswap.c \
+                        compsize.c \
+                        glxscreens.c \
+                        glxvisuals.c \
+                        glxsingle.c \
+                        glxvendor.c \
+                        glxfbconfig.c \
+                        glxswap.c
+
+AM_CFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/GL/include \
+            -DHAVE_DMX_CONFIG_H \
+            @DMXMODULES_CFLAGS@