diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-02 14:16:07 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-02 14:16:07 +0000 |
| commit | bad8b213fc75da8fb63f52fd6bb8c7a29f4ef171 (patch) | |
| tree | d293bf2fbb4ed80254a3922e8ab2bb9accb34147 | |
| parent | caaeeea9660811efc935567b377855dacd834fac (diff) | |
Removing last bits of kdrive.
10. Made use system supplied Expat and Freetype2 library the default on
Linux (documented in the release notes) (Bugzilla #218,#219) (Egbert
Eich).
9. Patched __AMD64__ flags to __amd64__ (Egbert Eich).
8. Added RELNOTES.XORG to collect bits for release notes for this release
(Egbert Eich).
7. Removed leftovers from libxml2 (Bugzilla #220)(Egbert Eich).
| -rw-r--r-- | Imake.cf | 8 | ||||
| -rw-r--r-- | X11.tmpl | 4 | ||||
| -rw-r--r-- | linux.cf | 16 |
3 files changed, 16 insertions, 12 deletions
@@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.5 2003/12/20 00:28:21 kaleb Exp $ +XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.6 2004/02/23 21:31:43 kaleb Exp $ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: @@ -904,12 +904,12 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # define s390xArchitecture # undef __s390x__ # endif -# if defined(__AMD64__) || defined (__x86_64__) -# undef __AMD64__ +# if defined(__amd64__) || defined (__x86_64__) +# undef __amd64__ # undef __x86_64__ # define AMD64Architecture # endif -# if defined(AMD64__) || defined (x86_64__) +# if defined(amd64__) || defined (x86_64__) # undef AMD64__ # undef x86_64__ # ifndef AMD64Architecture @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.1.4.7 2004/02/25 21:46:22 kaleb Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.1.4.7.2.1 2004/02/27 21:30:42 eich Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -340,7 +340,7 @@ VENDORMANVERSION = XVendorManVersionString #define BuildFontLib (BuildLibraries || \ (BuildServer && !DoLoadableServer) || \ XnestServer || XVirtualFramebufferServer || \ - XprtServer || KDriveXServer) + XprtServer) #endif #endif #ifndef BuildFontCache @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.4 2003/12/20 00:28:21 kaleb Exp $ +XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.5 2004/02/23 21:31:43 kaleb Exp $ XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ @@ -484,6 +484,14 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #define HasLibpng YES #endif +#ifndef HasExpat +# define HasExpat YES +#endif + +#ifndef HasFreetype2 +# define HasFreetype2 +#endif + #define AvoidNullMakeCommand YES #ifndef DebuggableLibraries #define DebuggableLibraries NO @@ -900,7 +908,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2AMD64Opt # endif -# define LinuxMachineDefines -D__AMD64__ +# define LinuxMachineDefines -D__amd64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AMD64Architecture */ @@ -990,11 +998,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif #include <lnxLib.rules> -#ifdef KDriveXServer -# include <kdrive.cf> -#else # include <xfree86.cf> -#endif #ifndef XFree86ServerOSDefines # define XFree86ServerOSDefines |