[Xorg-commit] xc/config/util lndir.c,1.1.4.2,1.1.4.3 makedef.cmd,1.1.4.1,1.1.4.2 printver.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/config/util
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/config/util

Modified Files:
      Tag: XORG-CURRENT
	lndir.c makedef.cmd printver.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: lndir.c
===================================================================
RCS file: /cvs/xorg/xc/config/util/lndir.c,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/lndir.c	26 Nov 2003 22:48:16 -0000	1.1.4.2
+++ b/lndir.c	23 Feb 2004 21:31:47 -0000	1.1.4.3
@@ -26,7 +26,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/util/lndir.c,v 3.18 2003/06/24 15:44:45 eich Exp $ */
+/* $XFree86: xc/config/util/lndir.c,v 3.19 2004/01/11 00:10:15 herrb Exp $ */
 
 /* From the original /bin/sh script:
 
@@ -222,6 +222,8 @@
 			continue;
 		    if (!strcmp (dp->d_name, "CVS.adm"))
 			continue;
+		    if (!strcmp (dp->d_name, ".svn"))
+			continue;
 		}
 		ocurdir = rcurdir;
 		rcurdir = buf;

Index: makedef.cmd
===================================================================
RCS file: /cvs/xorg/xc/config/util/makedef.cmd,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/makedef.cmd	26 Nov 2003 22:48:16 -0000	1.1.4.1
+++ b/makedef.cmd	23 Feb 2004 21:31:47 -0000	1.1.4.2
@@ -1,5 +1,5 @@
 /* This is OS/2 REXX */
-/* $XFree86: xc/config/util/makedef.cmd,v 1.4 2003/11/12 00:10:24 dawes Exp $
+/* $XFree86: xc/config/util/makedef.cmd,v 1.5 2004/01/14 17:32:39 dawes Exp $
  *
  * This file was taken from Odin32 project and modified to suit
  * XFree86 4.x build process
@@ -22,13 +22,13 @@
 sASDFeatureId   = '';
 sCountryCode    = '';
 sDateTime       = left(' 'date()' 'time(), 26);
-sDescription    = 'XFree86 4.3';
+sDescription    = 'XFree86 4.4';
 sFixPakVer      = '';
 sHostname       = strip(substr(VALUE('HOSTNAME',,'OS2ENVIRONMENT'), 1, 11));
 sLanguageCode   = '';
 sMiniVer        = '';
 sVendor         = 'XFree86';
-sVersion        = '4.3.0';
+sVersion        = '4.4.0';
 
 
 /*
@@ -580,7 +580,7 @@
 	    iterate
 	end
         if firstsym = 'VERSION' then do
-          call lineout outfile, 'DESCRIPTION "'sDescription sRealName'"'
+          call lineout outfile, 'DESCRIPTION "'sDescription sLibrary'"'
           fDescription = 1;
           AddCodeDataSection(outfile);
 	end   
@@ -600,7 +600,7 @@
      */
     if (\fDescription) then
     do
-        call lineout outfile,"DESCRIPTION '"||sDescription sRealName||"'";
+        call lineout outfile,"DESCRIPTION '"||sDescription sLibrary||"'";
         AddCodeDataSection(outfile);
     end
 

Index: printver.c
===================================================================
RCS file: /cvs/xorg/xc/config/util/printver.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/printver.c	14 Nov 2003 16:48:20 -0000	1.1
+++ b/printver.c	23 Feb 2004 21:31:47 -0000	1.1.4.1
@@ -5,12 +5,14 @@
  * build process.
  */
 
-/* $XFree86: xc/config/util/printver.c,v 1.2 2003/02/26 09:21:33 dawes Exp $ */
+/* $XFree86: xc/config/util/printver.c,v 1.3 2004/02/01 02:08:48 dawes Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "xf86Version.h"
 #include "xf86Date.h"
 
+int
 main()
 {
 #ifdef XF86_VERSION_MAJOR