Merge 3.3.

This commit is contained in:
Stefan Krah 2013-01-17 20:44:02 +01:00
commit 5cc36bc6a4
2 changed files with 8 additions and 6 deletions

11
configure vendored
View File

@ -8384,11 +8384,6 @@ esac
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 @@ fi
{ $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

View File

@ -1898,7 +1898,6 @@ AC_SUBST(BLDSHARED)
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 @@ else
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)