From 278c84bed3bf98ce7ac4bcf5fe89279c55de7c30 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 4 Jul 2002 20:08:57 +0000 Subject: taaz's virtual fix Original commit message from CVS: taaz's virtual fix --- configure.ac | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f43f2a3b..4b67201d 100644 --- a/configure.ac +++ b/configure.ac @@ -379,16 +379,21 @@ GST_CHECK_FEATURE(AVIFILE, [avifile], windec winenc, [ dnl *** CDParanoia *** translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true) GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [ - GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, - cdda_open, -lm, - cdda/cdda_interface.h, - CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia" - HEADER_DIR="yes") GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, cdda_open, -lm, cdda_interface.h, 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, + cdda_open, -lm, + cdda/cdda_interface.h, + CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia" + HEADER_DIR="yes" + FOUND_CDPARANOIA="yes") + fi if test "x$HEADER_DIR" = "xyes"; then AC_DEFINE_UNQUOTED(CDPARANOIA_HEADERS_IN_DIR, , @@ -402,8 +407,9 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) dnl *** dv *** translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true) -GST_CHECK_FEATURE(DV, [dv library], dv, [ - AM_PATH_LIBDV(HAVE_DV=yes, HAVE_DV=no) +GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [ + PKG_CHECK_MODULES(DV, libdv, HAVE_DV="yes", HAVE_DV="no") + AC_SUBST(DV_CFLAGS) AC_SUBST(DV_LIBS) ]) -- cgit v1.2.1