diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-07-04 20:08:57 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-07-04 20:08:57 +0000 |
| commit | 278c84bed3bf98ce7ac4bcf5fe89279c55de7c30 (patch) | |
| tree | 85bc00e32fd576196dd490f67c4a337d4836bf59 | |
| parent | 9616f66311d4185fa68830ffe52fa9c5669df9fd (diff) | |
| download | gstreamer-plugins-bad-278c84bed3bf98ce7ac4bcf5fe89279c55de7c30.tar.gz | |
taaz's virtual fix
Original commit message from CVS:
taaz's virtual fix
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 22 |
2 files changed, 14 insertions, 8 deletions
diff --git a/common b/common -Subproject c6bd62c43f01b2012d81dfa61dd58777c41de07 +Subproject 1a826743b023d38a14e16cf1b3fb85eabdbb65d diff --git a/configure.ac b/configure.ac index f43f2a3bc..4b67201df 100644 --- a/configure.ac +++ b/configure.ac @@ -381,14 +381,19 @@ 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) ]) |