xserver ChangeLog,3.338,3.339 configure.ac,3.101,3.102

Committed by: davidr

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Build fixes

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.338
retrieving revision 3.339
diff -u -d -r3.338 -r3.339
--- ChangeLog	10 Jun 2005 16:02:39 -0000	3.338
+++ ChangeLog	13 Jun 2005 16:38:05 -0000	3.339
@@ -1,3 +1,34 @@
+2005-06-13  David Reveman  <[email protected]>
+
+	* miext/shadow/Makefile.am (libshadow_a_SOURCES): Add shrotpackYX.h.
+
+	* include/Makefile.am (EXTRA_DIST): Add renderedge.h.
+
+	* hw/xgl/egl/Makefile.am: Remove XEGL_LIBS.
+	Add headers to SOURCES.
+
+	* hw/xgl/Makefile.am: Fix conditional subdirs.
+	(libxgl_a_SOURCES): Add xgl.h.
+
+	* hw/kdrive/epson/Makefile.am (libepson_a_SOURCES): Add epson13806.h,
+	epson13806draw.h and epson13806reg.h.
+
+	* hw/kdrive/i810/Makefile.am (libi810_a_SOURCES): i810reg.h -> 
+	i810_reg.h.
+
+	* GL/mesa/Makefile.am: Add missing sources and dist-hook that will
+	include current Mesa sources when running 'make dist'.
+
+	* GL/glx/Makefile.am: Add glxcontext.h and glxserver.h to SOURCES. 
+
+	* configure.ac: Changed default MESA_SOURCE dir to
+	$(top_srcdir)/GL/mesa.
+	Removed XGLX_DIRS and XEGL_DIRS.
+	Removed XEGL_LIBS, -lEGL should be in XEGLSERVER_LIBS.
+
+	* hw/xgl/xglpict.c (xglPictureInit): Don't bail if add
+	FilterConvolution fails as it probably means it's already been added. 
+
 2005-06-10  David Reveman  <[email protected]>
 
 	* GL/glx/glxdrawable.h: 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.101
retrieving revision 3.102
diff -u -d -r3.101 -r3.102
--- configure.ac	7 Jun 2005 16:04:36 -0000	3.101
+++ configure.ac	13 Jun 2005 16:38:05 -0000	3.102
@@ -129,7 +129,7 @@
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
-				[MESA_SOURCE="\$(top_srcdir)/../Mesa"])
+				[MESA_SOURCE="\$(top_srcdir)/GL/mesa"])
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
 				[FONTPATH="$DEFAULT_FONT_PATH"])
@@ -496,21 +496,13 @@
 AC_SUBST([XGL_LIBS])
 AC_SUBST([XGL_INCS])
 
-XGLX_DIRS=
 if test "$XGLSERVER" = yes -a "$XGLXSERVER" = yes; then
 	PKG_CHECK_MODULES(XGLXSERVER, $XGLX_REQUIRED_MODULES)
-	XGLX_DIRS=glx
 fi
-AC_SUBST([XGLX_DIRS])
 
-XEGL_DIRS=
 if test "$XGLSERVER" = yes -a "$XEGLSERVER" = yes; then
         PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES)
-        XEGL_LIBS="-lEGL"
-        XEGL_DIRS=egl
 fi
-AC_SUBST([XEGL_LIBS])
-AC_SUBST([XEGL_DIRS])
 
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})