[Numpy-svn] r4735 - in branches/build_with_scons/numpy/core: . include/numpy

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-01-21 00:05:24 -0600 (Mon, 21 Jan 2008)
New Revision: 4735

Modified:
   branches/build_with_scons/numpy/core/SConstruct
   branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
Log:
Fixes for config and numpyconfig header generation:
 - Replace #ifdef CHAR_BIT by a scons declaration check.


Modified: branches/build_with_scons/numpy/core/SConstruct
===================================================================
--- branches/build_with_scons/numpy/core/SConstruct	2008-01-21 05:52:58 UTC (rev 4734)
+++ branches/build_with_scons/numpy/core/SConstruct	2008-01-21 06:05:24 UTC (rev 4735)
@@ -62,6 +62,9 @@
 else:
     numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_LONGLONG', ''))
     numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_PY_LONG_LONG', ''))
+
+if not config.CheckDeclaration('CHAR_BIT', includes= '#include <Python.h>\n'):
+    raise RuntimeError("Config wo CHAR_BIT is not supported with scons: please contact the maintainer (cdavid)")
 #----------------------
 # Checking signal stuff
 #----------------------

Modified: branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
===================================================================
--- branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-21 05:52:58 UTC (rev 4734)
+++ branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-21 06:05:24 UTC (rev 4735)
@@ -15,8 +15,3 @@
 /* XXX: this has to be done outside config files !!!! */
 @DEFINE_NPY_SIZEOF_LONGLONG@
 @DEFINE_NPY_SIZEOF_PY_LONG_LONG@
-
-#ifndef CHAR_BIT
-        #error Configuration for undefined CHAR_BIT is not supported, contact the maintainter
-        #define CHAR_BIT      @CHAR_BIT@
-#endif