diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-14 00:42:24 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-14 00:42:24 +0000 |
| commit | 578ef5f7bb79a8cbfbd7b89c2c8cff8b1de7294e (patch) | |
| tree | e7c0b53e90690080c7d4f36bbf64181c77edeb16 /configure.ac | |
| parent | 3e0102d7d1ba70e8431fd6ffd85ed5335d128ced (diff) | |
| download | xine-lib-578ef5f7bb79a8cbfbd7b89c2c8cff8b1de7294e.tar.gz xine-lib-578ef5f7bb79a8cbfbd7b89c2c8cff8b1de7294e.tar.bz2 | |
Update libcaca check to use the pkg-config file shipped with libcaca 0.99, and change --disable-caca to --without-caca (to conform with other external libraries).
CVS patchset: 8238
CVS date: 2006/09/14 00:42:24
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index f5166d1f4..d2aab7cc1 100644 --- a/configure.ac +++ b/configure.ac @@ -844,16 +844,17 @@ dnl --------------------------------------------- dnl Checks for Color AsCii Art library dnl --------------------------------------------- -AC_ARG_ENABLE([caca], - AC_HELP_STRING([--disable-caca], [do not build CACA support]), - [with_caca=$enableval], [with_caca=yes]) +AC_ARG_WITH([caca], + AS_HELP_STRING([--without-caca], [Do not build CACA support])) -if test "x$with_caca" = "xyes"; then - AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***])) -else - no_caca=yes +if test "x$with_caca" != "xno"; then + PKG_CHECK_MODULES([CACA], [caca cucul], [have_caca="yes"], [have_caca="no"]) + if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then + AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found]) + fi fi -AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes") + +AM_CONDITIONAL([HAVE_CACA], [test "x$have_caca" = "xyes"]) dnl --------------------------------------------- dnl Check solaris framebuffer device support @@ -2690,7 +2691,7 @@ fi if test x$no_aalib != "xyes"; then echo " - aa (Ascii ART)" fi -if test x$no_caca != "xyes"; then +if test "x$have_caca" = "xyes"; then echo " - caca (Color AsCii Art)" fi if test x$have_fb = "xyes"; then |