From d6359c55cc69446bb2f61ca7bb5addbefe17a4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 4 Aug 2002 12:38:50 +0000
Subject: [PATCH] Always link libpython.so with LIBS. Fixes #589422.

---
 configure    | 12 +++++++-----
 configure.in | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index fa14838d103..f3b21f3dd8a 100755
--- 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 f2f47e2cda2..786086b5d21 100644
--- 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)