From f2d1b2a619e1e4f574d755e324fd0480f4c109a8 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 31 Oct 2010 16:53:53 +0000 Subject: 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 ........ --- configure | 4 ++++ configure.in | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fe6c820..0440545 100755 --- 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 3a87ff1..8f828de 100644 --- 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/ *$//'`" -- cgit v0.12