From: Andre Noll <maan@systemlinux.org>
Date: Mon, 27 Jan 2014 12:54:49 +0000 (+0100)
Subject: flac: Try to link also without -logg.
X-Git-Tag: v0.5.2~6^2~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=dadb47c6870e1b93e32ffb5e755ab23b4651a23d;ds=sidebyside

flac: Try to link also without -logg.

If libflac was compiled without ogg support, the build system should
include flac even if libogg is not installed. Currently this does
not work because the autoconf test tries to link with -logg, so it
always fails if libogg is not available.

Fix this by trying both with and without libogg.
---

diff --git a/configure.ac b/configure.ac
index 087002dd..b456b53d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,7 +580,11 @@ if test -n "$with_flac_libs"; then
 	LDFLAGS="$LDFLAGS $flac_libs"
 fi
 AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
-AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
+AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], [
+	# nope, try again with -logg
+	AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [],
+		have_flac=no, -lm -logg)
+	], -lm)
 if test "$have_flac" = "yes"; then
 	AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
 	AC_SUBST(flac_cppflags)