[FFmpeg-cvslog] configure: fix convoluted shlib code

Michael Niedermayer git at videolan.org
Fri Jan 9 05:05:26 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 21 03:46:53 2014 +0100| [d1c6b7b2d1ef2fc0ada6bcb49c516e20e3627525] | committer: Michael Niedermayer

configure: fix convoluted shlib code

Fixes Ticket 4199

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1c6b7b2d1ef2fc0ada6bcb49c516e20e3627525
---

 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index a39a63f..51999de 100755
--- a/configure
+++ b/configure
@@ -2688,7 +2688,6 @@ docdir_default='${prefix}/share/doc/ffmpeg'
 incdir_default='${prefix}/include'
 libdir_default='${prefix}/lib'
 mandir_default='${prefix}/share/man'
-shlibdir_default='${LIBDIR}'
 
 # toolchain
 ar_default="ar"
@@ -4329,6 +4328,9 @@ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFI
 
 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
 
+set_default libdir
+: ${shlibdir_default:="$libdir"}
+
 set_default $PATHS_LIST
 set_default nm
 



More information about the ffmpeg-cvslog mailing list