Fix the internal Conftest._Have() function to not translate non-alphanumeric characte...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1177 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b163ec6666070f5901c7fd2fe1dc87716e998a03..7776757b27dab476fff7717337db7c68e7706e45 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -206,6 +206,9 @@ RELEASE 0.97 - XXX
     and Linux, where it's named icc.  (Niall Douglas contributed an
     early prototype of parts of this module.)
 
+  - Fix the private Conftest._Have() function so it doesn't change
+    non-alphanumeric characters to underscores.
+
   From Chris Pawling:
 
   - Have the linkloc tool use $MSVS_VERSION to select the Microsoft

diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py
index f8912437fd7975d8a5e6274ea98d389d70ecbed0..4d178bd81f189e797d76a3a1c4fd76344e516db6 100644 (file)
--- a/src/engine/SCons/Conftest.py
+++ b/src/engine/SCons/Conftest.py
@@ -456,8 +456,7 @@ def _Have(context, key, have):
     elif type(have) == IntType:
         line = "#define %s %d\n" % (key_up, have)
     else:
-        line = "#define %s %s\n" % (key_up,
-                                    re.sub('[^A-Za-z0-9_]', '_', str(have)))
+        line = "#define %s %s\n" % (key_up, str(have))
     
     if context.headerfilename:
         f = open(context.headerfilename, "a")