[xserver-commit] xserver ChangeLog,3.26.2.10,3.26.2.11 Makefile.am,3.7.2.1,3.7.2.2 configure.ac,3.27.2.2,3.27.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv3073

Modified Files:
      Tag: xfixes_2_branch
	ChangeLog Makefile.am configure.ac 
Log Message:
	* Makefile.am:
	* Xext/Makefile.am:
	* configure.ac:
	* damageext/Makefile.am:
	* dix/Makefile.am:
	* fb/Makefile.am:
	* hw/kdrive/fbdev/Makefile.am:
	* hw/kdrive/linux/Makefile.am:
	* hw/kdrive/mach64/Makefile.am:
	* hw/kdrive/mga/Makefile.am:
	* hw/kdrive/nvidia/Makefile.am:
	* hw/kdrive/r128/Makefile.am:
	* hw/kdrive/smi/Makefile.am:
	* hw/kdrive/src/Makefile.am:
	* hw/kdrive/vesa/Makefile.am:
	* hw/xnest/Makefile.am:
	* mi/Makefile.am:
	* miext/damage/Makefile.am:
	* miext/shadow/Makefile.am:
	* os/Makefile.am:
	* randr/Makefile.am:
	* render/Makefile.am:
	* xfixes/Makefile.am:
	Make building (almost) work with automake 1.4 or 1.7.
	The dist-bzip2 option needs help still.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.26.2.10
retrieving revision 3.26.2.11
diff -u -d -r3.26.2.10 -r3.26.2.11
--- ChangeLog	25 Oct 2003 05:44:47 -0000	3.26.2.10
+++ ChangeLog	25 Oct 2003 06:10:47 -0000	3.26.2.11
@@ -1,5 +1,33 @@
 2003-10-24  Keith Packard  <keithp@keithp.com>
 
+	* Makefile.am:
+	* Xext/Makefile.am:
+	* configure.ac:
+	* damageext/Makefile.am:
+	* dix/Makefile.am:
+	* fb/Makefile.am:
+	* hw/kdrive/fbdev/Makefile.am:
+	* hw/kdrive/linux/Makefile.am:
+	* hw/kdrive/mach64/Makefile.am:
+	* hw/kdrive/mga/Makefile.am:
+	* hw/kdrive/nvidia/Makefile.am:
+	* hw/kdrive/r128/Makefile.am:
+	* hw/kdrive/smi/Makefile.am:
+	* hw/kdrive/src/Makefile.am:
+	* hw/kdrive/vesa/Makefile.am:
+	* hw/xnest/Makefile.am:
+	* mi/Makefile.am:
+	* miext/damage/Makefile.am:
+	* miext/shadow/Makefile.am:
+	* os/Makefile.am:
+	* randr/Makefile.am:
+	* render/Makefile.am:
+	* xfixes/Makefile.am:
+	Make building (almost) work with automake 1.4 or 1.7.
+	The dist-bzip2 option needs help still.
+
+2003-10-24  Keith Packard  <keithp@keithp.com>
+
 	* hw/kdrive/mach64/mach64.c: (mach64ScreenInit):
 	Function pointer initializers in wrong order (oops)
 	* hw/kdrive/src/kshadow.c: (KdShadowSet):

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.7.2.1
retrieving revision 3.7.2.2
diff -u -d -r3.7.2.1 -r3.7.2.2
--- Makefile.am	24 Oct 2003 06:35:24 -0000	3.7.2.1
+++ Makefile.am	25 Oct 2003 06:10:47 -0000	3.7.2.2
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS=dist-bzip2
 SUBDIRS=	\
 	dix 	\
 	fb	\

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.27.2.2
retrieving revision 3.27.2.3
diff -u -d -r3.27.2.2 -r3.27.2.3
--- configure.ac	24 Oct 2003 06:35:24 -0000	3.27.2.2
+++ configure.ac	25 Oct 2003 06:10:47 -0000	3.27.2.3
@@ -23,10 +23,10 @@
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.53)
 AC_INIT([Xserver],6.6.1,[keithp@keithp.com],Xserver)
 AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([Xserver],6.6.1)
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(include/config.h)