[xiph-commits] r3369 - libfishsound/branches/1.0-stable

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-01-20 18:55:52 -0800 (Sun, 20 Jan 2008)
New Revision: 3369

Modified:
   libfishsound/branches/1.0-stable/configure.ac
Log:
fix configuration option checks to allow support of FLAC only


Modified: libfishsound/branches/1.0-stable/configure.ac
===================================================================
--- libfishsound/branches/1.0-stable/configure.ac	2008-01-21 02:29:57 UTC (rev 3368)
+++ libfishsound/branches/1.0-stable/configure.ac	2008-01-21 02:55:52 UTC (rev 3369)
@@ -277,10 +277,12 @@
 dnl
 dnl  Check codec disabling sanity
 dnl
-if test "x${ac_enable_vorbis}" = xno && test "x${ac_enable_speex}" = xno ; then
+if test "x${ac_enable_vorbis}" = xno && test "x${ac_enable_speex}" = xno &&
+test "x${ac_enable_flac}" = xno ; then
   AC_MSG_ERROR([
 ***
-*** You have attempted to explicitly disable both Vorbis and Speex support.
+*** You have attempted to explicitly disable support for all codecs:
+*** FLAC, Speex and Vorbis.
 ***
 *** If you want a fish that does nothing, try kfishd:
 ***
@@ -292,9 +294,10 @@
 fi
 
 dnl
-dnl Set overall configuration success to no if neither vorbis or speex found
+dnl Set overall configuration success to no if none of FLAC, Vorbis or Speex
+dnl has been found.
 dnl
-if test "x$HAVE_VORBIS" = "xno" && test "x$HAVE_SPEEX" = "xno"; then
+if test "x$HAVE_VORBIS" = "xno" && test "x$HAVE_SPEEX" = "xno" && test "x$HAVE_FLAC" = "xno" ; then
   fishsound_config_ok=no
 fi