xserver/hw/xorg/include modularDefs.h,1.2,1.3

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xorg/include
In directory pdx:/tmp/cvs-serv15203/hw/xorg/include

Modified Files:
	modularDefs.h 
Log Message:

	* configure.ac:
	* hw/xorg/Makefile.am:
	* hw/xorg/drivers/Makefile.am:
	* hw/xorg/drivers/fbdev:
	* hw/xorg/input/Makefile.am:
	* hw/xorg/input/mouse:
	Import fbdev and mouse drivers.

	* hw/xorg/common/xf86cmap.c:
	Test for whether pmap is !NULL, rather than just blindly calling
	CMapReinstallMap. This seems to break things, but meh.


Index: modularDefs.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xorg/include/modularDefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/modularDefs.h	26 Apr 2004 05:27:28 -0000	1.2
+++ b/modularDefs.h	3 May 2004 15:39:44 -0000	1.3
@@ -11,19 +11,25 @@
 #define BUILDERADDR "xorg at freedesktop.org"
 #define XVENDORNAME "X.Org"
 #define __XCONFIGFILE__ XF86CONFIGFILE
-#define XORG_RELEASE "6.7.0"
+#define XORG_RELEASE "6.7.1"
 #define __VENDORDWEBSUPPORT__ "http://wiki.x.org"
-#define XORG_VERSION_CURRENT XF86_VERSION_NUMERIC(6,7,0,0,0)
+#define XORG_VERSION_CURRENT XF86_VERSION_NUMERIC(6,7,1,0,0)
 #define DPMSExtension
 #define XINPUT
 #define RENDER
 #define RANDR
 #define XFreeXDGA
 #define XF86BIGFONT
+#ifndef XFree86Server
 #define XFree86Server
+#endif
 /* !!! */
+#ifndef DEFAULT_MODULE_PATH
 #define DEFAULT_MODULE_PATH "/usr/lib/xorg/modules"
+#endif
+#ifndef DEFAULT_LOGPREFIX
 #define DEFAULT_LOGPREFIX "/var/log/Xorg."
+#endif
 
 /* origin: programs/Xserver/include/os.h */
 #if defined(__GNUC__) && \