[FFmpeg-cvslog] configure: allow overriding ranlib
Michael Niedermayer
git at videolan.org
Fri Apr 25 05:15:23 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 22 21:54:08 2014 +0200| [6e5cce1cbe54543563dc904bd76f96e192ce0f6b] | committer: Michael Niedermayer
configure: allow overriding ranlib
Reviewed-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e5cce1cbe54543563dc904bd76f96e192ce0f6b
---
configure | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 413cf9a..c50b077 100755
--- a/configure
+++ b/configure
@@ -285,6 +285,7 @@ Toolchain options:
--ld=LD use linker LD [$ld_default]
--pkg-config=PKGCONF use pkg-config PKGCONF [$pkg_config_default]
--pkg-config-flags=FLAGS pass additional flags to pkgconf []
+ --ranlib=RANLIB use ranlib RANLIB [$ranlib_default]
--host-cc=HOSTCC use host C compiler HOSTCC
--host-cflags=HCFLAGS use HCFLAGS when compiling for host
--host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
@@ -1866,6 +1867,7 @@ CMDLINE_SET="
pkg_config_flags
progs_suffix
random_seed
+ ranlib
samples
strip
sysinclude
@@ -2580,7 +2582,7 @@ ln_s="ln -s -f"
nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
-ranlib="ranlib"
+ranlib_default="ranlib"
strip_default="strip"
yasmexe_default="yasm"
windres_default="windres"
@@ -2856,7 +2858,7 @@ cc_default="${cross_prefix}${cc_default}"
cxx_default="${cross_prefix}${cxx_default}"
nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}"
-ranlib="${cross_prefix}${ranlib}"
+ranlib_default="${cross_prefix}${ranlib_default}"
strip_default="${cross_prefix}${strip_default}"
windres_default="${cross_prefix}${windres_default}"
@@ -2947,7 +2949,7 @@ case "$toolchain" in
;;
esac
-set_default arch cc cxx pkg_config strip sysinclude target_exec target_os yasmexe
+set_default arch cc cxx pkg_config ranlib strip sysinclude target_exec target_os yasmexe
enabled cross_compile || host_cc_default=$cc
set_default host_cc
More information about the ffmpeg-cvslog
mailing list