* Update the Mac/README file. Add the list of OSX-specific configure options
to that README file with some explanation.
* Be more strict in the configure script: complain loudly when the user has
specified invalid combinations of OSX-specific configure arguments.
The error message refers to the Mac/README file for more information.
diff --git a/configure b/configure
index aeae2e7..82f60be 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 74715 .
+# From configure.in Revision: 74978 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.7.
#
@@ -1923,6 +1923,13 @@
{ echo "$as_me:$LINENO: result: $withval" >&5
echo "${ECHO_T}$withval" >&6; }
UNIVERSAL_ARCHS="$withval"
+ if test "${enable_universalsdk}" ; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: --with-universal-archs without --enable-universalsdk. See Mac/README" >&5
+echo "$as_me: error: --with-universal-archs without --enable-universalsdk. See Mac/README" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
else
@@ -1938,6 +1945,13 @@
# Check whether --with-framework-name was given.
if test "${with_framework_name+set}" = set; then
withval=$with_framework_name;
+ if test "${enable_framework}"; then
+ :
+ else
+ { { echo "$as_me:$LINENO: error: --with-framework-name without --enable-framework. See Mac/README" >&5
+echo "$as_me: error: --with-framework-name without --enable-framework. See Mac/README" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
PYTHONFRAMEWORK=${withval}
PYTHONFRAMEWORKDIR=${withval}.framework
PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr 'A-Z' 'a-z'`
@@ -14612,8 +14626,8 @@
echo "${ECHO_T}yes" >&6; }
if test $enable_shared = "yes"
then
- { { echo "$as_me:$LINENO: error: Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" >&5
-echo "$as_me: error: Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" >&2;}
+ { { echo "$as_me:$LINENO: error: Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead. See Mac/README." >&5
+echo "$as_me: error: Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead. See Mac/README." >&2;}
{ (exit 1); exit 1; }; }
fi
else