[xserver-commit] xfree86/os-support/linux Makefile.am,3.2,3.3 lnxResource.c,3.19,3.20 lnx_KbdMap.c,1.2,1.3 lnx_agp.c,3.13,3.14 lnx_apm.c,3.14,3.15 lnx_axp.c,1.6,1.7 lnx_ev56.c,3.8,3.9 lnx_init.c,3.16,3.17 lnx_io.c,3.27,3.28 lnx_jstk.c,3.14,3.15 lnx_kbd.c,1.6,1.7 lnx_kmod.c,3.7,3.8 lnx_mouse.c,1.3,1.4 lnx_pci.c,3.10,3.11 lnx_video.c,3.69,3.70

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am lnxResource.c lnx_KbdMap.c lnx_agp.c lnx_apm.c 
	lnx_axp.c lnx_ev56.c lnx_init.c lnx_io.c lnx_jstk.c lnx_kbd.c 
	lnx_kmod.c lnx_mouse.c lnx_pci.c lnx_video.c 
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: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/Makefile.am,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- a/Makefile.am	19 Feb 2004 14:02:16 -0000	3.2
+++ b/Makefile.am	28 Feb 2004 01:27:55 -0000	3.3
@@ -15,4 +15,8 @@
 INCLUDES = $(XF86_INCS)
 AM_CFLAGS = $(XF86_CFLAGS) -D_BSD_SOURCE
 
-SUBDIRS = int10 drm
+if DRI
+DRI_SUBDIRS=drm
+endif
+
+SUBDIRS = int10 $(DRI_SUBDIRS)

Index: lnxResource.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnxResource.c,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -d -r3.19 -r3.20
--- a/lnxResource.c	19 Feb 2004 03:51:38 -0000	3.19
+++ b/lnxResource.c	28 Feb 2004 01:27:55 -0000	3.20
@@ -2,6 +2,9 @@
 
 /* Resource information code */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: lnx_KbdMap.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_KbdMap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/lnx_KbdMap.c	19 Feb 2004 03:51:38 -0000	1.2
+++ b/lnx_KbdMap.c	28 Feb 2004 01:27:55 -0000	1.3
@@ -6,6 +6,9 @@
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"

Index: lnx_agp.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_agp.c,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- a/lnx_agp.c	19 Feb 2004 03:51:38 -0000	3.13
+++ b/lnx_agp.c	28 Feb 2004 01:27:55 -0000	3.14
@@ -9,6 +9,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: lnx_apm.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_apm.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- a/lnx_apm.c	19 Feb 2004 03:51:38 -0000	3.14
+++ b/lnx_apm.c	28 Feb 2004 01:27:55 -0000	3.15
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "xf86.h"

Index: lnx_axp.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_axp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/lnx_axp.c	19 Feb 2004 03:51:38 -0000	1.6
+++ b/lnx_axp.c	28 Feb 2004 01:27:55 -0000	1.7
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/X.h>
 #include "os.h"

Index: lnx_ev56.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_ev56.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/lnx_ev56.c	19 Feb 2004 03:51:38 -0000	3.8
+++ b/lnx_ev56.c	28 Feb 2004 01:27:55 -0000	3.9
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"

Index: lnx_init.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_init.c,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -d -r3.16 -r3.17
--- a/lnx_init.c	19 Feb 2004 03:51:38 -0000	3.16
+++ b/lnx_init.c	28 Feb 2004 01:27:55 -0000	3.17
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 

Index: lnx_io.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_io.c,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -d -r3.27 -r3.28
--- a/lnx_io.c	19 Feb 2004 03:51:38 -0000	3.27
+++ b/lnx_io.c	28 Feb 2004 01:27:55 -0000	3.28
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: lnx_io.c /main/8 1996/10/19 18:06:28 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 

Index: lnx_jstk.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_jstk.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- a/lnx_jstk.c	19 Feb 2004 03:51:38 -0000	3.14
+++ b/lnx_jstk.c	28 Feb 2004 01:27:55 -0000	3.15
@@ -27,6 +27,9 @@
 
 static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp";
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>

Index: lnx_kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_kbd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/lnx_kbd.c	19 Feb 2004 03:51:38 -0000	1.6
+++ b/lnx_kbd.c	28 Feb 2004 01:27:55 -0000	1.7
@@ -9,6 +9,9 @@
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 

Index: lnx_kmod.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_kmod.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/lnx_kmod.c	19 Feb 2004 03:51:38 -0000	3.7
+++ b/lnx_kmod.c	28 Feb 2004 01:27:55 -0000	3.8
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

Index: lnx_mouse.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_mouse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/lnx_mouse.c	19 Feb 2004 03:51:38 -0000	1.3
+++ b/lnx_mouse.c	28 Feb 2004 01:27:55 -0000	1.4
@@ -4,6 +4,9 @@
  * Copyright 1999 by The XFree86 Project, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Xinput.h"

Index: lnx_pci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_pci.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/lnx_pci.c	19 Feb 2004 03:51:38 -0000	3.10
+++ b/lnx_pci.c	28 Feb 2004 01:27:55 -0000	3.11
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/X.h>
 #include "os.h"

Index: lnx_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/lnx_video.c,v
retrieving revision 3.69
retrieving revision 3.70
diff -u -d -r3.69 -r3.70
--- a/lnx_video.c	19 Feb 2004 03:51:38 -0000	3.69
+++ b/lnx_video.c	28 Feb 2004 01:27:55 -0000	3.70
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"