Merged revisions 86042 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86042 | benjamin.peterson | 2010-10-31 11:50:44 -0500 (Sun, 31 Oct 2010) | 1 line

  add no output to with-system-ffi and with-system-expat
........

diff --git a/configure b/configure
index fe6c8206d4f407cf3450c7d2d35f9370e70d697b..04405454096f6a32a1a71e450ad1e1626258af22 100755 (executable)
--- a/configure
+++ b/configure
@@ -8296,6 +8296,8 @@ $as_echo_n "checking for --with-system-expat... " >&6; }
 # Check whether --with-system_expat was given.
 if test "${with_system_expat+set}" = set; then :
   withval=$with_system_expat;
+else
+  with_system_expat="no"
 fi
 
 
@@ -8309,6 +8311,8 @@ $as_echo_n "checking for --with-system-ffi... " >&6; }
 # Check whether --with-system_ffi was given.
 if test "${with_system_ffi+set}" = set; then :
   withval=$with_system_ffi;
+else
+  with_system_ffi="no"
 fi
 
 

diff --git a/configure.in b/configure.in
index 3a87ff11372864d55ebb34a3bdcab3aafb1b83ec..8f828de2f41fc2066d5a2bcde0326a904ac53d16 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2087,14 +2087,18 @@ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 # Check for use of the system expat library
 AC_MSG_CHECKING(for --with-system-expat)
 AC_ARG_WITH(system_expat,
-            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]))
+            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
+            [],
+            [with_system_expat="no"])
 
 AC_MSG_RESULT($with_system_expat)
 
 # Check for use of the system libffi library
 AC_MSG_CHECKING(for --with-system-ffi)
 AC_ARG_WITH(system_ffi,
-            AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]))
+            AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]),
+            [],
+            [with_system_ffi="no"])
 
 if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
     LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"