Forward port a number of OSX bugfixes from the trunk to 3.2
diff --git a/pyconfig.h.in b/pyconfig.h.in
index aad6c29..7d6f23c 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -632,6 +632,9 @@
 /* Define if you have the 'socketpair' function. */
 #undef HAVE_SOCKETPAIR
 
+/* Define to 1 if you have the <spawn.h> header file. */
+#undef HAVE_SPAWN_H
+
 /* Define if your compiler provides ssize_t */
 #undef HAVE_SSIZE_T
 
@@ -850,6 +853,9 @@
    Include/unicodeobject.h). */
 #undef HAVE_USABLE_WCHAR_T
 
+/* Define to 1 if you have the <util.h> header file. */
+#undef HAVE_UTIL_H
+
 /* Define to 1 if you have the `utimes' function. */
 #undef HAVE_UTIMES