highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: do not link libraries against program-specific dependencies

Browse Source 
Bug-Id: 635
This commit is contained in:
Janne Grunau
2014-02-13 00:44:08 +01:00
parent 60e6cecf9b
commit d261719319
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2037,6 +2037,7 @@ avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_fi
fps_filter null_filter resample_filter scale_filter fps_filter null_filter resample_filter scale_filter
setpts_filter trim_filter" setpts_filter trim_filter"
avplay_deps="avcodec avformat avresample swscale sdl" avplay_deps="avcodec avformat avresample swscale sdl"
avplay_libs='$sdl_libs'
avplay_select="rdft" avplay_select="rdft"
avprobe_deps="avcodec avformat" avprobe_deps="avcodec avformat"
avserver_deps="avformat fork !shared" avserver_deps="avformat fork !shared"
@ -4039,7 +4040,8 @@ enabled vdpau &&
disable vdpau disable vdpau
enabled vdpau && enabled xlib && 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 avconv_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11 enable vdpau_x11
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
@ -4419,7 +4421,6 @@ HOSTLD_O=$HOSTLD_O
TARGET_EXEC=$target_exec $target_exec_args TARGET_EXEC=$target_exec $target_exec_args
TARGET_PATH=$target_path TARGET_PATH=$target_path
TARGET_SAMPLES=${target_samples:-\$(SAMPLES)} TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
LIBS-avplay=$sdl_libs
CFLAGS-avplay=$sdl_cflags CFLAGS-avplay=$sdl_cflags
ZLIB=$($ldflags_filter -lz) ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
@ -4453,6 +4454,13 @@ get_version(){
map 'get_version $v' $LIBRARY_LIST 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 cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */ /* Automatically generated by configure - do not modify! */
#ifndef LIBAV_CONFIG_H #ifndef LIBAV_CONFIG_H