Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)
* commit '749b1f1359b5af0a08221923b016551b18ab6171':
  configure: add --enable-rpath

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -87,8 -86,7 +87,9 @@@ Standard options
    --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]
    --incdir=DIR             install includes in DIR [PREFIX/include]
    --mandir=DIR             install man page in DIR [PREFIX/share/man]
 -  --enable-rpath           use rpath when linking programs [USE WITH CARE]
 +  --enable-rpath           use rpath to allow installing libraries in paths
 +                           not part of the dynamic linker search path
++                           use rpath when linking programs [USE WITH CARE]
  
  Licensing options:
    --enable-gpl             allow use of GPL code, the resulting libs
@@@ -5030,8 -4294,8 +5031,8 @@@ check_disable_warning -Wno-pointer-sig
  
  # add some linker flags
  check_ldflags -Wl,--warn-common
 -check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 +check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
- enabled rpath && add_ldflags -Wl,-rpath,$libdir
+ enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
  # add some strip flags