From ad5dfb5739115459f293dea5442ec4bd4b9a7625 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Dec 2006 11:42:56 +0000 Subject: [PATCH] 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). --- ChangeLog | 7 +++++++ configure.ac | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe80c60..a89cbe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-16 Tim-Philipp Müller + + * 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). + 2006-12-15 Thomas Vander Stichele * Makefile.am: diff --git a/configure.ac b/configure.ac index b515ad7..602e9c4 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 *** -- 2.7.4