XFree86 3.1.0C

2 files changed, 59 insertions, 15 deletions

diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules
index 5f37f2f66..b57c6cd81 100644
--- a/xc/config/cf/lnxLib.rules
+++ b/xc/config/cf/lnxLib.rules
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: lnxLib.rules,v 1.5 95/01/11 21:40:59 kaleb Exp kaleb $
+XCOMM $XConsortium: lnxLib.rules,v 1.6 95/01/11 21:42:40 kaleb Exp kaleb $
 
 /*
  * Linux shared library rules (DLL & ELF versions)
@@ -131,9 +131,12 @@ clean::									@@\
  *  JUMP_IS_HOST_Xfoo = YES
  *  JUMP_STUBLIBS_Xfoo = libXfoo.sa
  *  JUMP_DIR_Xfoo = $(JUMP_ROOT_Xfoo)/shared		<work directory>
+ *  JUMP_DEFS_Xfoo = -DFOO				<defs for jump files>
  *  JUMP_VARS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_vars	<see DLL docs>
  *  JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs	<see DLL docs>
  *  JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore	<see DLL docs>
+ *  JUMP_EXPORT_Xfoo = $(JUMP_DIR_Xfoo)/jump.vars	<exported symbols>
+ *  JUMP_IMPORT_Xfoo = $(JUMP_DIR_Xbar)			<imported symbols>
  *  JUMP_ADDRESS_Xfoo = 0xXXXXXXXX			<fill in with address>
  *  JUMP_JUMPTABLESIZE_Xfoo = 0x4000			<adjust if necessary>
  *  JUMP_GOTSIZE_Xfoo = 4096				<adjust if necessary>
@@ -165,9 +168,11 @@ JUMP_IS_HOST_X11 = YES
 JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa
 JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
 JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
+JUMP_DEFS_X11 = $(XDMAUTHDEFS)
 JUMP_VARS_X11 = $(JUMP_ROOT_X11)/jump_vars
 JUMP_FUNCS_X11 = $(JUMP_ROOT_X11)/jump_funcs
 JUMP_IGNORE_X11 = $(JUMP_ROOT_X11)/jump_ignore
+JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars
 JUMP_ADDRESS_X11 = 0x60200000
 JUMP_JUMPTABLESIZE_X11 = 0x4000
 JUMP_GOTSIZE_X11 = 4096
@@ -199,7 +204,8 @@ JUMP_DIR_Xt = $(JUMP_ROOT_Xt)/shared
 JUMP_VARS_Xt = $(JUMP_ROOT_Xt)/jump_vars
 JUMP_FUNCS_Xt = $(JUMP_ROOT_Xt)/jump_funcs
 JUMP_IGNORE_Xt = $(JUMP_ROOT_Xt)/jump_ignore
-JUMP_IMPORT_Xt = $(JUMP_VARS_X11)
+JUMP_EXPORT_Xt = $(JUMP_DIR_Xt)/jump.vars
+JUMP_IMPORT_Xt = $(JUMP_EXPORT_X11)
 JUMP_ADDRESS_Xt = 0x602a0000
 JUMP_JUMPTABLESIZE_Xt = 0x4000
 JUMP_GOTSIZE_Xt = 4096
@@ -242,7 +248,8 @@ JUMP_DIR_Xaw = $(JUMP_ROOT_Xaw)/shared
 JUMP_VARS_Xaw = $(JUMP_ROOT_Xaw)/jump_vars
 JUMP_FUNCS_Xaw = $(JUMP_ROOT_Xaw)/jump_funcs
 JUMP_IGNORE_Xaw = $(JUMP_ROOT_Xaw)/jump_ignore
-JUMP_IMPORT_Xaw = $(JUMP_VARS_Xt) $(JUMP_VARS_X11)
+JUMP_EXPORT_Xaw = $(JUMP_DIR_Xaw)/jump.vars
+JUMP_IMPORT_Xaw = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
 JUMP_ADDRESS_Xaw = 0x60300000
 JUMP_JUMPTABLESIZE_Xaw = 0x4000
 JUMP_GOTSIZE_Xaw = 4096
@@ -261,7 +268,8 @@ JUMP_DIR_PEX5 = $(JUMP_ROOT_PEX5)/shared
 JUMP_VARS_PEX5 = $(JUMP_ROOT_PEX5)/jump_vars
 JUMP_FUNCS_PEX5 = $(JUMP_ROOT_PEX5)/jump_funcs
 JUMP_IGNORE_PEX5 = $(JUMP_ROOT_PEX5)/jump_ignore
-JUMP_IMPORT_PEX5 = $(JUMP_VARS_X11)
+JUMP_EXPORT_PEX5 = $(JUMP_DIR_PEX5)/jump.vars
+JUMP_IMPORT_PEX5 = $(JUMP_EXPORT_X11)
 JUMP_ADDRESS_PEX5 = 0x60b00000
 JUMP_JUMPTABLESIZE_PEX5 = 0x4000
 JUMP_GOTSIZE_PEX5 = 4096
@@ -278,7 +286,8 @@ JUMP_DIR_XIE = $(JUMP_ROOT_XIE)/shared
 JUMP_VARS_XIE = $(JUMP_ROOT_XIE)/jump_vars
 JUMP_FUNCS_XIE = $(JUMP_ROOT_XIE)/jump_funcs
 JUMP_IGNORE_XIE = $(JUMP_ROOT_XIE)/jump_ignore
-JUMP_IMPORT_XIE = $(JUMP_VARS_X11)
+JUMP_EXPORT_XIE = $(JUMP_DIR_XIE)/jump.vars
+JUMP_IMPORT_XIE = $(JUMP_EXPORT_X11)
 JUMP_ADDRESS_XIE = 0x60be0000
 JUMP_JUMPTABLESIZE_XIE = 0x4000
 JUMP_GOTSIZE_XIE = 4096
@@ -296,7 +305,8 @@ JUMP_DIR_Fresco = $(JUMP_ROOT_Fresco)/shared
 JUMP_VARS_Fresco = $(JUMP_ROOT_Fresco)/jump_vars
 JUMP_FUNCS_Fresco = $(JUMP_ROOT_Fresco)/jump_funcs
 JUMP_IGNORE_Fresco = $(JUMP_ROOT_Fresco)/jump_ignore
-JUMP_IMPORT_Fresco = $(JUMP_VARS_X11)
+JUMP_EXPORT_Fresco = $(JUMP_DIR_Fresco)/jump.vars
+JUMP_IMPORT_Fresco = $(JUMP_EXPORT_X11)
 JUMP_ADDRESS_Fresco = 0x60bc0000
 JUMP_JUMPTABLESIZE_Fresco = 0x4000
 JUMP_GOTSIZE_Fresco = 4096
@@ -431,15 +441,18 @@ jumpsetup_1:: $(JUMP_DIR)/jump.funcs $(JUMP_DIR)/jump.vars \
 									@@\
 $(JUMP_DIR)/jump.funcs: $(Concat(JUMP_FUNCS_,libname))			@@\
 	$(RM) $(JUMP_DIR)/jump.funcs					@@\
-	cat $(Concat(JUMP_FUNCS_,libname)) > $@				@@\
+	cat $(Concat(JUMP_FUNCS_,libname)) | \
+		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
 									@@\
 $(JUMP_DIR)/jump.vars: $(Concat(JUMP_VARS_,libname))			@@\
 	$(RM) $(JUMP_DIR)/jump.vars					@@\
-	cat $(Concat(JUMP_VARS_,libname)) > $@				@@\
+	cat $(Concat(JUMP_VARS_,libname)) | \
+		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
 									@@\
 $(JUMP_DIR)/jump.ignore: $(Concat(JUMP_IGNORE_,libname))		@@\
 	$(RM) $(JUMP_DIR)/jump.ignore					@@\
-	cat $(Concat(JUMP_IGNORE_,libname)) > $@			@@\
+	cat $(Concat(JUMP_IGNORE_,libname)) | \
+		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
 									@@\
 $(JUMP_DIR)/jump.import: $(JUMP_DIR)/stubs.import \
 		$(Concat(JUMP_IMPORT_,libname))				@@\
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index 8efdc52e0..aafa42e01 100644
--- a/xc/config/cf/xfree86.cf
+++ b/xc/config/cf/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: xfree86.cf,v 1.5 95/01/11 16:18:33 kaleb Exp kaleb $
+XCOMM $XConsortium: xfree86.cf,v 1.6 95/01/12 16:09:37 kaleb Exp kaleb $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -181,17 +181,25 @@ XCOMM $XConsortium: xfree86.cf,v 1.5 95/01/11 16:18:33 kaleb Exp kaleb $
 #define CompressAllFonts	YES
 #endif
 
+#ifndef InstallXcmsTxt
+#define InstallXcmsTxt		YES
+#endif
+
 #ifndef HasLinuxDoc
 #define HasLinuxDoc		NO
 #endif
 
+#ifndef InstallJapaneseDocs
+#define InstallJapaneseDocs	NO
+#endif
+
 /* Server defines required for all OSs */
 #ifndef XFree86ServerDefines
 #define XFree86ServerDefines	-DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV LinkKitDefines
 #endif
 
 #ifndef XFree86ServerOSDefines
-#define XFree86ServerOSDefines	-DDDXOSINIT -DXFREE86 -DSERVER_LOCK
+#define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK
 #endif
 
 #ifndef XFree86ConsoleDefines
@@ -285,9 +293,10 @@ XF86HWLIB  = $(XF86HWSRC)/libxf86_hw.a
 XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
 XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
 
-    XFREE86DOCDIR = $(LIBDIR)/doc
-  XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
-XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
+        XFREE86DOCDIR = $(LIBDIR)/doc
+      XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
+    XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
+XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese
 
 /*
  * Other stuff used in the Server source.
@@ -298,7 +307,15 @@ XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
 #endif
 
 #ifndef XFree86Version
-#define XFree86Version	3102
+#define XFree86Version	3103
+#endif
+
+#ifndef XVendorString
+#define XVendorString "The XFree86 Project, Inc"
+#endif
+
+#ifndef XVendorRelease
+#define XVendorRelease        XFree86Version
 #endif
 
 #ifndef UseRgbTxt
@@ -329,4 +346,18 @@ XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
 #endif
 #endif
 
+#ifndef BuildLBXCompatible
+#define BuildLBXCompatible NO
+#endif
+
+#ifndef BuildLBX
+#define BuildLBX NO
+#endif
+
+#if BuildLBXCompatible
+#if !BuildLBX
+#define LbxDefines -DLBX_COMPAT
+#endif
+#endif
+
 #include <xf86.rules>