aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-21 03:46:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-09 05:04:25 +0100
commitd1c6b7b2d1ef2fc0ada6bcb49c516e20e3627525 (patch)
treec8d2acccdc67fc4eb6d4585f50ee8f7e637bf23c
parent624384503643f1d3fd2e8f8f9b986ddcf2067a21 (diff)
downloadffmpeg-d1c6b7b2d1ef2fc0ada6bcb49c516e20e3627525.tar.gz
configure: fix convoluted shlib code
Fixes Ticket 4199 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index a39a63f51d..51999de58c 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