X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=d5cf6d323a304cba67620b6c58181e01579aae6a;hb=2b6a8709c5282bf40b3667376d7e67b6ca46b262;hp=90f1ae231eaa35c2f1fa431e3a048733d8d3a1ad;hpb=bc494eb08a36a3fb170d3a360942f8e316577677;p=vlc

diff --git a/configure.ac b/configure.ac
index 90f1ae231e..d5cf6d323a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AM_PROG_AS
 
 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
@@ -413,10 +413,10 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
 AC_SUBST(CONTRIB_DIR)
 
 dnl Add extras/tools to the PATH
-TOOLS_DIR="${srcdir}/extras/tools/build"
+TOOLS_DIR="${srcdir}/extras/tools/build/bin"
 AS_IF([test -d "${TOOLS_DIR}"], [
     TOOLS_DIR=`cd "${TOOLS_DIR}" && pwd`
-    export PATH="${TOOLS_DIR}/bin":$PATH
+    export PATH="${TOOLS_DIR}":$PATH
 ])
 
 dnl
@@ -3741,9 +3741,10 @@ 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}])