configure: Fix warning message.
authorAndre Noll <maan@systemlinux.org>
Wed, 7 Mar 2012 16:01:05 +0000 (17:01 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 18 Mar 2012 20:05:20 +0000 (21:05 +0100)
If libogg is installed but speex is not, configure prints "vorbis/speex
require ogg", which is a rather bad explanation of the problem at hand.

This simple patch should fix it.

configure.ac

index 224c7be072045d0573f2bbbe269e0a624f4b7c9e..9265823533c673e700bed11f79db38507e101123 100644 (file)
@@ -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_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
        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"
        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"
 fi
 if test "$have_vorbis" = "yes"; then
        all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"