summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-12-04 13:40:13 +0100
committerDiego Biurrun <diego@biurrun.de>2016-12-05 16:15:40 +0100
commitffb9025f39b274abfc4ad2b264205a44cc0238a4 (patch)
treebc64b76d42786b643e5d39cb5e60c69d2dbb3503 /configure
parent660470cd62c59f25cc52c731af6230e7bc1aba62 (diff)
configure: Simplify MMAL check
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 6 insertions, 7 deletions
diff --git a/configure b/configure
index 43506debdc..e5a787198d 100755
--- a/configure
+++ b/configure
@@ -4678,13 +4678,12 @@ enabled libx265 && require_pkg_config x265 x265.h x265_api_get &&
enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
- { ! enabled cross_compile && {
- add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline ;
- add_extralibs -L/opt/vc/lib/ -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ;
- check_lib interface/mmal/mmal.h mmal_port_connect ; }
- check_lib interface/mmal/mmal.h mmal_port_connect ; } ||
- die "ERROR: mmal not found"; }
-enabled mmal && check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"
+ { ! enabled cross_compile &&
+ add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
+ add_ldflags -L/opt/vc/lib/ &&
+ check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
+ die "ERROR: mmal not found" &&
+ check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
enabled omx_rpi && enable omx
enabled omx && { check_header OMX_Core.h ||
{ ! enabled cross_compile && enabled omx_rpi && {