Mercurial > mplayer.hg
changeset 22196:aaec29fe5a47
Move setting _ld_extra and _inc_extra for live to autodetection part,
there is no hope of them having correct values otherwise anyway.
| author | diego |
|---|---|
| date | Tue, 13 Feb 2007 15:37:38 +0000 |
| parents | a6ce3c830723 |
| children | ebf5462a08b7 |
| files | configure |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Feb 13 00:47:09 2007 +0000 +++ b/configure Tue Feb 13 15:37:38 2007 +0000 @@ -6060,6 +6060,15 @@ for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do cxx_check $I/liveMedia/include $I/UsageEnvironment/include \ $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \ + _ld_extra="$_ld_extra $_livelibdir/liveMedia/libliveMedia.a \ + $_livelibdir/groupsock/libgroupsock.a \ + $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ + $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ + -lstdc++" \ + _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \ + -I$_livelibdir/UsageEnvironment/include \ + -I$_livelibdir/BasicUsageEnvironment/include \ + -I$_livelibdir/groupsock/include" && \ _live=yes && break done if test "$_live" != yes ; then @@ -6071,15 +6080,6 @@ if test "$_live" = yes && test "$_network" = yes ; then _res_comment="using $_livelibdir" _def_live='#define STREAMING_LIVE555 1' - _ld_extra="$_ld_extra $_livelibdir/liveMedia/libliveMedia.a \ - $_livelibdir/groupsock/libgroupsock.a \ - $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ - $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ - -lstdc++" - _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \ - -I$_livelibdir/UsageEnvironment/include \ - -I$_livelibdir/BasicUsageEnvironment/include \ - -I$_livelibdir/groupsock/include" _inputmodules="live555 $_inputmodules" elif test "$_live_dist" = yes && test "$_network" = yes ; then _res_comment="using distribution version"