diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 22:46:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 22:46:06 +0200 |
| commit | 2e3c1699aea7bb5a72d18903f4b8d3d33964c14d (patch) | |
| tree | b962791b6359f894afe99edee9689199b7016d0f | |
| parent | e3601ceeb87516ac141605a41193aa4d726a2cf8 (diff) | |
| parent | 749b1f1359b5af0a08221923b016551b18ab6171 (diff) | |
| download | ffmpeg-2e3c1699aea7bb5a72d18903f4b8d3d33964c14d.tar.gz | |
Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'
* commit '749b1f1359b5af0a08221923b016551b18ab6171':
configure: add --enable-rpath
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -89,6 +89,7 @@ Standard options: --mandir=DIR install man page in DIR [PREFIX/share/man] --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 @@ -5031,7 +5032,7 @@ check_disable_warning -Wno-pointer-sign # add some linker flags check_ldflags -Wl,--warn-common 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 |