vlc | branch: master | Alexandre Janniaux <aja...@videolabs.io> | Sat Mar 13 18:07:51 2021 +0100| [d9552fa0ba5eb0d9ff2473f07bc723d94c710b2a] | committer: Alexandre Janniaux
configure.ac: fix mmal CFLAGS/LDFLAGS definition The MMAL_CFLAGS / MMAL_LIBS will be used in the Makefile.am instead of the plugin defined flags, since there are multiple plugins, and in addition of a HAVE_MMAL conditional. In addition, -L flags are LIBADD flags, and not LDFLAGS flags, so it's actually put into MMAL_LIBS instead of defining a MMAL_LDFLAGS. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d9552fa0ba5eb0d9ff2473f07bc723d94c710b2a --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a82c956c70..decb95652e 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,8 @@ AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"]) dnl dnl MMAL plugin dnl +MMAL_CFLAGS="" +MMAL_LIBS="" AC_ARG_ENABLE([mmal], AS_HELP_STRING([--enable-mmal], [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) @@ -3769,8 +3771,11 @@ if test "${enable_mmal}" != "no"; then VLC_ADD_PLUGIN([mmal]) VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ]) - VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvcsm -lvchiq_arm ]) ], [ - AS_IF([test "${enable_mmal}" = "yes"], + VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvcsm -lvchiq_arm ]) + MMAL_CFLAGS="-isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux" + MMAL_LIBS="-L/opt/vc/lib -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvcsm -lvchiq_arm" + ],[ + AS_IF([test "${enable_mmal}" = "yes"], [ AC_MSG_ERROR([Cannot find bcm library...]) ], [ AC_MSG_WARN([Cannot find bcm library...]) ]) ], @@ -3780,6 +3785,8 @@ if test "${enable_mmal}" != "no"; then [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) VLC_RESTORE_FLAGS fi +AC_SUBST([MMAL_CFLAGS]) +AC_SUBST([MMAL_LIBS]) AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) dnl _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits