From cb4d0ffc643894806f1c1103974e9aba9432ff46 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 9 Mar 2003 21:38:18 +0000
Subject: [PATCH] *** empty log message ***

---
 configure.in | 46 +++++++++++++++++++++++-----------------------
 ltconfig     |  2 +-
 ltmain.sh    | 13 ++++++++++++-
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/configure.in b/configure.in
index fbf021a74..a14f8d5ce 100644
--- a/configure.in
+++ b/configure.in
@@ -2596,16 +2596,18 @@ src/Makefile
 src/main/Makefile
 src/main/macosx/Makefile
 src/main/macosx/Info.plist
-src/audio/Makefile
 src/audio/alsa/Makefile
 src/audio/arts/Makefile
 src/audio/baudio/Makefile
 src/audio/dc/Makefile
+src/audio/disk/Makefile
 src/audio/dma/Makefile
 src/audio/dmedia/Makefile
 src/audio/dsp/Makefile
 src/audio/esd/Makefile
 src/audio/macrom/Makefile
+src/audio/Makefile
+src/audio/mint/Makefile
 src/audio/nas/Makefile
 src/audio/nto/Makefile
 src/audio/openbsd/Makefile
@@ -2614,43 +2616,41 @@ src/audio/sun/Makefile
 src/audio/ums/Makefile
 src/audio/windib/Makefile
 src/audio/windx5/Makefile
-src/audio/disk/Makefile
-src/audio/mint/Makefile
 src/video/Makefile
-src/video/XFree86/Makefile
-src/video/XFree86/extensions/Makefile
-src/video/XFree86/Xinerama/Makefile
-src/video/XFree86/Xv/Makefile
-src/video/XFree86/Xxf86dga/Makefile
-src/video/XFree86/Xxf86vm/Makefile
+src/video/aalib/Makefile
+src/video/ataricommon/Makefile
+src/video/bwindow/Makefile
 src/video/cybergfx/Makefile
-src/video/x11/Makefile
+src/video/dc/Makefile
 src/video/dga/Makefile
-src/video/nanox/Makefile
-src/video/fbcon/Makefile
 src/video/directfb/Makefile
-src/video/ps2gs/Makefile
+src/video/dummy/Makefile
+src/video/epoc/Makefile
+src/video/fbcon/Makefile
+src/video/gem/Makefile
 src/video/ggi/Makefile
 src/video/maccommon/Makefile
 src/video/macdsp/Makefile
 src/video/macrom/Makefile
+src/video/nanox/Makefile
+src/video/photon/Makefile
+src/video/picogui/Makefile
+src/video/ps2gs/Makefile
+src/video/qtopia/Makefile
 src/video/quartz/Makefile
 src/video/svga/Makefile
 src/video/vgl/Makefile
-src/video/aalib/Makefile
 src/video/wincommon/Makefile
 src/video/windib/Makefile
 src/video/windx5/Makefile
-src/video/bwindow/Makefile
-src/video/photon/Makefile
-src/video/epoc/Makefile
-src/video/dummy/Makefile
-src/video/ataricommon/Makefile
+src/video/x11/Makefile
 src/video/xbios/Makefile
-src/video/gem/Makefile
-src/video/dc/Makefile
-src/video/qtopia/Makefile
-src/video/picogui/Makefile
+src/video/XFree86/extensions/Makefile
+src/video/XFree86/Makefile
+src/video/XFree86/Xinerama/Makefile
+src/video/XFree86/Xv/Makefile
+src/video/XFree86/Xxf86dga/Makefile
+src/video/XFree86/Xxf86vm/Makefile
 src/events/Makefile
 src/joystick/Makefile
 src/joystick/amigaos/Makefile
diff --git a/ltconfig b/ltconfig
index f1451434b..b8f35948e 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1433,7 +1433,7 @@ else
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
-    whole_archive_flag_spec='$convenience'
+    whole_archive_flag_spec='-all_load $convenience'
     ;;
 
   hpux9* | hpux10* | hpux11*)
diff --git a/ltmain.sh b/ltmain.sh
index a9914016c..bbe804e7e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2200,7 +2200,18 @@ EOF
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
-	  eval cmds=\"$archive_cmds\"
+	  save_deplibs="$deplibs"
+	  for conv in $convenience; do
+	    tmp_deplibs=
+	    for test_deplib in $deplibs; do
+	      if test "$test_deplib" != "$conv"; then
+	        tmp_deplibs="$tmp_deplibs $test_deplib"
+	      fi
+	    done
+	    deplibs="$tmp_deplibs"
+	  done
+ 	  eval cmds=\"$archive_cmds\"
+	  deplibs="$save_deplibs"
 	fi
 	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do