xserver/hw Makefile.am,1.8,1.9

Committed by: airlied

Update of /cvs/xserver/xserver/hw
In directory gabe:/tmp/cvs-serv19869/hw

Modified Files:
	Makefile.am 
Log Message:
Well there were a couple of snapshots later than CVS available outside of 
Novell, so I've done a crazy merge to try and get them into a workable 
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if I did.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	28 Jul 2004 07:55:35 -0000	1.8
+++ Makefile.am	23 Dec 2005 02:07:57 -0000	1.9
@@ -10,7 +10,7 @@
 XWIN_SUBDIRS = xwin
 endif
 
-if XGLSERVER
+if XGL
 XGL_SUBDIRS = xgl
 endif