diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-11-14 10:42:19 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-11-14 10:42:19 +0000 |
| commit | 470cf71f824bbcfbd25878d2d18692052f886dcc (patch) | |
| tree | 4962650c12c430b7b32ed6beb0b2bf3f4146ed05 | |
| parent | d11a96287ccc026df6e53448540bd44300a24261 (diff) | |
| download | gst-plugins-bad-470cf71f824bbcfbd25878d2d18692052f886dcc.tar.gz gst-plugins-bad-470cf71f824bbcfbd25878d2d18692052f886dcc.tar.bz2 gst-plugins-bad-470cf71f824bbcfbd25878d2d18692052f886dcc.zip | |
Fix cdaudio build.
Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
Fix cdaudio build.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
3 files changed, 18 insertions, 4 deletions
@@ -1,5 +1,11 @@ 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> * tests/check/Makefile.am: 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 |