changeset 1703:409444cb0605 trunk

[svn] - only build cdaudio plugin if we support DAE
author nenolod
date Fri, 15 Sep 2006 16:48:51 -0700
parents 002a5743e4b6
children 365a2b043447
files ChangeLog configure.ac
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 15 16:36:30 2006 -0700
+++ b/ChangeLog	Fri Sep 15 16:48:51 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-15 23:36:30 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2341]
+  - if a pkg-config module is unavailable, report this
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/m4/pkg.m4  
+
+
 2006-09-15 23:34:23 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2339]
   - do not AC_MSG_ERROR() when libvorbis is not present, just notify the user that vorbis support won't be built
--- a/configure.ac	Fri Sep 15 16:36:30 2006 -0700
+++ b/configure.ac	Fri Sep 15 16:48:51 2006 -0700
@@ -115,7 +115,7 @@
 
 dnl These plugins are always built.
 
-INPUT_PLUGINS="cdaudio tonegen console sexypsf wav cue"
+INPUT_PLUGINS="tonegen console sexypsf wav cue"
 OUTPUT_PLUGINS="disk_writer"
 EFFECT_PLUGINS="audiocompress ladspa voice_removal"
 GENERAL_PLUGINS="song_change"
@@ -896,6 +896,7 @@
 
 if test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes"
 then
+    INPUT_PLUGINS="cdaudio $INPUT_PLUGINS"
     case "$host" in
         *-*-sunos* | *-*-solaris* | *-*-linux*)
             AC_DEFINE(BEEP_CDROM_SOLARIS,, [Define if cdrom access is in Solaris style])