[Numpy-svn] r6487 - trunk/numpy/core

[numpy-svn at scipy.org]

Author: cdavid
Date: 2009-02-26 06:37:39 -0600 (Thu, 26 Feb 2009)
New Revision: 6487

Modified:
   trunk/numpy/core/setup.py
Log:
Do not use testcode anymore for numpyconfig.h generation.

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2009-02-26 12:37:26 UTC (rev 6486)
+++ trunk/numpy/core/setup.py	2009-02-26 12:37:39 UTC (rev 6487)
@@ -294,17 +294,18 @@
         if newer(__file__,target):
             config_cmd = config.get_config_cmd()
             log.info('Generating %s',target)
-            testcode = generate_numpyconfig_code(target)
 
-            result = config_cmd.try_run(testcode,
-                        include_dirs=config.numpy_include_dirs,
-                        library_dirs=default_lib_dirs)
-            if not result:
-                raise SystemError,"Failed to generate numpy configuration. "\
-                      "See previous error messages for more information."
+            # Check sizeof
+            ignored, moredefs = check_types(config, ext, build_dir)
 
-            moredefs = []
+            if is_npy_no_signal():
+                moredefs.append(('NPY_NO_SIGNAL', 1))
 
+            if is_npy_no_smp():
+                moredefs.append(('NPY_NO_SMP', 1))
+            else:
+                moredefs.append(('NPY_NO_SMP', 0))
+
             # Normally, isnan and isinf are macro (C99), but some platforms
             # only have func, or both func and macro version. Check for macro
             # only, and define replacement ones if not found.