diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-29 13:00:44 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-29 13:00:44 +0000 |
| commit | 34ac287787a706af9315f5c1d23cf22c255aa4ff (patch) | |
| tree | 3244e7bf356fe2424816eaa222508289e9fb4255 /configure | |
| parent | 31a20bce393977536be068a1c765bdcd3aee936c (diff) | |
| download | cpython-34ac287787a706af9315f5c1d23cf22c255aa4ff.tar.gz | |
* 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.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -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 @@ if test "${with_universal_archs+set}" = set; then { 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 @@ fi # 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 @@ _ACEOF 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 |