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

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
*.c, *.h, Makefile.am's, configure.ac:
Stop using NEED_XF86_PROTOTYPES, which means getting rid of the use of that
archaic xf86sprintf(), et al, crap.

Also, a few other miscellaneous build fixes.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xfree86/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/ChangeLog	3 Mar 2004 15:21:45 -0000	1.6
+++ b/ChangeLog	4 Mar 2004 02:33:00 -0000	1.7
@@ -1,3 +1,9 @@
+2004-03-04  Daniel Stone  <daniel@freedesktop.org>
+	* *.c, *.h
+	Eliminate NEED_XF86_PROTOTYPES functions - xf86sprintf(), et al - usage
+	everywhere. There wasn't really much point to having it, and it was just
+	causing pain.
+
 2004-03-03  Keith Packard  <keithp@keithp.com>
 
 	* drivers/Makefile.am:

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/Makefile.am	28 Feb 2004 01:27:37 -0000	1.3
+++ b/Makefile.am	4 Mar 2004 02:33:00 -0000	1.4
@@ -8,7 +8,7 @@
 
 bin_PROGRAMS = XFree86
 
-XFree86_SOURCES = xfree86stub.c
+XFree86_SOURCES = dummy.c
 
 XF86_LIBS=@XF86_LIBS@
 
@@ -20,7 +20,9 @@
                   vbe/libxf86vbe.a vgahw/libxf86vgahw.a xaa/libxf86xaa.a \
                   $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a
 
-XFree86_DEPENDENCIES =
+dummy.c:
+	touch $@
+DISTCLEANFILES = dummy.c
 
 # 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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/configure.ac	28 Feb 2004 01:27:37 -0000	1.4
+++ b/configure.ac	4 Mar 2004 02:33:00 -0000	1.5
@@ -405,7 +405,7 @@
 	           $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 \
-	             -Wall"
+	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES"
 	case $host_os in
 	  linux-gnu*)
 	  	XF86_OS="linux"