[xserver-commit] xizzle/common xf86Init.c,3.215,3.216

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xizzle/common
In directory pdx:/tmp/cvs-serv21681/common

Modified Files:
	xf86Init.c 
Log Message:
Get rid of call to xf86AutoConfig() - die license-tainted function, die!


Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xizzle/common/xf86Init.c,v
retrieving revision 3.215
retrieving revision 3.216
diff -u -d -r3.215 -r3.216
--- a/xf86Init.c	4 Mar 2004 02:33:00 -0000	3.215
+++ b/xf86Init.c	7 Mar 2004 13:35:02 -0000	3.216
@@ -36,17 +36,9 @@
 #include <config.h>
 #endif
 #include <stdlib.h>
-
-#undef HAS_UTSNAME
-#if !defined(WIN32) && !defined(__UNIXOS2__)
-#define HAS_UTSNAME 1
 #include <sys/utsname.h>
-#endif
 
 #define NEED_EVENTS
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
@@ -383,14 +375,6 @@
     if (xf86DoConfigure)
 	DoConfigure();
 
-    if (autoconfig) {
-	if (!xf86AutoConfig()) {
-	    xf86Msg(X_ERROR, "Auto configuration failed\n");
-	    return;
-	}
-	PostConfigInit();
-    }
-
     /* Initialise the resource broker */
     xf86ResourceBrokerInit();