[xserver-commit] xfree86 ChangeLog,1.3,1.4 Makefile.am,1.2,1.3 configure.ac,1.3,1.4

Keith Packard xserver-commit@pdx.freedesktop.org 

Committed by: keithp

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xfree86/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/ChangeLog	19 Feb 2004 14:02:16 -0000	1.3
+++ b/ChangeLog	28 Feb 2004 01:27:37 -0000	1.4
@@ -1,3 +1,13 @@
+2004-02-27  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am
+	* *.c
+	Ok, everyone gets #include <config.h>
+	Other than that, I fixed a few extension header paths and
+	whacked at the Makefile.am.  Makefile.am is a hacked version
+	of xserver/Makefile.am; expect them to diverge until we can
+	stick the xfree86 DDX stuff into the standard Makefile.am.
+
 2004-02-19  Daniel Stone  <daniel@freedesktop.org>
 
 	* configure.ac:

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	19 Feb 2004 04:02:48 -0000	1.2
+++ b/Makefile.am	28 Feb 2004 01:27:37 -0000	1.3
@@ -1,14 +1,26 @@
+if XINPUT
+XINPUT_SUBDIRS=Xi
+XINPUT_LIBS=Xi/libxf86xi.a
+endif
+
 SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac ramdac \
-          shadowfb vbe vgahw xaa Xi
+          shadowfb vbe vgahw xaa drivers $(XINPUT_SUBDIRS)
 
 bin_PROGRAMS = XFree86
-XFree86_SOURCES = common/libxf86common.a ddc/libxf86ddc.a \
+
+XFree86_SOURCES = xfree86stub.c
+
+XF86_LIBS=@XF86_LIBS@
+
+XFree86_LDADD = $(XF86_LIBS) common/libxf86common.a ddc/libxf86ddc.a \
                   dummylib/libxf86dummy.a i2c/libxf86i2c.a int10/libxf86int10.a\
                   fbdevhw/libxf86fbdevhw.a os-support/libxf86os.a \
                   parser/libxf86parser.a rac/libxf86rac.a \
                   ramdac/libxf86ramdac.a shadowfb/libxf86shadowfb.a \
                   vbe/libxf86vbe.a vgahw/libxf86vgahw.a xaa/libxf86xaa.a \
-                  Xi/libxf86xi.a
+                  $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a
+
+XFree86_DEPENDENCIES =
 
 # Disabled because there's no real right way to do this, except all the defines
 # on the command line. And I'm not doing that. -Daniel

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xfree86/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/configure.ac	19 Feb 2004 14:02:16 -0000	1.3
+++ b/configure.ac	28 Feb 2004 01:27:37 -0000	1.4
@@ -91,10 +91,10 @@
 AC_ARG_ENABLE(composite,     [  --disable-composite ],[COMPOSITE=$enableval],[COMPOSITE=yes])
 AC_ARG_ENABLE(mitshm,        [  --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
 AC_ARG_ENABLE(xres,          [  --disable-xres ],[RES=$enableval],[RES=yes])
-AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
-AC_ARG_ENABLE(xnestserver,   [  --disable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=yes])
+AC_ARG_ENABLE(kdriveserver,  [  --enable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=no])
+AC_ARG_ENABLE(xnestserver,   [  --enable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=no])
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
-AC_ARG_ENABLE(xf86server,    [  --enable-xf86server ],[XF86SERVER=$enableval],[XF86SERVER=no])
+AC_ARG_ENABLE(xf86server,    [  --disable-xf86server ],[XF86SERVER=$enableval],[XF86SERVER=yes])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
@@ -104,6 +104,9 @@
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
 AC_ARG_ENABLE(glx,           [  --enable-glx ],[GLX=$enableval],[GLX=no])
 AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
+AC_ARG_ENABLE(xinput,	     [  --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
+AC_ARG_ENABLE(xloadable,     [  --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
+AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=yes])
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
@@ -190,6 +193,22 @@
 	AC_DEFINE(XF86DRI,1,[Build DRI extension])
 	AC_DEFINE(_XF86DRI_SERVER_,1,[XF86DRI internal define])
 fi
+AM_CONDITIONAL(XINPUT, [test x$XINPUT = xyes])
+if test "$XINPUT" = yes; then
+	AC_DEFINE(XINPUT,1,[Support X Input extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES xi"
+fi
+
+AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes])
+if test "$XINERAMA" = yes; then
+	AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
+	AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
+fi
+
+AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
+if test "$XLOADABLE" = yes; then
+	AC_DEFINE(XLOADABLE,1,[Support loadable input and output drivers])
+fi
 
 PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
 
@@ -382,7 +401,7 @@
 	-I$(top_srcdir)/hw/xfree86/os-support \\\
 	-I$(top_srcdir)/include \\\
 	-I$(top_srcdir)/hw/xfree86/os-support/bus'
-	XF86_LIBS="$DIX_LIB $OS_LIB $XF86_LIB $EXTENSION_LIBS $MI_LIB \
+	XF86_LIBS="$DIX_LIB $OS_LIB $EXTENSION_LIBS $MI_LIB \
 	           $SHADOW_LIB $XF86SERVER_LIBS"
 	XF86_INCS="$XF86_INC $EXTENSION_INCS $MI_INC $XF86SERVER_INCS"
 	XF86_CFLAGS="$XF86SERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
@@ -518,4 +537,6 @@
 hw/xfree86/xaa/lsb_fixed/Makefile
 hw/xfree86/xaa/msb_fixed/Makefile
 hw/xfree86/Xi/Makefile
+hw/xfree86/drivers/Makefile
+hw/xfree86/drivers/ati/Makefile
 ])