Merged revisions 87639 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87639 | antoine.pitrou | 2011-01-02 20:34:03 +0100 (dim., 02 janv. 2011) | 4 lines

  Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
  and DragonFly BSD.  Patch by Nicolas Joly.
........

diff --git a/Misc/ACKS b/Misc/ACKS
index 02a0724fde677db911809b5dd1d2cbd7fee5de13..433d9bf03cc0e4a28ca0bb402467d5a63d99f8d6 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -393,6 +393,7 @@ Fredrik Johansson
 Gregory K. Johnson
 Simon Johnston
 Thomas Jollans
+Nicolas Joly
 Evan Jones
 Jeremy Jones
 Richard Jones

diff --git a/Misc/NEWS b/Misc/NEWS
index 340fc124d6567c540a3b6cf8acb1554f8bc8da9d..a352559d0606ba04fda46135e79e452c76abb015 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -86,6 +86,12 @@ Extensions
 
 - Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
 
+Build
+-----
+
+- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
+  and DragonFly BSD.  Patch by Nicolas Joly.
+
 Tests
 -----
 

diff --git a/configure b/configure
index b4823f99f60624eabbd2f7201dd759a3e4ffa825..f68057f952d47029aceb3aea7962f808cd085242 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 86044 .
+# From configure.in Revision: 86752 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.1.
 #
@@ -757,8 +757,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -7564,7 +7563,7 @@ then
                                   ;;
                                esac
                fi;;
-       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*) LDSHARED="$(CC) -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then LDSHARED='$(CC) -shared'
@@ -13923,8 +13922,8 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
 
 _ACEOF
 

diff --git a/configure.in b/configure.in
index 0ec5e11063fa47ae40a04b383e8c5f22d82e1386..c94ea6e80108518ad26921d1032f9b109f5600ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1814,7 +1814,7 @@ then
                                   ;;
                                esac
                fi;;
-       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*) LDSHARED="$(CC) -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
                then LDSHARED='$(CC) -shared'