[xorg-commit-diffs] xc/programs/xinit Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 startx.cmd, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 startx.man, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 xinit.c, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 xinitrc.cmd, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/xinit
In directory pdx:/tmp/cvs-serv7662/xc/programs/xinit

Modified Files:
      Tag: XPRINT
	Imakefile startx.cmd startx.man xinit.c xinitrc.cmd 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:49:08 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:51 -0000	1.1.4.2.6.1.6.1
@@ -8,8 +8,10 @@
 #if HasVFork
   VFORK_DEFINES = -DHAS_VFORK
 #endif
-#ifdef XFree86Version
+#if defined (XFree86Version) 
         OS_DEFS = -DXFREE86
+#elif defined (XorgVersion)
+        OS_DEFS = -DXORG
 #endif
 #ifdef OS2Architecture
         DEFFILE = xinit.def
@@ -38,7 +40,7 @@
 
 MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DBINDIR=$(BINDIR) $(COOKIEDEFS))
 
-EXTRAMANDEFS=-D__xinitdir__=$(XINITDIR)
+EXTRAMANDEFS=-D__xinitdir__=$(XINITDIR) -D__XCONFIGFILE__=XConfigFile -D__XSERVERNAME__=XServerName
 
 InstallNamedProg(startx,startx,$(BINDIR))
 #ifdef OS2Architecture

Index: startx.cmd
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/startx.cmd,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/startx.cmd	4 Mar 2004 17:49:08 -0000	1.1.4.1.6.1
+++ b/startx.cmd	10 Apr 2004 09:05:51 -0000	1.1.4.1.6.1.6.1
@@ -1,5 +1,6 @@
 /* OS/2 REXX */
 /* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
+ * $XdotOrg$
  * 
  * This is just a sample implementation of a slightly less primitive 
  * interface than xinit.  It looks for user xinitrc.cmd and xservrc.cmd
@@ -15,7 +16,7 @@
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)
 IF x11root = '' THEN DO
-	SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it."
+	SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it."
 	EXIT
 END
 

Index: startx.man
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/startx.man,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/startx.man	4 Mar 2004 17:49:08 -0000	1.1.4.1.6.1
+++ b/startx.man	10 Apr 2004 09:05:51 -0000	1.1.4.1.6.1.6.1
@@ -1,4 +1,5 @@
 .\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
+.\" $XdotOrg$
 .\" Copyright 1993, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -58,9 +59,9 @@
 default color depth, the server's notion of the number of dots-per-inch the
 display device presents, or take advantage of a different server layout, as
 permitted by the
-.IR XFree86 (1)
+.IR __XSERVERNAME__ (1)
 server and specified in the
-.IR XF86Config (__filemansuffix__)
+.IR __XCONFIGFILE__ (__filemansuffix__)
 file.  Some examples of specifying server arguments follow; consult the
 manual page for your X server to determine which arguments are legal.
 .RS
@@ -186,4 +187,4 @@
 .SH "SEE ALSO"
 .IR xinit (1),
 .IR Xserver (1),
-.IR XFree86 (1)
+.IR __XSERVERNAME__ (1)

Index: xinit.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/xinit.c,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/xinit.c	4 Mar 2004 17:49:08 -0000	1.1.4.2.6.1
+++ b/xinit.c	10 Apr 2004 09:05:51 -0000	1.1.4.2.6.1.6.1
@@ -26,7 +26,6 @@
 
 */
 /* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
-
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
 #include <stdio.h>
@@ -123,6 +122,9 @@
 #ifdef XFREE86
     "XFree86     XFree86 displays",
 #endif
+#ifdef XORG
+    "Xorg	 X.Org displays",
+#endif
 #ifdef __DARWIN__
     "XDarwin         Darwin/Mac OS X IOKit displays",
     "XDarwinQuartz   Mac OS X Quartz displays",

Index: xinitrc.cmd
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/xinitrc.cmd,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/xinitrc.cmd	4 Mar 2004 17:49:08 -0000	1.1.4.1.6.1
+++ b/xinitrc.cmd	10 Apr 2004 09:05:51 -0000	1.1.4.1.6.1.6.1
@@ -1,10 +1,11 @@
 /* OS/2 REXX */
 /* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
+/* $XdotOrg$ */
 '@echo off'
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)
 IF x11root = '' THEN DO
-	SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it."
+	SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it."
 	EXIT
 END
 home = VALUE('HOME',,env)