summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2004-10-20 16:48:57 +0000
committerWim Taymans <wim.taymans@gmail.com>2004-10-20 16:48:57 +0000
commitf0553616378ddbf28799cee1738875e71899aaa4 (patch)
tree79a562d0e5baa622b7d9f29ee9d4d27173f2d8f2
parent001d4b9638482185cf44d63af68d459c3cb9a608 (diff)
I lied, I am the One True Buildmaster
Original commit message from CVS: I lied, I am the One True Buildmaster
-rw-r--r--configure.ac9
-rw-r--r--ext/Makefile.am8
2 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index d018daa1..d4e0525a 100644
--- 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 14e96187..aaa9c6a8 100644
--- 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 \