From: Andre Noll <maan@systemlinux.org>
Date: Sun, 25 Mar 2012 18:32:23 +0000 (+0200)
Subject: Merge branch 't/configure_fix'
X-Git-Tag: v0.4.10~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1abbc74e1e6fd98957fd90777e5e8eb92a88ddac;hp=e6bbb835a784a86ec3d3ca3f0420841087a8e940

Merge branch 't/configure_fix'

      configure: Fix warning message.
---

diff --git a/configure.ac b/configure.ac
index ad4a5565..a57d8d72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,6 +578,7 @@ if test "$have_ogg" = "yes"; then
 	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
 else
+	AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
 	have_vorbis="no"
 	have_speex="no"
 fi
@@ -596,8 +597,6 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
 	all_errlist_objs="$all_errlist_objs ogg_afh_common"
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
-else
-	AC_MSG_WARN([vorbis/speex require ogg])
 fi
 if test "$have_vorbis" = "yes"; then
 	all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"