Mercurial > audlegacy
changeset 1705:ffa7b9168190 trunk
[svn] - do not build OSS plugin unless we really can
| author | nenolod |
|---|---|
| date | Fri, 15 Sep 2006 18:26:57 -0700 |
| parents | 365a2b043447 |
| children | 15e53bf1b389 |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 31 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 15 18:24:27 2006 -0700 +++ b/ChangeLog Fri Sep 15 18:26:57 2006 -0700 @@ -1,3 +1,13 @@ +2006-09-16 01:24:27 +0000 William Pitcock <nenolod@nenolod.net> + revision [2345] + - remove debugging printf()'s + + + Changes: Modified: + +1 -18 trunk/Plugins/Output/CoreAudio/configure.c + +0 -27 trunk/Plugins/Output/CoreAudio/convert.c + + 2006-09-15 23:48:51 +0000 William Pitcock <nenolod@nenolod.net> revision [2343] - only build cdaudio plugin if we support DAE
--- a/configure.ac Fri Sep 15 18:24:27 2006 -0700 +++ b/configure.ac Fri Sep 15 18:26:57 2006 -0700 @@ -624,11 +624,12 @@ AC_ARG_ENABLE(oss, [ --disable-oss disable the OSS output plugin (default=enabled)], - [have_oss=$enableval], - [have_oss=yes] + [enable_oss=$enableval], + [enable_oss=yes] ) -if test "$have_oss" = "yes"; then +have_oss=no +if test "$enable_oss" = "yes"; then AC_MSG_CHECKING(for OSS include dir) OSS_CFLAGS="" if test -f "/etc/oss.conf" ; then @@ -652,25 +653,25 @@ AC_CHECK_HEADERS(machine/soundcard.h) CFLAGS=$CFLAGS_save - if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then + if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes" || test "${ac_cv_header_soundcard_h}" = "yes"; then have_oss=yes - fi - AC_MSG_CHECKING(wether we need -lossaudio) - AC_TRY_LINK([ - #include <sys/ioctl.h> - #ifdef HAVE_SYS_SOUNDCARD_H - #include <sys/soundcard.h> - #else - #include <soundcard.h> - #endif - ], [ - int fd, value; - ioctl(fd, SOUND_MIXER_READ_VOLUME, &value); - ], AC_MSG_RESULT(no), [ - OSS_LIBS="-lossaudio" - AC_MSG_RESULT(yes) - ]) + AC_MSG_CHECKING(whether we need -lossaudio) + AC_TRY_LINK([ + #include <sys/ioctl.h> + #ifdef HAVE_SYS_SOUNDCARD_H + #include <sys/soundcard.h> + #else + #include <soundcard.h> + #endif + ], [ + int fd, value; + ioctl(fd, SOUND_MIXER_READ_VOLUME, &value); + ], AC_MSG_RESULT(no), [ + OSS_LIBS="-lossaudio" + AC_MSG_RESULT(yes) + ]) + fi fi if test "$have_oss" = "yes"; then