r86043 - in python/branches/release27-maint: configure configure.in
Author: benjamin.peterson Date: Sun Oct 31 17:53:53 2010 New Revision: 86043 Log: 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 ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/configure python/branches/release27-maint/configure.in Modified: python/branches/release27-maint/configure ============================================================================== --- python/branches/release27-maint/configure (original) +++ python/branches/release27-maint/configure Sun Oct 31 17:53:53 2010 @@ -8296,6 +8296,8 @@ # 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 @@ # 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 Modified: python/branches/release27-maint/configure.in ============================================================================== --- python/branches/release27-maint/configure.in (original) +++ python/branches/release27-maint/configure.in Sun Oct 31 17:53:53 2010 @@ -2087,14 +2087,18 @@ # 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/ *$//'`"
participants (1)
-
benjamin.peterson