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 9ad36e14f6ab686852d2cbb0a79b94249bb01888..55b38e548f5f40d77b801e73f25a2202c2d4f794 100644 (file)
--- 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" ])