Mercurial > mplayer.hg
changeset 18662:c0aeea79d135
Generalize runtime linker support.
patch by "Derek E. Lewis" dlewis..@..solnetworks.....net
| author | diego |
|---|---|
| date | Fri, 09 Jun 2006 14:19:59 +0000 |
| parents | daa357165b0b |
| children | 56ebaaf3500e |
| files | configure |
| diffstat | 1 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Jun 09 13:40:19 2006 +0000 +++ b/configure Fri Jun 09 14:19:59 2006 +0000 @@ -248,6 +248,7 @@ --disable-ftp Disable ftp support [enabled] --disable-vstream Disable tivo vstream client support [autodetect] --disable-pthreads Disable Posix threads support [autodetect] + --enable-rpath Enable runtime linker path for extra libs [disabled] Codecs: --enable-gif enable gif support [autodetect] @@ -641,13 +642,6 @@ _inc_extra="$_inc_extra -I/usr/local/include" fi -if netbsd ; then - for I in `echo $_ld_extra | sed 's/-L//g'` ; do - tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`" - done - _ld_extra=$tmp -fi - _ldd=ldd if darwin; then _ldd="otool -L" @@ -1698,6 +1692,7 @@ _musepack=auto _vstream=auto _pthreads=yes +_rpath=no for ac_option do case "$ac_option" in # Skip 1st pass @@ -1980,6 +1975,8 @@ --disable-vstream) _vstream=no ;; --enable-pthreads) _pthreads=yes ;; --disable-pthreads) _pthreads=no ;; + --enable-rpath) _rpath=yes ;; + --disable-rpath) _rpath=no ;; --enable-fribidi) _fribidi=yes ;; --disable-fribidi) _fribidi=no ;; @@ -2962,6 +2959,15 @@ fi echores "$_pthreads" +echocheck "rpath" +netbsd &&_rpath=yes +if test "$_rpath" = yes ; then + for I in `echo $_ld_extra | sed 's/-L//g'` ; do + tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`" + done +_ld_extra=$tmp +fi +echores "$_rpath" echocheck "iconv" if test "$_iconv" = auto ; then