Merge recent cygwin-related changes from freedesktop.org's config/cf (changes

to Imake.tmpl and X11.tmpl are in fact merges).

6 files changed, 62 insertions, 14 deletions

diff --git a/config/cf/Imake.tmpl b/config/cf/Imake.tmpl
index 67aa311a8..61801ec63 100644
--- a/config/cf/Imake.tmpl
+++ b/config/cf/Imake.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.153 2003/11/04 01:25:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.154 2003/11/04 01:59:31 dawes Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
@@ -1327,7 +1327,7 @@ TCLIBDIR = TclLibDir
 #endif
 #endif
 #ifndef LdPostLib
-#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath
+#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath && !defined(CrossCompileDir)
 #define LdPostLib -L$(USRLIBDIR)
 #else
 #define LdPostLib /**/
@@ -2075,11 +2075,11 @@ XCOMM Not sure this belongs here
 #endif
 #include LocalTmplFile
 
-#if !BuildLibraries && AlternateIncRoot
+#if !BuildLibraries && AlternateIncRoot && !defined(CrossCompileDir)
 INSTALLED_INCLUDES = -I$(INCROOT)
 #endif
 
-#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir
+#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir && !defined(CrossCompileDir)
 INSTALLED_LIBS = -L$(USRLIBDIR)
 #endif
 
diff --git a/config/cf/X11.tmpl b/config/cf/X11.tmpl
index a41019cd7..85be90337 100644
--- a/config/cf/X11.tmpl
+++ b/config/cf/X11.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.238 2003/12/11 22:21:59 herrb Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.239 2003/12/12 03:20:32 dawes Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -599,6 +599,10 @@ VENDORMANVERSION = XVendorManVersionString
 #define BuildAppleWMLibrary	NO
 #endif
 
+#ifndef BuildWindowsWMLibrary
+#define BuildWindowsWMLibrary	NO
+#endif
+
 #ifndef BuildMiscDocs
 #define BuildMiscDocs		NO
 #endif
@@ -2137,6 +2141,30 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
 #define ProfileLibAppleWM	NO
 #endif
 
+#if BuildWindowsWMLibrary
+#ifndef SharedLibWindowsWM
+#define SharedLibWindowsWM	HasSharedLibraries
+#endif
+#ifndef NormalLibWindowsWM
+#define NormalLibWindowsWM	(!SharedLibWindowsWM || ForceNormalLib)
+#endif
+#ifndef DebugLibWindowsWM
+#define DebugLibWindowsWM	NO
+#endif
+#ifndef ProfileLibWindowsWM
+#define ProfileLibWindowsWM	NO
+#endif
+#else
+#undef  SharedLibWindowsWM
+#define SharedLibWindowsWM	NO
+#undef  NormalLibWindowsWM
+#define NormalLibWindowsWM	NO
+#undef  DebugLibWindowsWM
+#define DebugLibWindowsWM	NO
+#undef  ProfileLibWindowsWM
+#define ProfileLibWindowsWM	NO
+#endif
+
 #if BuildGLULibrary
 #ifndef SharedLibGlu
 #define SharedLibGlu		HasSharedLibraries
@@ -2457,6 +2485,16 @@ SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMR
 ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
 #endif
 
+   WINDOWSWMLIBSRC = $(LIBSRC)/windows
+#if SharedLibWindowsWM
+#ifndef SharedWindowsWMRev
+#define SharedWindowsWMRev 1.0
+#endif
+SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
+#else
+ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
+#endif
+
 # ifndef SharedLibXfontcache
 #  define SharedLibXfontcache	HasSharedLibraries
 # endif
diff --git a/config/cf/cygwin.cf b/config/cf/cygwin.cf
index 0991eb99e..783ebd5a4 100644
--- a/config/cf/cygwin.cf
+++ b/config/cf/cygwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.55 2003/10/26 18:15:38 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 herrb Exp $
 
 #ifndef OSName
 # define OSName                 Cygwin
@@ -58,6 +58,9 @@ XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.55 2003/10/26 18:15:38 her
 
 #define HasSnprintf		YES
 
+#ifndef HasMakefileSafeInclude
+# define HasMakefileSafeInclude YES
+#endif
 /*
  * Cygwin has Tcl/Tk, but you need to keep the version numbers
  * of the libs in sync.  These version numbers may change
@@ -319,6 +322,9 @@ XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.55 2003/10/26 18:15:38 her
 
 #define BuildScreenSaverExt	NO
 
+#define BuildWindowsWMLibrary  YES
+
+
 /*
  * What is Plugin?
  */
diff --git a/config/cf/cygwin.rules b/config/cf/cygwin.rules
index 4d288992a..2fdc0a1f8 100644
--- a/config/cf/cygwin.rules
+++ b/config/cf/cygwin.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.26 2003/10/26 18:14:22 herrb Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.27 2003/10/26 18:17:37 herrb Exp $
 
 /*
  * Cygwin shared library rules (DLL versions)
@@ -25,6 +25,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.26 2003/10/26 18:14:22 herrb Exp $
 #define SharedLibDps		YES
 #define SharedLibDpsTk		YES
 #define SharedLibGlu		YES
+#define SharedLibWindowsWM	NO
 #ifndef SharedDataSeparation
 #define SharedDataSeparation	NO
 #endif
@@ -180,11 +181,11 @@ clean::									@@\
 
 /*
  * MakeDllProg
- */
-
-#define MakeDLLProg(libname,solist,prog,rev)				@@\
-	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import --def libname.def -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
-
+ */ 
+    
+#define MakeDLLProg(libname,solist,prog,rev)			        @@\
+	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc --def libname.def -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
+    
 /*
  * MakeDll
  */
diff --git a/config/cf/cygwin.tmpl b/config/cf/cygwin.tmpl
index 830e3e675..8475fbbe8 100644
--- a/config/cf/cygwin.tmpl
+++ b/config/cf/cygwin.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.17 2003/07/11 22:17:41 tsi Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
 
 #if UseCygIPC
 # define SharedX11Reqs		-lcygipc
@@ -23,6 +23,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.17 2003/07/11 22:17:41 tsi Exp $
 #define SharedGLReqs		$(LDPRELIB) $(XLIB)
 #define SharedGLUReqs		$(LDPRELIB) $(XLIB) $(GLXLIB)
 #define SharedXfontReqs		$(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB)
+#define SharedFontencReqs	$(LDPRELIB) GzipLibrary
 #define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB) 
 #define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
 #define SharedXpmReqs		$(LDPRELIB) $(XLIB)
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index c0fdcd3eb..2023fa797 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,6 @@
 XFree86 4.3.99.903 (xx December 2003)
+ 704. Merge recent cygwin-related changes from freedesktop.org's config/cf
+      (Thomas Dickey).
  703. Disable Xv in the via driver when acceleration is disabled (Alan Cox).
  702. Fix bugs caused by empty PCI buses on ZX1-based systems (Marc La France).
  701. Fix optional save/restore of BIOS area data in int10 module
@@ -18406,7 +18408,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3051 2003/12/23 22:46:38 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3052 2003/12/24 02:36:41 dawes Exp $