[vlc-commits] configure: use AC_CHECK_PROG(S) where appropriate
Rémi Denis-Courmont
git at videolan.org
Sat Aug 6 08:37:19 CEST 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 6 09:24:15 2016 +0300| [d002305e28d2744ad3fc63c2a42720309af182c8] | committer: Rémi Denis-Courmont
configure: use AC_CHECK_PROG(S) where appropriate
If the search path is $PATH, then there is no point expanding the
executable to an absolute path.
This is also contrary to normal autoconf/automake use.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d002305e28d2744ad3fc63c2a42720309af182c8
---
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 22e3ae3..72da07c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1561,7 +1561,7 @@ then
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
AC_ARG_VAR([LUAC], [LUA byte compiler])
- AC_PATH_PROGS(LUAC, [${LUAC} luac], [false])
+ AC_CHECK_PROGS(LUAC, [${LUAC} luac], [false])
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
@@ -3394,19 +3394,19 @@ if test "${enable_directfb}" = "yes"; then
fi
else
dnl Look for directfb-config
- AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH})
- if test "${DIRECTFB_CONFIG}" != "no"; then
+ AC_CHECK_PROG(DIRECTFB_CONFIG, [directfb-config], [false])
+ AS_IF(["${DIRECTFB_CONFIG}" != "false"], [
CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`"
LIBS_mydirectfb="`${DIRECTFB_CONFIG} --libs`"
have_directfb="true"
- else
+ ], [
dnl Trying with pkg-config
PKG_CHECK_MODULES(DIRECTFB, directfb, [
CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}"
LIBS_mydirectfb="${DIRECTFB_LIBS}"
have_directfb="true"
], [have_directfb="false"])
- fi
+ ])
fi
if test "${have_directfb}" = "true"; then
VLC_ADD_PLUGIN([directfb])
More information about the vlc-commits
mailing list