[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#17550)

[benjamin.peterson]

http://hg.python.org/cpython/rev/81e005a410b7
changeset:   82966:81e005a410b7
parent:      82961:3c437e591499
parent:      82965:a11ee592af02
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Mar 26 08:58:16 2013 -0400
summary:
  merge 3.3 (#17550)

files:
  Misc/NEWS    |  2 ++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1148,6 +1148,8 @@
 Build
 -----
 
+- Issue #17550: Fix the --enable-profiling configure switch.
+
 - Issue #17425: Build with openssl 1.0.1d on Windows.
 
 - Issue #16754: Fix the incorrect shared library extension on linux. Introduce
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5534,7 +5534,7 @@
 
 if test "x$enable_profiling" = xyes; then
   ac_save_cc="$CC"
-  CC="$(CC) -pg"
+  CC="$CC -pg"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return 0; }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -883,7 +883,7 @@
               AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]))
 if test "x$enable_profiling" = xyes; then
   ac_save_cc="$CC"
-  CC="$(CC) -pg"
+  CC="$CC -pg"
   AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
     [],
     [enable_profiling=no])

-- 
Repository URL: http://hg.python.org/cpython