diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
| commit | e8e4c8bddee7b77747346ca5047a84cc40dafc11 (patch) | |
| tree | 8062747ec4d71f28da7fc9377af81cea3394022b /configure | |
| parent | f4c020e3ad0a2a1412cc94b3d7df7063b37ae429 (diff) | |
| parent | 8db73c61a7b24bc4f4d3d415bea2990d17d16354 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: allow non-standard variations of linker -l/-L flags
Add reminders to update the codec descriptor list with new codec IDs.
Conflicts:
Makefile
configure
libavcodec/avcodec.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -2050,6 +2050,8 @@ CXX_C='-c' CXX_O='-o $@' LD_O='-o $@' FORCE_INC="-include" +LD_LIB='-l%' +LD_PATH='-L' HOSTCC_C='-c' HOSTCC_O='-o $@' HOSTLD_O='-o $@' @@ -2411,7 +2413,8 @@ probe_cc(){ pfx=$1 _cc=$2 - unset _type _ident _cc_c _cc_e _cc_o _ld_o _flags _cflags _ldflags + unset _type _ident _cc_c _cc_e _cc_o _flags _cflags + unset _ld_o _ldflags _ld_lib _ld_path unset _depflags _DEPCMD _DEPFLAGS _flags_filter=echo @@ -2573,6 +2576,8 @@ ldflags_filter=$_flags_filter add_ldflags $_flags $_ldflags test "$cc_type" != "$ld_type" && add_ldflags $cc_ldflags LD_O=${_ld_o-$LD_O} +LD_LIB=${_ld_lib-$LD_LIB} +LD_PATH=${_ld_path-$LD_PATH} probe_cc hostld "$host_ld" host_ldflags_filter=$_flags_filter @@ -4018,6 +4023,8 @@ CC_O=$CC_O CXX_C=$CXX_C CXX_O=$CXX_O LD_O=$LD_O +LD_LIB=$LD_LIB +LD_PATH=$LD_PATH DLLTOOL=$dlltool LDFLAGS=$LDFLAGS LDFLAGS-ffserver=$FFSERVERLDFLAGS |