I lied, I am the One True Buildmaster

Original commit message from CVS:
I lied, I am the One True Buildmaster

diff --git a/configure.ac b/configure.ac
index d018daa..d4e0525 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -774,6 +774,15 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [
     AC_CHECK_LIB(audiofile, af_virtual_file_new, , HAVE_AUDIOFILE="no")
   fi])
 
+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 *** CDParanoia ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
 GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 14e9618..aaa9c6a 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -34,6 +34,12 @@ else
 AUDIOFILE_DIR=
 endif
 
+if USE_CDAUDIO
+CDAUDIO_DIR=cdaudio
+else
+CDAUDIO_DIR=
+endif
+
 if USE_CDPARANOIA
 CDPARANOIA_DIR=cdparanoia
 else
@@ -359,6 +365,7 @@ SUBDIRS=\
        $(ARTS_DIR) \
        $(ARTSC_DIR) \
        $(AUDIOFILE_DIR) \
+       $(CDAUDIO_DIR) \
        $(CDPARANOIA_DIR) \
        $(DIRAC_DIR) \
        $(DIVX_DIR) \
@@ -418,6 +425,7 @@ DIST_SUBDIRS=\
        arts \
        artsd \
        audiofile \
+       cdaudio \
        cdparanoia \
        dirac \
        divx \