Skip to content

Commit

Permalink
configure: Add check_cmd() helper function to simplify some expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
DonDiego committed Mar 7, 2018
1 parent 49804dc commit a5e011c
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,14 @@ test_as(){
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(){
log check_inline_asm "$@"
name="$1"
Expand Down Expand Up @@ -4676,9 +4684,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h
enabled avplay &&
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/videodev2.h
check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
Expand Down Expand Up @@ -5003,6 +5008,9 @@ esac

enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }

check_cmd pod2man --help
check_cmd texi2html -version

check_deps $CONFIG_LIST \
$CONFIG_EXTRA \
$HAVE_LIST \
Expand Down

0 comments on commit a5e011c

Please sign in to comment.