diff options
author | James Almer <jamrial@gmail.com> | 2017-04-09 18:43:55 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-04-09 18:43:55 +0300 |
commit | 0905c679eb245d822c829116306bb6d38b2b63ec (patch) | |
tree | bde144b1ded0e540e1bad7e843f6c783c6923478 /configure | |
parent | e5ac47c06818feb039f00f9f1931c7d4244012d6 (diff) | |
parent | ffb9025f39b274abfc4ad2b264205a44cc0238a4 (diff) |
Merge commit 'ffb9025f39b274abfc4ad2b264205a44cc0238a4'
* commit 'ffb9025f39b274abfc4ad2b264205a44cc0238a4':
configure: Simplify MMAL check
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -5869,14 +5869,12 @@ enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi && enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; } 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 netcdf && require_pkg_config netcdf netcdf.h nc_inq_libvers enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do check_lib 'AL/al.h' alGetError "${al_libs}" && break; done } || |