From: Andre Noll <maan@systemlinux.org>
Date: Sun, 17 Nov 2013 15:49:35 +0000 (+0100)
Subject: Merge branch 't/for-maint' into maint
X-Git-Tag: v0.5.1~7^2
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=e66a7267ca6cc374496dda803c6f9fdb631e99c0;hp=20c8622c90f488ab398146a9e5b51d61149e96d3;p=paraslash.git

Merge branch 't/for-maint' into maint

A single fix that was cooking for some weeks.

	0a7cad build: Fix --with-opus-libs.
---

diff --git a/configure.ac b/configure.ac
index 9ad36e14..55b38e54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,7 +696,7 @@ if test "$have_ogg" = "yes"; then
 		CPPFLAGS="$CPPFLAGS $opus_cppflags"
 	fi
 	if test -n "$with_opus_libs"; then
-		speex_libs="-L$with_opus_libs"
+		opus_libs="-L$with_opus_libs"
 		LDFLAGS="$LDFLAGS $opus_libs"
 	fi
 	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])