xserver configure.ac,3.110,3.111

Committed by: airlied

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv9922

Modified Files:
	configure.ac 
Log Message:
this gets rid of the xf86glxddx library and uses weak symbols so that
the kdrive and the xgl servers work from one build


Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.110
retrieving revision 3.111
diff -u -d -r3.110 -r3.111
--- configure.ac	3 Jan 2006 16:16:37 -0000	3.110
+++ configure.ac	4 Jan 2006 12:42:30 -0000	3.111
@@ -245,7 +245,6 @@
 AM_CONDITIONAL(GLX, test x$GLX = xyes)
 if test "$GLX" = yes; then
 	AC_DEFINE(GLXEXT,1,[Build GLX extension])
-	GLXDDX_LIB='$(top_builddir)/GL/mesa/libxf86glxddx.a'
 	GLX_INCS='-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include'
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libglcore.la'
 fi
@@ -458,7 +457,7 @@
 	KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
 	KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
 	KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
-	                  $FB_LIB $MI_LIB $EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB \
+	                  $FB_LIB $MI_LIB $EXTENSION_LIBS $GLX_LIBS \
 			  $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
 	KDRIVE_PURE_INCS="$KDRIVE_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
 	                  $GLX_INCS $FB_INC $MI_INC"
@@ -475,7 +474,7 @@
 if test "$XNESTSERVER" = yes; then
 	PKG_CHECK_MODULES(XNESTSERVER, $XNEST_REQUIRED_MODULES)
 	XNEST_LIBS="$DIX_LIB $OS_LIB $XNEST_LIB \
-		$EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB $MI_LIB \
+		$EXTENSION_LIBS $GLX_LIBS $MI_LIB \
 		$EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
 	XNEST_INCS="$XNEST_INC $XNEST_OS_INC $DAMAGE_INC $SHADOW_INC \
 		$EXTENSION_INCS $GLX_INCS $MI_INC"
@@ -490,7 +489,7 @@
 	XWIN_LIB='$(top_builddir)/hw/xwin/libxwin.a'
 	XWIN_INC='-I$(top_srcdir)/hw/xwin'
 	XWIN_LIBS="$DIX_LIB $OS_LIB $XWIN_LIB \
-		$EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB $FB_LIB $MI_LIB \
+		$EXTENSION_LIBS $GLX_LIBS $FB_LIB $MI_LIB \
 		$EXTENSION_LIBS $SHADOW_LIB $XPSTUBS_LIB -lcygipc"
 	XWIN_INCS="$XWIN_INC $XWIN_OS_INC $SHADOW_INC \
 		$EXTENSION_INCS $GLX_INCS $FB_INC $MI_INC"