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 15611a08d0cd7fc3fe943881e81c55ccc56b385d..c0dee3d5cd4c9a1d1da649836b8462f34e1182eb 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -578,6 +578,9 @@ Extension Modules
 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++.

diff --git a/configure b/configure
index 69f15ac8c352cf7674582fafe8bb9e9aeea117b7..8195c4d7cf853043522a5b752784e177ad3dd20b 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 @@ _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 481d400224524f2f0e78e0e941dff963189f26f6..f9c1139508d0973608e641b34af28241765d3721 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1553,6 +1553,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