7eb10c
diff -up ./configure.autotool-intermediates ./configure
cce760
--- ./configure.autotool-intermediates	2011-07-11 11:50:06.910425999 -0400
cce760
+++ ./configure	2011-07-11 11:50:13.492426001 -0400
cce760
@@ -619,6 +619,8 @@ TRUE
7eb10c
 MACHDEP_OBJS
7eb10c
 DYNLOADFILE
7eb10c
 DLINCLDIR
7eb10c
+DTRACEHDRS
7eb10c
+DTRACEOBJS
7eb10c
 THREADOBJ
7eb10c
 LDLAST
7eb10c
 USE_THREAD_MODULE
cce760
@@ -764,8 +766,11 @@ with_thread
7eb10c
 enable_ipv6
7eb10c
 with_doc_strings
7eb10c
 with_tsc
7eb10c
+with_count_allocs
7eb10c
+with_call_profile
7eb10c
 with_pymalloc
7eb10c
 with_valgrind
7eb10c
+with_dtrace
7eb10c
 with_fpectl
7eb10c
 with_libm
5080ff
 with_libc
cce760
@@ -781,7 +786,8 @@ CFLAGS
cce760
 LDFLAGS
cce760
 LIBS
cce760
 CPPFLAGS
cce760
-CPP'
cce760
+CPP
cce760
+CPPFLAGS'
3f75b3
 
3f75b3
 
cce760
 # Initialize some variables set by options.
cce760
@@ -1437,8 +1443,11 @@ Optional Packages:
7eb10c
                           deprecated; use --with(out)-threads
7eb10c
   --with(out)-doc-strings disable/enable documentation strings
7eb10c
   --with(out)-tsc         enable/disable timestamp counter profile
7eb10c
+  --with(out)count-allocs  enable/disable per-type instance accounting
7eb10c
+  --with(out)-call-profile  enable/disable statistics on function call invocation
7eb10c
   --with(out)-pymalloc    disable/enable specialized mallocs
7eb10c
   --with-valgrind         Enable Valgrind support
7eb10c
+  --with(out)-dtrace      disable/enable dtrace support
7eb10c
   --with-fpectl           enable SIGFPE catching
7eb10c
   --with-libm=STRING      math library
5080ff
   --with-libc=STRING      C library
cce760
@@ -9284,6 +9293,50 @@ $as_echo "no" >&6; }
7eb10c
 fi
7eb10c
 
7eb10c
 
7eb10c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5
7eb10c
+$as_echo_n "checking for --with-count-allocs... " >&6; }
7eb10c
+
7eb10c
+# Check whether --with-count-allocs was given.
7eb10c
+if test "${with_count_allocs+set}" = set; then :
7eb10c
+  withval=$with_count_allocs;
7eb10c
+if test "$withval" != no
7eb10c
+then
7eb10c
+
7eb10c
+$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h
7eb10c
+
7eb10c
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7eb10c
+$as_echo "yes" >&6; }
7eb10c
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7eb10c
+$as_echo "no" >&6; }
7eb10c
+fi
7eb10c
+else
7eb10c
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7eb10c
+$as_echo "no" >&6; }
7eb10c
+fi
7eb10c
+
7eb10c
+
7eb10c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5
7eb10c
+$as_echo_n "checking for --with-call-profile... " >&6; }
7eb10c
+
7eb10c
+# Check whether --with-call-profile was given.
7eb10c
+if test "${with_call_profile+set}" = set; then :
7eb10c
+  withval=$with_call_profile;
7eb10c
+if test "$withval" != no
7eb10c
+then
7eb10c
+
7eb10c
+$as_echo "#define CALL_PROFILE 1" >>confdefs.h
7eb10c
+
7eb10c
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7eb10c
+$as_echo "yes" >&6; }
7eb10c
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7eb10c
+$as_echo "no" >&6; }
7eb10c
+fi
7eb10c
+else
7eb10c
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7eb10c
+$as_echo "no" >&6; }
7eb10c
+fi
7eb10c
+
7eb10c
+
7eb10c
 # Check for Python-specific malloc support
7eb10c
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
7eb10c
 $as_echo_n "checking for --with-pymalloc... " >&6; }
cce760
@@ -9336,6 +9389,46 @@ fi
7eb10c
     OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
7eb10c
 fi
7eb10c
 
7eb10c
+# Check for dtrace support
7eb10c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5
7eb10c
+$as_echo_n "checking for --with-dtrace... " >&6; }
7eb10c
+
7eb10c
+# Check whether --with-dtrace was given.
7eb10c
+if test "${with_dtrace+set}" = set; then :
7eb10c
+  withval=$with_dtrace;
7eb10c
+fi
7eb10c
+
7eb10c
+
7eb10c
+if test ! -z "$with_dtrace"
7eb10c
+then
7eb10c
+    if dtrace -G -o /dev/null -s $srcdir/Include/pydtrace.d 2>/dev/null
7eb10c
+    then
7eb10c
+
7eb10c
+$as_echo "#define WITH_DTRACE 1" >>confdefs.h
7eb10c
+
7eb10c
+	with_dtrace="Sun"
7eb10c
+	DTRACEOBJS="Python/dtrace.o"
7eb10c
+	DTRADEHDRS=""
7eb10c
+    elif dtrace -h -o /dev/null -s $srcdir/Include/pydtrace.d
7eb10c
+   then
7eb10c
+
7eb10c
+$as_echo "#define WITH_DTRACE 1" >>confdefs.h
7eb10c
+
7eb10c
+	with_dtrace="Apple"
7eb10c
+	DTRACEOBJS=""
7eb10c
+	DTRADEHDRS="pydtrace.h"
7eb10c
+    else
7eb10c
+	with_dtrace="no"
7eb10c
+    fi
7eb10c
+else
7eb10c
+    with_dtrace="no"
7eb10c
+fi
7eb10c
+
7eb10c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5
7eb10c
+$as_echo "$with_dtrace" >&6; }
7eb10c
+
7eb10c
+
7eb10c
+
5080ff
 # -I${DLINCLDIR} is added to the compile rule for importdl.o
5080ff
 
5080ff
 DLINCLDIR=.
7eb10c
diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
cce760
--- ./pyconfig.h.in.autotool-intermediates	2011-07-11 11:50:06.896426002 -0400
cce760
+++ ./pyconfig.h.in	2011-07-11 11:50:13.965426001 -0400
7eb10c
@@ -12,15 +12,15 @@
7eb10c
    support for AIX C++ shared extension modules. */
7eb10c
 #undef AIX_GENUINE_CPLUSPLUS
7eb10c
 
7eb10c
-/* Define if you have the Mach cthreads package */
7eb10c
-#undef C_THREADS
7eb10c
-
7eb10c
 /* Define to keep records on function call invocation */
7eb10c
 #undef CALL_PROFILE
7eb10c
 
7eb10c
 /* Define to keep records of the number of instances of each type */
7eb10c
 #undef COUNT_ALLOCS
7eb10c
 
7eb10c
+/* Define if you have the Mach cthreads package */
7eb10c
+#undef C_THREADS
7eb10c
+
7eb10c
 /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM
7eb10c
    mixed-endian order (byte order 45670123) */
7eb10c
 #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754