mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
Merged revisions 73305 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73305 | ronald.oussoren | 2009-06-08 14:12:41 -0700 (Mon, 08 Jun 2009) | 4 lines This is a fix for Issue5809: you shouldn't specify both --enable-framework and --enable-shared ........
This commit is contained in:
parent
0d2cceb01c
commit
99aab65113
|
@ -64,6 +64,10 @@ Build
|
|||
- Issue #6154: Make sure the intl library is added to LIBS if needed. Also
|
||||
added LIBS to OS X framework builds.
|
||||
|
||||
- Issue #5809: Specifying both --enable-framework and --enable-shared is
|
||||
an error. Configure now explicity tells you about this.
|
||||
|
||||
|
||||
|
||||
What's New in Python 3.1 release candidate 1?
|
||||
=============================================
|
||||
|
|
8
configure
vendored
8
configure
vendored
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 73142 .
|
||||
# From configure.in Revision: 73274 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for python 3.1.
|
||||
#
|
||||
|
@ -13286,6 +13286,12 @@ _ACEOF
|
|||
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
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;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
|
|
|
@ -1522,6 +1522,10 @@ then
|
|||
[Define if you want to produce an OpenStep/Rhapsody framework
|
||||
(shared library plus accessory files).])
|
||||
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])
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue