diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 02:35:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 02:45:45 +0100 |
| commit | 8dc5a46466de29fd146599d99a19132a21253012 (patch) | |
| tree | 600e25dd21a5555407920b9899fea4990ca4aa4f /configure | |
| parent | fd982f2b40b8908a71d25202f0e6842206d8a78a (diff) | |
| parent | d261719319a505e1716e8b52fc955bef0503ff96 (diff) | |
| download | ffmpeg-8dc5a46466de29fd146599d99a19132a21253012.tar.gz | |
Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96'
* commit 'd261719319a505e1716e8b52fc955bef0503ff96':
configure: do not link libraries against program-specific dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -2429,6 +2429,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter null_filter setpts_filter trim_filter" ffplay_deps="avcodec avformat swscale swresample sdl" +ffplay_libs='$sdl_libs' ffplay_select="rdft crop_filter" ffprobe_deps="avcodec avformat" ffserver_deps="avformat fork sarestart" @@ -4635,7 +4636,8 @@ enabled vdpau && disable vdpau enabled vdpau && enabled xlib && - check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && + check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && + prepend ffmpeg_libs $($ldflags_filter "-lvdpau") && enable vdpau_x11 # Funny iconv installations are not unusual, so check it after all flags have been set @@ -5102,7 +5104,6 @@ HOSTLD_O=$HOSTLD_O TARGET_EXEC=$target_exec $target_exec_args TARGET_PATH=$target_path TARGET_SAMPLES=${target_samples:-\$(SAMPLES)} -LIBS-ffplay=$sdl_libs CFLAGS-ffplay=$sdl_cflags ZLIB=$($ldflags_filter -lz) LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD @@ -5138,6 +5139,13 @@ get_version(){ map 'get_version $v' $LIBRARY_LIST +print_program_libs(){ + eval "program_libs=\$${1}_libs" + eval echo "LIBS-${1}=${program_libs}" >> config.mak +} + +map 'print_program_libs $v' $PROGRAM_LIST + cat > $TMPH <<EOF /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H |