summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-06 14:30:38 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-06 14:30:38 +0000
commitb3bcb0fddf934393b337084aceed51746953e9c8 (patch)
treee2687f01b673db469a30ae4d4f1b507bfb6921ab /configure
parent247c26094443a58e109665cddbe4af13fde08470 (diff)
downloadmpv-b3bcb0fddf934393b337084aceed51746953e9c8.tar.bz2
mpv-b3bcb0fddf934393b337084aceed51746953e9c8.tar.xz
Fix bug introduced in LIVE555 test simplification, -lstdc++ should go last
in the list of linker options. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19345 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 6f37a4771f..d62075ef68 100755
--- a/configure
+++ b/configure
@@ -5998,10 +5998,11 @@ fi
if test "$_live" = yes && test "$_network" = yes ; then
_res_comment="using $_livelibdir"
_def_live='#define STREAMING_LIVE555 1'
- _ld_live="-lstdc++ $_livelibdir/liveMedia/libliveMedia.a \
+ _ld_live="$_livelibdir/liveMedia/libliveMedia.a \
$_livelibdir/groupsock/libgroupsock.a \
$_livelibdir/UsageEnvironment/libUsageEnvironment.a \
- $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a"
+ $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+ -lstdc++"
_inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
-I$_livelibdir/UsageEnvironment/include \
-I$_livelibdir/BasicUsageEnvironment/include \
@@ -6011,7 +6012,7 @@ elif test "$_live_dist" = yes && test "$_network" = yes ; then
_res_comment="using distribution version"
_live="yes"
_def_live='#define STREAMING_LIVE555 1'
- _ld_live="-lstdc++ -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment"
+ _ld_live="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
_inc_extra="$_inc_extra -I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
-I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
_inputmodules="live555 $_inputmodules"