[cig-commits] r5579 - in long/3D/Gale/trunk: . python/BuildSystem/config

[walter at geodynamics.org]

Author: walter
Date: 2006-12-10 02:29:29 -0800 (Sun, 10 Dec 2006)
New Revision: 5579

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/configure_vars.in
   long/3D/Gale/trunk/python/BuildSystem/config/types.py
Log:
 r1212 at earth:  boo | 2005-05-05 03:14:15 -0700
 Autodetect sizeof(long)



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1211
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1212

Modified: long/3D/Gale/trunk/configure_vars.in
===================================================================
--- long/3D/Gale/trunk/configure_vars.in	2006-12-10 10:29:26 UTC (rev 5578)
+++ long/3D/Gale/trunk/configure_vars.in	2006-12-10 10:29:29 UTC (rev 5579)
@@ -37,6 +37,8 @@
 if not '@WITH_SHARED@':
     with_shared=False
 
+# Add in the size of long
+env.Append(CPPFLAGS=['-DSYSTEM_SIZEOF_LONG=@SIZEOF_LONG@'])
 
 # Add in the MPI paths
 for path in Split('@MPI_CPPPATH@'):

Modified: long/3D/Gale/trunk/python/BuildSystem/config/types.py
===================================================================
--- long/3D/Gale/trunk/python/BuildSystem/config/types.py	2006-12-10 10:29:26 UTC (rev 5578)
+++ long/3D/Gale/trunk/python/BuildSystem/config/types.py	2006-12-10 10:29:29 UTC (rev 5579)
@@ -283,6 +283,7 @@
       size = self.framework.argDB[typename]
     self.sizes[typename] = int(size)
     self.addDefine(typename.upper(), size)
+    self.addSubstitution(typename.upper(), str(size))
     return size
 
   def checkBitsPerByte(self):