[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3.

[stefan.krah]

http://hg.python.org/cpython/rev/144c82bebf17
changeset:   81561:144c82bebf17
parent:      81559:8630fa732cf6
parent:      81560:937e9df47ccd
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Jan 17 20:44:02 2013 +0100
summary:
  Merge 3.3.

files:
  configure    |  11 ++++++-----
  configure.ac |   3 ++-
  2 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -8384,11 +8384,6 @@
 
 
 
-
-cat >>confdefs.h <<_ACEOF
-#define SHLIB_EXT "$SO"
-_ACEOF
-
 # LDSHARED is the ld *command* used to create shared library
 # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
 # (Shared libraries in this instance are shared modules to be loaded into
@@ -13721,6 +13716,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SO" >&5
 $as_echo "$SO" >&6; }
 
+
+cat >>confdefs.h <<_ACEOF
+#define SHLIB_EXT "$SO"
+_ACEOF
+
+
 # Check whether right shifting a negative integer extends the sign bit
 # or fills with zeros (like the Cray J90, according to Tim Peters).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1898,7 +1898,6 @@
 AC_SUBST(CCSHARED)
 AC_SUBST(LINKFORSHARED)
 
-AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])
 # LDSHARED is the ld *command* used to create shared library
 # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
 # (Shared libraries in this instance are shared modules to be loaded into
@@ -3956,6 +3955,8 @@
 fi
 AC_MSG_RESULT($SO)
 
+AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])
+
 # Check whether right shifting a negative integer extends the sign bit
 # or fills with zeros (like the Cray J90, according to Tim Peters).
 AC_MSG_CHECKING(whether right shift extends the sign bit)

-- 
Repository URL: http://hg.python.org/cpython