[xorg-commit-diffs] xc/config/cf cygwin.cf, 1.1.4.1.2.26, 1.1.4.1.2.27 cygwin.rules, 1.1.4.1.2.4, 1.1.4.1.2.5

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv3662/config/cf

Modified Files:
      Tag: CYGWIN
	cygwin.cf cygwin.rules 
Log Message:
Don't require Xext to be built when building XWin.  Allow GzipLibrary to be overridden.  Change version string slightly to specify our server version as a 6.7.0.0-n where n is our package release number.

Index: cygwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
retrieving revision 1.1.4.1.2.26
retrieving revision 1.1.4.1.2.27
diff -u -d -r1.1.4.1.2.26 -r1.1.4.1.2.27
--- a/cygwin.cf	30 Mar 2004 00:31:28 -0000	1.1.4.1.2.26
+++ b/cygwin.cf	6 Apr 2004 22:54:02 -0000	1.1.4.1.2.27
@@ -1,29 +1,30 @@
-XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 herrb Exp $
-
 /* Cygwin/X vendor strings and version */
 #ifndef CygxVersionMajor
-# define CygxVersionMajor 6
+# define CygxVersionMajor	6
 #endif
 #ifndef CygxVersionMinor
-# define CygxVersionMinor 7
+# define CygxVersionMinor	7
 #endif
-#ifndef CygxVersionPico
-# define CygxVersionPico 0
+#ifndef CygxVersionPatch
+# define CygxVersionPatch	0
 #endif
-#ifndef CygxVersionLocal
-# define CygxVersionLocal 1
+#ifndef CygxVersionSnap
+# define CygxVersionSnap	0
+#endif
+#ifndef CygxVersionServer
+# define CygxVersionServer	1
 #endif
 
 #ifndef CygxVersion
-# define CygxVersion (10000000 * CygxVersionMajor + 100000 * CygxVersionMinor + 1000 * CygxVersionPico + CygxVersionLocal)
+# define CygxVersion (10000000 * CygxVersionMajor + 100000 * CygxVersionMinor + 1000 * CygxVersionPatch + CygxVersionSnap)
 #endif
 
 #ifndef CygxVersionString
-# define CygxVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPico CygxVersionLocal | sed -e 's/ /./g'`
+# define CygxVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap%CygxVersionServer| sed -e 's/ /./g' -e 's/%/-/g'`
 #endif
 
 #ifndef CygxManVersionString
-# define CygxManVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPico CygxVersionLocal| sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+# define CygxManVersionString `echo CygxVersionMajor CygxVersionMinor CygxVersionPatch CygxVersionSnap| sed -e 's/ /./g' -e 's/^/Version\\\ /'`
 #endif
 
 #ifndef XVendorString
@@ -101,7 +102,9 @@
 #define HasSockets		YES
 #define GzipFontCompression	YES
 #define HasZlib			YES
-#define GzipLibrary		-lz.dll
+#ifndef GzipLibrary
+# define GzipLibrary		-lz.dll
+#endif
 
 /* We don't need -lm */
 #define MathLibrary		/**/
@@ -416,7 +419,6 @@
 /* We need libX11 and libXext for the XWin Server */
 #if XWinServer
 # define BuildX11Lib		YES
-# define BuildXextLib		YES
 #endif
 
 /*

Index: cygwin.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.rules,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- a/cygwin.rules	10 Mar 2004 10:18:36 -0000	1.1.4.1.2.4
+++ b/cygwin.rules	6 Apr 2004 22:54:02 -0000	1.1.4.1.2.5
@@ -1,5 +1,3 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.27 2003/10/26 18:17:37 herrb Exp $
-
 /*
  * Cygwin shared library rules (DLL versions)
  */
@@ -7,6 +5,12 @@
 #define HasSharedLibraries	YES
 #define NeedLibInsideFlag	NO
 #define ForceNormalLib		NO
+#ifndef SharedLibX11
+# define SharedLibX11		YES
+#endif
+#ifndef NormalLibX11
+# define NormalLibX11		NO
+#endif
 #define SharedLibXaw		YES
 #define SharedLibXmu		YES
 #define SharedLibXt		YES