From 470cf71f824bbcfbd25878d2d18692052f886dcc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 14 Nov 2006 10:42:19 +0000 Subject: Fix cdaudio build. Original commit message from CVS: * configure.ac: * ext/Makefile.am: Fix cdaudio build. --- ChangeLog | 6 ++++++ configure.ac | 8 ++++++++ ext/Makefile.am | 8 ++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07bf515c..a456aec2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-14 Wim Taymans + + * configure.ac: + * ext/Makefile.am: + Fix cdaudio build. + 2006-11-14 Wim Taymans Patch by: Mark Nauwelaerts diff --git a/configure.ac b/configure.ac index 0a4bc633..b41c05a1 100644 --- a/configure.ac +++ b/configure.ac @@ -319,6 +319,14 @@ GST_CHECK_FEATURE(BZ2, [bz2 library], bz2, [ # AC_SUBST(CAIRO_LIBS) #]) +dnl *** cdaudio *** +translit(dnm, m, l) AM_CONDITIONAL(USE_CDAUDIO, true) +GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [ + GST_CHECK_CONFIGPROG(CDAUDIO, libcdaudio-config) + AC_SUBST(CDAUDIO_CFLAGS) + AC_SUBST(CDAUDIO_LIBS) +]) + dnl **** DirectFB **** translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTFB, true) GST_CHECK_FEATURE(DIRECTFB, [directfb], dfbvideosink , [ diff --git a/ext/Makefile.am b/ext/Makefile.am index b906e19c..08b2d52a 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -40,11 +40,11 @@ else BZ2_DIR= endif -# if USE_CDAUDIO -# CDAUDIO_DIR=cdaudio -# else +if USE_CDAUDIO +CDAUDIO_DIR=cdaudio +else CDAUDIO_DIR= -# endif +endif # if USE_DIRAC # DIRAC_DIR=dirac -- cgit v1.2.1