[xorg-commit-diffs] xc/programs/xinit Imakefile, 1.1.4.3, 1.1.4.4 startx.cmd, 1.1.4.2, 1.1.4.3 startx.man, 1.1.4.2, 1.1.4.3 xinit.c, 1.1.4.3, 1.1.4.4 xinitrc.cmd, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xinit
In directory pdx:/home/eich/tstbuild/xc/programs/xinit

Modified Files:
      Tag: XORG-CURRENT
	Imakefile startx.cmd startx.man xinit.c xinitrc.cmd 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xinit/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:27 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:47 -0000	1.1.4.4
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/startx.cmd	5 Mar 2004 13:41:28 -0000	1.1.4.2
+++ b/startx.cmd	15 Apr 2004 10:17:47 -0000	1.1.4.3
@@ -15,7 +15,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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/startx.man	5 Mar 2004 13:41:28 -0000	1.1.4.2
+++ b/startx.man	15 Apr 2004 10:17:47 -0000	1.1.4.3
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xinit.c	5 Mar 2004 13:41:28 -0000	1.1.4.3
+++ b/xinit.c	15 Apr 2004 10:17:47 -0000	1.1.4.4
@@ -123,6 +123,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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xinitrc.cmd	5 Mar 2004 13:41:28 -0000	1.1.4.2
+++ b/xinitrc.cmd	15 Apr 2004 10:17:47 -0000	1.1.4.3
@@ -4,7 +4,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
 home = VALUE('HOME',,env)