mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Make sure libcaca can actually be used instead of just checking for /usr/bin/caca-config, so we don't w...

Browse source 
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).
This commit is contained in:
Tim-Philipp Müller 2006-12-16 11:42:56 +00:00
parent a5fa8eaf4d
commit ad5dfb5739
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-12-16 Tim-Philipp Müller <tim at centricular dot net>
* 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 <thomas at apestaart dot org> 2006-12-15 Thomas Vander Stichele <thomas at apestaart dot org>
* Makefile.am: * Makefile.am:

13
configure.ac
View file

@ -611,9 +611,16 @@ GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [
dnl *** libcaca *** dnl *** libcaca ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true) translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
GST_CHECK_FEATURE(LIBCACA, [libcaca coloured ASCII art], cacasink, [ GST_CHECK_FEATURE(LIBCACA, [libcaca coloured ASCII art], cacasink, [
GST_CHECK_CONFIGPROG(LIBCACA, caca-config) GST_PKG_CHECK_MODULES(LIBCACA, caca)
AC_SUBST(LIBCACA_CFLAGS) dnl only newer versions of libcaca ship caca.pc, so try caca-config as well
AC_SUBST(LIBCACA_LIBS) 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 *** dnl *** libdv ***