mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

cdparanoia: check for cdparanoia with pkg-config first

Browse source 
cdparanoia now has a .pc file in post-0.10.2 SVN, so use
that to check for cdparanoia before we try all the other
checks. Besides being generally nicer, this may help with
correctly detecting cdparanoia on OSX some day (see #609918).
This commit is contained in:
Tim-Philipp Müller 2010-06-11 22:16:26 +01:00
parent b5a7e96291
commit dab38bb8a0
2 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
configure.ac
View file

@ -584,38 +584,43 @@ AG_GST_CHECK_FEATURE(ALSA, [ALSA], alsa, [
]) ])
dnl *** CDParanoia *** dnl *** CDParanoia ***
dnl Note: upstream has a pkg-config file only in post-10.2 SVN so far
translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true) translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
AG_GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, PKG_CHECK_MODULES(CDPARANOIA, cdparanoia-3 >= 10.2, [
cdda_open, -lm, HAVE_CDPARANOIA="yes"
cdda_interface.h, ], [
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
HEADER_DIR="no"
FOUND_CDPARANOIA="yes")
if test "x$FOUND_CDPARANOIA" != "xyes";
then
AG_GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, AG_GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface,
cdda_open, -lm, cdda_open, -lm,
cdda/cdda_interface.h, cdda_interface.h,
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia" CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
HEADER_DIR="yes" HEADER_DIR="no"
FOUND_CDPARANOIA="yes") FOUND_CDPARANOIA="yes")
fi if test "x$FOUND_CDPARANOIA" != "xyes";
if test "x$HEADER_DIR" = "xyes"; then
then AG_GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface,
AC_DEFINE_UNQUOTED(CDPARANOIA_HEADERS_IN_DIR, , cdda_open, -lm,
defined if cdda headers are in a cdda/ directory) cdda/cdda_interface.h,
fi CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
if test "x$FOUND_CDPARANOIA" = "xyes"; HEADER_DIR="yes"
then FOUND_CDPARANOIA="yes")
AC_CHECK_LIB(cdda_paranoia, fi
paranoia_cachemodel_size, if test "x$HEADER_DIR" = "xyes";
: , then
HAVE_CDPARANOIA=no, AC_DEFINE_UNQUOTED(CDPARANOIA_HEADERS_IN_DIR, ,
[-lcdda_interface]) defined if cdda headers are in a cdda/ directory)
fi fi
if test "x$FOUND_CDPARANOIA" = "xyes";
then
AC_CHECK_LIB(cdda_paranoia,
paranoia_cachemodel_size,
: ,
HAVE_CDPARANOIA=no,
[-lcdda_interface])
fi
AC_SUBST(CDPARANOIA_LIBS) AC_SUBST(CDPARANOIA_LIBS)
])
]) ])
dnl FIXME : add second check somehow if that is necessary dnl FIXME : add second check somehow if that is necessary
dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface ) dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )

6
ext/cdparanoia/Makefile.am
View file

@ -1,7 +1,11 @@
plugin_LTLIBRARIES = libgstcdparanoia.la plugin_LTLIBRARIES = libgstcdparanoia.la
libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c
libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstcdparanoia_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(CDPARANOIA_CFLAGS)
libgstcdparanoia_la_LIBADD = \ libgstcdparanoia_la_LIBADD = \
$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \