[xserver-commit] xfree86 Makefile.am,1.4,1.5 configure.ac,1.5,1.6

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86
In directory pdx:/tmp/cvs-serv10820

Modified Files:
	Makefile.am configure.ac 
Log Message:
My latest (probably misguided) attempt to get XFree86 to build - we're getting ever-closer.

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/Makefile.am	4 Mar 2004 02:33:00 -0000	1.4
+++ b/Makefile.am	5 Mar 2004 06:53:17 -0000	1.5
@@ -18,7 +18,8 @@
                   parser/libxf86parser.a rac/libxf86rac.a \
                   ramdac/libxf86ramdac.a shadowfb/libxf86shadowfb.a \
                   vbe/libxf86vbe.a vgahw/libxf86vgahw.a xaa/libxf86xaa.a \
-                  $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a
+                  $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a \
+                  @XSERVER_LIBS@
 
 dummy.c:
 	touch $@

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xfree86/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/configure.ac	4 Mar 2004 02:33:00 -0000	1.5
+++ b/configure.ac	5 Mar 2004 06:53:17 -0000	1.6
@@ -77,7 +77,7 @@
 # tslib touchscreen driver
 AC_CHECK_HEADERS([tslib.h])
 
-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
+REQUIRED_MODULES="randr render fixesext damageext panoramixext xextensions xfont xproto xtrans xau"
 
 DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
 DEFAULT_VENDOR_STRING="freedesktop.org"
@@ -162,7 +162,7 @@
 AM_CONDITIONAL(XF86SERVER, [test x$XF86SERVER = xyes])
 if test "$XF86SERVER" = yes; then
 	AC_DEFINE(XF86SERVER,,[Build XFree86 server])
-	XF86_REQUIRED_MODULES="x11 xext xfont"
+	XF86_REQUIRED_MODULES="x11 xext xfont xdmcp"
 fi
 
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
@@ -447,7 +447,7 @@
 
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
-XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include'
+XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include -I${top_srcdir}/Xext'
 
 if test "x$GCC" = "xyes"; then
 	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \