From 5c06e24dd5d6032f9a575ee4a9e5174410b26fb3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 23 Dec 2001 12:29:33 +0000 Subject: [PATCH] dvdread added more fixes for libs stuff Original commit message from CVS: dvdread added more fixes for libs stuff --- configure.ac | 12 ++++-------- ext/Makefile.am | 6 ++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e16dc67383..26dbfd56d1 100644 --- a/configure.ac +++ b/configure.ac @@ -436,9 +436,10 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) dnl *** dvdread *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDVDREAD, true) -GST_CHECK_FEATURE(LIBDVDREAD, [dvdread library], libdvdread, [ - GST_CHECK_LIBHEADER(LIBDVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, LIBDVDREAD_LIBS="-ldvdread") +translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true) +GST_CHECK_FEATURE(DVDREAD, [dvdread library], libdvdread, [ + GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread") + AC_SUBST(DVDREAD_LIBS) ]) dnl **** ESound **** @@ -860,10 +861,6 @@ if test "x$HAVE_LIBHERMES" = "xyes"; then AC_DEFINE(HAVE_LIBHERMES) fi -if test "x$HAVE_LIBDVDREAD" = xyes; then - AC_DEFINE(HAVE_LIBDVDREAD) -fi - if test "x$HAVE_A52DEC" = xyes; then AC_DEFINE(HAVE_A52DEC) fi @@ -895,7 +892,6 @@ AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes") AM_CONDITIONAL(BROKEN, test "$BROKEN" = "$xyes") AM_CONDITIONAL(HAVE_LIBMIKMOD, test "x$HAVE_LIBMIKMOD" = "xyes") -AM_CONDITIONAL(HAVE_LIBDVDREAD, test "x$HAVE_LIBDVDREAD" = "xyes") AM_CONDITIONAL(HAVE_LIBJPEG, test "x$HAVE_LIBJPEG" = "xyes") AM_CONDITIONAL(HAVE_LIBSDL, test "x$HAVE_LIBSDL" = "xyes") AM_CONDITIONAL(HAVE_LIBHERMES, test "x$HAVE_LIBHERMES" = "xyes") diff --git a/ext/Makefile.am b/ext/Makefile.am index 87883f3c14..fef6dfd4ed 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -22,6 +22,12 @@ else AUDIOFILE_DIR= endif +if USE_DVDREAD +DVDREAD_DIR=dvdread +else +DVDREAD_DIR= +endif + if USE_ESD ESD_DIR=esd else