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
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 3f2179f90660cd10ef81d7038c73b32fd4b3d3b9..1aa84d23cfdef3fc0d16697e6568d0cafeeb48b3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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?
 =============================================

diff --git a/configure b/configure
index 4b429c3840cb5633189f01af3e3fa2f958b83d81..9d3c9a91f06e3711d91bf4b08d85197ac6de2311 100755 (executable)
--- a/configure
+++ b/configure
@@ -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; }

diff --git a/configure.in b/configure.in
index 73472bdc53e363e88c3ec6a50805c43294744d29..ecd789a9098830ceba1164d32b0b6cf99b96e390 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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