Commit 5965cd43 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Simplify detection caca and force 0.99beta1

parent 217a4736
...@@ -4120,32 +4120,7 @@ fi ...@@ -4120,32 +4120,7 @@ fi
dnl dnl
dnl libcaca plugin dnl libcaca plugin
dnl dnl
AC_ARG_ENABLE(caca, PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
[ --enable-caca libcaca output (default disabled)])
if test "${enable_caca}" = "yes"
then
CACA_PATH="${PATH}"
AC_ARG_WITH(caca-config-path,
[ --with-caca-config-path=PATH caca-config path (default search in \$PATH)],
[ if test "${with_caca_config_path}" != "no"
then
CACA_PATH="${with_caca_config_path}:${PATH}"
fi ])
AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH})
if test "${CACA_CONFIG}" != "no"
then
VLC_ADD_PLUGIN([caca])
VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`])
AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h>
caca_event_t ev;]],
[[ev.type = 0;]]
)],
[],
[AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
)
fi
fi
dnl dnl
dnl win32 GDI plugin dnl win32 GDI plugin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment