diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-29 13:01:59 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-29 13:01:59 +0000 |
| commit | d08417182f7045b53c467934dbd36a51f39e7d5b (patch) | |
| tree | e18f924bac8019f56a610b8c6cbedd6d61b71caf /configure.in | |
| parent | 6d50b37b7c5c4cf5d38c36ba23b4db118336c728 (diff) | |
| download | cpython-git-d08417182f7045b53c467934dbd36a51f39e7d5b.tar.gz | |
Merged revisions 75131 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75131 | ronald.oussoren | 2009-09-29 15:00:44 +0200 (Tue, 29 Sep 2009) | 8 lines
* 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.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 277edc7b6b..cec970547e 100644 --- a/configure.in +++ b/configure.in @@ -101,6 +101,11 @@ AC_ARG_WITH(universal-archs, [ AC_MSG_RESULT($withval) UNIVERSAL_ARCHS="$withval" + if test "${enable_universalsdk}" ; then + : + else + AC_MSG_ERROR([--with-universal-archs without --enable-universalsdk. See Mac/README]) + fi ], [ AC_MSG_RESULT(32-bit) @@ -112,6 +117,11 @@ AC_ARG_WITH(framework-name, AC_HELP_STRING(--with-framework-name=FRAMEWORK, specify an alternate name of the framework built with --enable-framework), [ + if test "${enable_framework}"; then + : + else + AC_MSG_ERROR([--with-framework-name without --enable-framework. See Mac/README]) + fi PYTHONFRAMEWORK=${withval} PYTHONFRAMEWORKDIR=${withval}.framework PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr '[A-Z]' '[a-z]'` @@ -1626,7 +1636,7 @@ then AC_MSG_RESULT(yes) if test $enable_shared = "yes" then - AC_MSG_ERROR([Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead]) + AC_MSG_ERROR([Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead. See Mac/README.]) fi else AC_MSG_RESULT(no) |