Fix cdaudio build.

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
Fix cdaudio build.

diff --git a/ChangeLog b/ChangeLog
index 07bf515c1c8c90c36095037cf5b10f81b4f28e04..a456aec261e9e7f737a71834f96e66c913a68ca3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-14  Wim Taymans  <wim@fluendo.com>
+
+       * configure.ac:
+       * ext/Makefile.am:
+       Fix cdaudio build.
+
 2006-11-14  Wim Taymans  <wim@fluendo.com>
 
        Patch by: Mark Nauwelaerts <manauw at skynet be>

diff --git a/configure.ac b/configure.ac
index 0a4bc6338f508807e4386eec0aef9e4fbed52b29..b41c05a100db9c8553b9e8ab3f9f01bf72c75270 100644 (file)
--- 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 b906e19c08187894d8b4c7bd5041025a6d7a0b08..08b2d52a276aeff7ce3e3ae47adef027cb2ede8b 100644 (file)
--- 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