[Python-checkins] r73306 - in python/branches/release26-maint: Misc/NEWS configure configure.in
ronald.oussoren
python-checkins at python.org
Mon Jun 8 23:19:36 CEST 2009
Author: ronald.oussoren
Date: Mon Jun 8 23:19:36 2009
New Revision: 73306
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/configure
python/branches/release26-maint/configure.in
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Mon Jun 8 23:19:36 2009
@@ -578,6 +578,9 @@
Build
-----
+- Issue 5809: Specifying both --enable-framework and --enable-shared is
+ an error. Configure now explicity tells you about this.
+
- Link the shared python library with $(MODLIBS).
- Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
Modified: python/branches/release26-maint/configure
==============================================================================
--- python/branches/release26-maint/configure (original)
+++ python/branches/release26-maint/configure Mon Jun 8 23:19:36 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 72275 .
+# From configure.in Revision: 72873 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -12951,6 +12951,12 @@
{ 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; }
Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in (original)
+++ python/branches/release26-maint/configure.in Mon Jun 8 23:19:36 2009
@@ -1553,6 +1553,10 @@
[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
More information about the Python-checkins
mailing list