List Info

Thread: CR: Use HELIX_CONFIG_NO_XWINDOWS to gate the use of X11 in unix.pcf




CR: Use HELIX_CONFIG_NO_XWINDOWS to gate the use of X11 in unix.pcf
user name
2006-07-19 23:06:53
Synopsis
 
HELIX_CONFIG_NO_XWINDOWS should be used to control whether
X11 libs are being used or not.
Previously this was implicitly determined by checking
sys.platform, sysinfo.family_list,
etc.  This patch removes the other checks and just relies on
HELIX_CONFIG_NO_XWINDOWS.
 
Note, I also moved the AddSystemLibraries("X11")
into the if block which seems correct to
me but should be verified by others who are more cognizant
of the intent of this file.
 
Index: datatype/common/baserend/unix.pcf
============================================================
=======
RCS file: /cvsroot/datatype/common/baserend/unix.pcf,v
retrieving revision 1.4
diff -u -r1.4 unix.pcf
--- datatype/common/baserend/unix.pcf   5 Feb 2005 00:03:42
-0000       1.4
+++ datatype/common/baserend/unix.pcf   19 Jul 2006 22:59:37
-0000
 -49,9
+49,6 
 # ***** END LICENSE BLOCK *****
 #
 
-project.AddSystemLibraries("X11")
-
-if (sys.platform != "beos" and
-    not ('linux' in sysinfo.family_list and sysinfo.arch
== 'armv4l') and
-    not
project.IsDefined("HELIX_CONFIG_NO_XWINDOWS")):
+if not
project.IsDefined("HELIX_CONFIG_NO_XWINDOWS"):
        project.AddDefines("USE_XWINDOWS")
+       project.AddSystemLibraries("X11")

 
Greg


_______________________________________________
Datatype-dev mailing list
Datatype-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
[1]

about | contact  Other archives ( Real Estate discussion Medical topics )