diff options
| author | David I. Lehn <dlehn@users.sourceforge.net> | 2002-07-04 19:38:06 +0000 |
|---|---|---|
| committer | David I. Lehn <dlehn@users.sourceforge.net> | 2002-07-04 19:38:06 +0000 |
| commit | fbb485606a888957f277c00dc92280b245bdb5cb (patch) | |
| tree | d7799500b2cfe980ccd0fae99fe615e182a0b83d | |
| parent | 48fd7e79a071bdfe76525d1362c3f3ae9145fb23 (diff) | |
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.
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 30 | ||||
| -rw-r--r-- | ext/dv/Makefile.am | 2 |
3 files changed, 15 insertions, 17 deletions
diff --git a/common b/common -Subproject c6bd62c43f01b2012d81dfa61dd58777c41de07 +Subproject 1a826743b023d38a14e16cf1b3fb85eabdbb65d diff --git a/configure.ac b/configure.ac index dcccf4cc..85c9e27e 100644 --- a/configure.ac +++ b/configure.ac @@ -381,12 +381,17 @@ GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [ cdda_open, -lm, cdda_interface.h, CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia" - HEADER_DIR="no") - GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, - cdda_open, -lm, - cdda/cdda_interface.h, - CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia" - HEADER_DIR="yes") + 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, , @@ -400,8 +405,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) ]) @@ -534,14 +540,6 @@ GST_CHECK_FEATURE(LCS, Lcs, lcs, [ 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 *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBFAME, true) GST_CHECK_FEATURE(LIBFAME, [libfame MPEG1/4 encoder], libfame, [ diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index df26aec2..f2e66937 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -3,7 +3,7 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstdvdec.la libgstdvdec_la_SOURCES = gstdvdec.c -libgstdvdec_la_CFLAGS = $(GST_CFLAGS) +libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS) libgstdvdec_la_LIBADD = $(DV_LIBS) libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) |