AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :)
-AC_CHECK_PROGS(YASM, yasm)
+AC_PATH_PROG(YASM, yasm)
dnl Check for compiler properties
AC_C_CONST
])
AC_SUBST(CONTRIB_DIR)
+dnl Add extras/tools to the PATH
+TOOLS_DIR="${srcdir}/extras/tools/build/bin"
+AS_IF([test -d "${TOOLS_DIR}"], [
+ TOOLS_DIR=`cd "${TOOLS_DIR}" && pwd`
+ export PATH="${TOOLS_DIR}":$PATH
+])
+
dnl
dnl Libtool
dnl It's very bad, but our former custom system was worst
AS_IF([test "${ac_cv_c_fast_math}" = "no"], [VLC_RESTORE_FLAGS])
AH_BOTTOM([
#ifndef __FAST_MATH__
-# pragma STDC FENV_ACCESS OFF
-# pragma STDC FP_CONTRACT ON
+# ifndef _MSC_VER
+# pragma STDC FENV_ACCESS OFF
+# pragma STDC FP_CONTRACT ON
+# else
+# pragma fenv_access(off)
+# pragma fp_contract(on)
+# endif
#endif
])
AC_MSG_WARN(Library [aribb24] needed for [aribsub] was not found)
have_aribb24="no"
])
- AM_CONDITIONAL([HAVE_ARIBB24], [test "${have_aribb24}" = "yes"])
])
+AM_CONDITIONAL([HAVE_ARIBB24], [test x"${have_aribb24}" = x"yes"])
dnl
dnl kate decoder plugin
AC_MSG_ERROR([${WAYLAND_CLIENT_PKG_ERRORS}.])
])
])
+
+ AS_IF([test "${have_egl}" = "yes"], [
+ PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [
+ have_wayland_egl="yes"
+ ], [
+ AS_IF([test -n "${enable_wayland}"], [
+ AC_MSG_ERROR([${WAYLAND_EGL_PKG_ERRORS}.])
+ ])
+ ])
+ ])
])
AM_CONDITIONAL([HAVE_WAYLAND], [test "${have_wayland}" = "yes"])
+AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "${have_wayland_egl}" = "yes"])
dnl
dnl Chromecast streaming support
dnl
m4_pushdef([protobuf_lite_version], 2.5.0)
+AC_ARG_VAR(PROTOC, [protobuf compiler])
+AC_PATH_PROGS(PROTOC, protoc, no )
PKG_WITH_MODULES([CHROMECAST],[protobuf-lite >= protobuf_lite_version], [
- AC_CHECK_PROGS(PROTOC, protoc)
- AS_IF([test "${PROTOC}" = "protoc"], [
+ AS_IF([test "x${PROTOC}" != "xno"], [
VLC_ADD_PLUGIN([stream_out_chromecast])
VLC_ADD_CXXFLAGS([stream_out_chromecast],[${CHROMECAST_CFLAGS}] [-I./chromecast])
VLC_ADD_LIBS([stream_out_chromecast],[${CHROMECAST_LIBS}])