From 5965cd43015ee14734af77b1e35096a2a264fff0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 7 Aug 2009 13:17:51 +0200 Subject: [PATCH] Simplify detection caca and force 0.99beta1 --- configure.ac | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index cdf4c5fba9..e4c11df0e2 100644 --- a/configure.ac +++ b/configure.ac @@ -4120,32 +4120,7 @@ fi dnl dnl libcaca plugin dnl -AC_ARG_ENABLE(caca, - [ --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_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 +PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto]) dnl dnl win32 GDI plugin