diff options
| -rw-r--r-- | config/cf/X11.tmpl | 18 | ||||
| -rw-r--r-- | config/cf/darwin.cf | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/config/cf/X11.tmpl b/config/cf/X11.tmpl index 578b02758..a22d7d589 100644 --- a/config/cf/X11.tmpl +++ b/config/cf/X11.tmpl @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.300tsi Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.301tsi Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -128,6 +128,18 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.300tsi Exp $ # endif #endif +#ifndef StaticUtils +#define StaticUtils NO +#endif +#if StaticUtils +#undef BuildLibraries +#undef ForceNormalLib +#undef BuildClients +#define BuildLibraries YES +#define ForceNormalLib YES +#define BuildClients YES +#endif + #ifndef HasXServer #define HasXServer YES #endif @@ -2007,10 +2019,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules VENDORMANDEFS = VendorManDefs -#ifndef StaticUtils -#define StaticUtils NO -#endif - #if HasSharedLibraries #ifndef DontUseLibPathVar #ifndef BuildLibPathVar diff --git a/config/cf/darwin.cf b/config/cf/darwin.cf index e0e77aec4..87ee32ec5 100644 --- a/config/cf/darwin.cf +++ b/config/cf/darwin.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.59tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.60tsi Exp $ /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */ @@ -315,19 +315,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe /* no XFree86-VidMode extension */ #define BuildXF86VidModeExt NO -/* No longer works after security update 2007-004 */ +/* No longer works after "security" update 2007-004 */ #if OSMajorVersion < 9 #define BuildLibPathVar DYLD_LIBRARY_PATH #else #undef DontUseLibPathVar #define DontUseLibPathVar YES -#undef BuildClients -#define BuildClients YES -#undef BuildLibraries -#define BuildLibraries YES -/* So we can statically link certain utilities */ -#undef ForceNormalLib -#define ForceNormalLib YES #undef StaticUtils #define StaticUtils YES #endif @@ -413,4 +406,3 @@ NamedTargetSubdirs(resymlink,dirs,"resymlinking",NullParameter,resymlink) /* include all the XFree86 rules */ #include <xfree86.cf> - |