virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

configure: Add check_cmd() helper function to simplify some expressions

Browse Source
This commit is contained in:
Diego Biurrun
2017-09-24 18:55:28 +02:00
parent 49804dc2ba
commit a5e011c8dc
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@@ -803,6 +803,14 @@ test_as(){
test_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPS test_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPS
} }
check_cmd(){
log check_cmd "$@"
cmd=$1
disabled $cmd && return
disable $cmd
test_cmd $@ && enable $cmd
}
check_inline_asm(){ check_inline_asm(){
log check_inline_asm "$@" log check_inline_asm "$@"
name="$1" name="$1"
@@ -4676,9 +4684,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h
enabled avplay && enabled avplay &&
test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent
! disabled pod2man && test_cmd pod2man --help && enable pod2man || disable pod2man
! disabled texi2html && test_cmd texi2html -version && enable texi2html || disable texi2html
check_header linux/fb.h check_header linux/fb.h
check_header linux/videodev2.h check_header linux/videodev2.h
check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
@@ -5003,6 +5008,9 @@ esac
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
check_cmd pod2man --help
check_cmd texi2html -version
check_deps $CONFIG_LIST \ check_deps $CONFIG_LIST \
$CONFIG_EXTRA \ $CONFIG_EXTRA \
$HAVE_LIST \ $HAVE_LIST \