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 3f2179f..1aa84d2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,10 @@
 - 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?
 =============================================