Always link libpython.so with LIBS. Fixes #589422.

diff --git a/configure b/configure
index fa14838d10368d927f4953a8fa44b8a7d96ce2d0..f3b21f3dd8a3336ada9774c63222f54c3f5a2ae8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.338 .
+# From configure.in Revision: 1.339 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -9001,15 +9001,17 @@ echo "${ECHO_T}$CFLAGSFORSHARED" >&6
 # SHLIBS are libraries (except -lc and -lm) to link to the python shared
 # library (with --enable-shared).
 # For platforms on which shared libraries are not allowed to have unresolved
-# symbols, this must be set to $(LIBS) (expanded by make).
+# symbols, this must be set to $(LIBS) (expanded by make). We do this even
+# if it is not required, since it creates a dependency of the shared library
+# to LIBS. This, in turn, means that applications linking the shared libpython
+# don't need to link LIBS explicitly. The default should be only changed
+# on systems where this approach causes problems.
 
 echo "$as_me:$LINENO: checking SHLIBS" >&5
 echo $ECHO_N "checking SHLIBS... $ECHO_C" >&6
 case "$ac_sys_system" in
-       atheos*)
-               SHLIBS='$(LIBS)';;
        *)
-               SHLIBS='';;
+               SHLIBS='$(LIBS)';;
 esac
 echo "$as_me:$LINENO: result: $SHLIBS" >&5
 echo "${ECHO_T}$SHLIBS" >&6

diff --git a/configure.in b/configure.in
index f2f47e2cda2109040b54567417f153200c00ea97..786086b5d2136385381bf742d3e12fcbbb64d6bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1043,14 +1043,16 @@ AC_MSG_RESULT($CFLAGSFORSHARED)
 # SHLIBS are libraries (except -lc and -lm) to link to the python shared
 # library (with --enable-shared).
 # For platforms on which shared libraries are not allowed to have unresolved
-# symbols, this must be set to $(LIBS) (expanded by make).
+# symbols, this must be set to $(LIBS) (expanded by make). We do this even
+# if it is not required, since it creates a dependency of the shared library
+# to LIBS. This, in turn, means that applications linking the shared libpython
+# don't need to link LIBS explicitly. The default should be only changed
+# on systems where this approach causes problems.
 AC_SUBST(SHLIBS)
 AC_MSG_CHECKING(SHLIBS)
 case "$ac_sys_system" in
-       atheos*)
-               SHLIBS='$(LIBS)';;
        *)
-               SHLIBS='';;
+               SHLIBS='$(LIBS)';;
 esac
 AC_MSG_RESULT($SHLIBS)