Merged revisions 76644 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76644 | benjamin.peterson | 2009-12-02 20:52:39 -0600 (Wed, 02 Dec 2009) | 4 lines

  disable pymalloc tricks with the --with-valgrind option #2422

  Patch from James Henstridge.
........

1 files changed, 162 insertions, 1 deletions

diff --git a/configure b/configure
index 50d0769..e4c88f4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 76566 .
+# From configure.in Revision: 76637 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -1355,6 +1355,7 @@ Optional Packages:
   --with(out)-doc-strings disable/enable documentation strings
   --with(out)-tsc         enable/disable timestamp counter profile
   --with(out)-pymalloc    disable/enable specialized mallocs
+  --with-valgrind         Enable Valgrind support
   --with-wctype-functions use wctype.h functions
   --with-fpectl           enable SIGFPE catching
   --with-libm=STRING      math library
@@ -17107,6 +17108,166 @@ fi
 { echo "$as_me:$LINENO: result: $with_pymalloc" >&5
 echo "${ECHO_T}$with_pymalloc" >&6; }
 
+# Check for Valgrind support
+{ echo "$as_me:$LINENO: checking for --with-valgrind" >&5
+echo $ECHO_N "checking for --with-valgrind... $ECHO_C" >&6; }
+
+# Check whether --with-valgrind was given.
+if test "${with_valgrind+set}" = set; then
+  withval=$with_valgrind;
+else
+  with_valgrind=no
+fi
+
+{ echo "$as_me:$LINENO: result: $with_valgrind" >&5
+echo "${ECHO_T}$with_valgrind" >&6; }
+if test "$with_valgrind" != no; then
+    if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
+echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_valgrind_h" >&5
+echo "${ECHO_T}$ac_cv_header_valgrind_valgrind_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking valgrind/valgrind.h usability" >&5
+echo $ECHO_N "checking valgrind/valgrind.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <valgrind/valgrind.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking valgrind/valgrind.h presence" >&5
+echo $ECHO_N "checking valgrind/valgrind.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <valgrind/valgrind.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: valgrind/valgrind.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------- ##
+## Report this to http://bugs.python.org/ ##
+## -------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
+echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_valgrind_valgrind_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_valgrind_h" >&5
+echo "${ECHO_T}$ac_cv_header_valgrind_valgrind_h" >&6; }
+
+fi
+if test $ac_cv_header_valgrind_valgrind_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_VALGRIND 1
+_ACEOF
+
+else
+  { { echo "$as_me:$LINENO: error: Valgrind support requested but headers not available" >&5
+echo "$as_me: error: Valgrind support requested but headers not available" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+fi
+
 # Check for --with-wctype-functions
 { echo "$as_me:$LINENO: checking for --with-wctype-functions" >&5
 echo $ECHO_N "checking for --with-wctype-functions... $ECHO_C" >&6; }