mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-02 14:36:41 +00:00
fix cdparanoia include dir location check.
Original commit message from CVS: fix cdparanoia include dir location check. fix libdv check to use pkg-config. use libdv cflags.
This commit is contained in:
parent
0326f034f2
commit
87f565a6d9
2 changed files with 15 additions and 17 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit c6bd62c43f01b2012d81dfa61dd58777c41de07a
|
Subproject commit 1a826743b023d38a14e16cf1b3fb85eabdbb65d6
|
22
configure.ac
22
configure.ac
|
@ -381,12 +381,17 @@ GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
|
||||||
cdda_open, -lm,
|
cdda_open, -lm,
|
||||||
cdda_interface.h,
|
cdda_interface.h,
|
||||||
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
|
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
|
||||||
HEADER_DIR="no")
|
HEADER_DIR="no"
|
||||||
|
FOUND_CDPARANOIA="yes")
|
||||||
|
if test "x$FOUND_CDPARANOIA" != "xyes";
|
||||||
|
then
|
||||||
GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface,
|
GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface,
|
||||||
cdda_open, -lm,
|
cdda_open, -lm,
|
||||||
cdda/cdda_interface.h,
|
cdda/cdda_interface.h,
|
||||||
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
|
CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia"
|
||||||
HEADER_DIR="yes")
|
HEADER_DIR="yes"
|
||||||
|
FOUND_CDPARANOIA="yes")
|
||||||
|
fi
|
||||||
if test "x$HEADER_DIR" = "xyes";
|
if test "x$HEADER_DIR" = "xyes";
|
||||||
then
|
then
|
||||||
AC_DEFINE_UNQUOTED(CDPARANOIA_HEADERS_IN_DIR, ,
|
AC_DEFINE_UNQUOTED(CDPARANOIA_HEADERS_IN_DIR, ,
|
||||||
|
@ -400,8 +405,9 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
||||||
|
|
||||||
dnl *** dv ***
|
dnl *** dv ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
|
||||||
GST_CHECK_FEATURE(DV, [dv library], dv, [
|
GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [
|
||||||
AM_PATH_LIBDV(HAVE_DV=yes, HAVE_DV=no)
|
PKG_CHECK_MODULES(DV, libdv, HAVE_DV="yes", HAVE_DV="no")
|
||||||
|
AC_SUBST(DV_CFLAGS)
|
||||||
AC_SUBST(DV_LIBS)
|
AC_SUBST(DV_LIBS)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -534,14 +540,6 @@ GST_CHECK_FEATURE(LCS, Lcs, lcs, [
|
||||||
AC_SUBST(LCS_LIBS)
|
AC_SUBST(LCS_LIBS)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl *** libdv ***
|
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
|
|
||||||
GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
|
|
||||||
PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
|
|
||||||
AC_SUBST(LIBDV_CFLAGS)
|
|
||||||
AC_SUBST(LIBDV_LIBS)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl *** libfame ***
|
dnl *** libfame ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBFAME, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBFAME, true)
|
||||||
GST_CHECK_FEATURE(LIBFAME, [libfame MPEG1/4 encoder], libfame, [
|
GST_CHECK_FEATURE(LIBFAME, [libfame MPEG1/4 encoder], libfame, [
|
||||||
|
|
Loading…
Reference in a new issue