diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-12-16 11:42:56 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-12-16 11:42:56 +0000 |
| commit | ad5dfb5739115459f293dea5442ec4bd4b9a7625 (patch) | |
| tree | fad5c23fa2c824541ca6ed79aed5b5dceaf375a5 /configure.ac | |
| parent | a5fa8eaf4d8685653130572aa494350d83cbe419 (diff) | |
configure.ac: Make sure libcaca can actually be used instead of just checking for /usr/bin/caca-config, so we don't w...
Original commit message from CVS:
* configure.ac:
Make sure libcaca can actually be used instead of just checking for
/usr/bin/caca-config, so we don't wrongly try to build cacasink when
cross-compiling (fixes #384587).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b515ad75..602e9c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -611,9 +611,16 @@ GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ dnl *** libcaca *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true) GST_CHECK_FEATURE(LIBCACA, [libcaca coloured ASCII art], cacasink, [ - GST_CHECK_CONFIGPROG(LIBCACA, caca-config) - AC_SUBST(LIBCACA_CFLAGS) - AC_SUBST(LIBCACA_LIBS) + GST_PKG_CHECK_MODULES(LIBCACA, caca) + dnl only newer versions of libcaca ship caca.pc, so try caca-config as well + if test "x$HAVE_LIBCACA" != "xyes"; then + GST_CHECK_CONFIGPROG(LIBCACA, caca-config) + dnl see if it compilation works too, might not if we are cross-compiling + if test "x$HAVE_LIBCACA" = "xyes"; then + AC_CHECK_LIB([caca], [caca_init], [HAVE_LIBCACA=yes], + [HAVE_LIBCACA=no], [$LIBCACA_LIBS]) + fi + fi ]) dnl *** libdv *** |