From 2dee4c9e9b67a368e1578ec96cbc261dd8e204c2 Mon Sep 17 00:00:00 2001 From: gcasa Date: Sun, 23 Aug 2009 07:53:50 +0000 Subject: [PATCH] Added --disable-sound option git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28514 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ configure | 10 +++++++++- configure.ac | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8b91efb3..b7eb871b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-23 03:52-EDT Gregory John Casamento + + * configure: Regenerate + * configure.ac: Added --disable-sound option. + 2009-08-23 03:45-EDT Gregory John Casamento * config.make.in: Add BUILD_SOUNDS diff --git a/configure b/configure index bc8e015e2..22b45002a 100755 --- a/configure +++ b/configure @@ -1283,6 +1283,7 @@ Optional Features: --disable-ungif Disable libungif-based GIF support --enable-libgif Enable libgif-based GIF support --disable-aspell Disable aspell for spellchecker + --disable-sound Disable sound --disable-speech Disable speech server --disable-cups Disable cups printing support @@ -6957,6 +6958,13 @@ fi #-------------------------------------------------------------------- # NSSound #-------------------------------------------------------------------- +# Check whether --enable-sound was given. +if test "${enable_sound+set}" = set; then + enableval=$enable_sound; +else + enable_sound=yes +fi + # Initialize to nothing... BUILD_SOUNDS= # Check for the libs... @@ -7095,7 +7103,7 @@ else fi # Only if we have both... -if test $have_sndfile = yes -a $have_ao = yes; then +if test $have_sndfile = yes -a $have_ao = yes -a $enable_sound = yes; then BUILD_SOUNDS="Sounds" fi diff --git a/configure.ac b/configure.ac index a815ec285..7539bbd9f 100644 --- a/configure.ac +++ b/configure.ac @@ -354,13 +354,16 @@ AC_CHECK_LIB(icns, icns_read_family_from_file) #-------------------------------------------------------------------- # NSSound #-------------------------------------------------------------------- +AC_ARG_ENABLE(sound, + [ --disable-sound Disable sound],, + enable_sound=yes) # Initialize to nothing... BUILD_SOUNDS= # Check for the libs... AC_CHECK_LIB(sndfile, sf_seek, have_sndfile=yes, have_sndfile=no) AC_CHECK_LIB(ao, ao_open_live, have_ao=yes, have_ao=no) # Only if we have both... -if test $have_sndfile = yes -a $have_ao = yes; then +if test $have_sndfile = yes -a $have_ao = yes -a $enable_sound = yes; then BUILD_SOUNDS="Sounds" fi AC_SUBST(BUILD_SOUNDS)