--- configure.in | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
This patch makes the --with-speex configure option work as intended, allowing to explicitly disable speex linking.
diff --git a/configure.in b/configure.in index 36740e9..36d0d2a 100644 --- a/configure.in +++ b/configure.in @@ -106,14 +106,16 @@ AC_SUBST(AVCODEC_CFLAGS) AC_SUBST(AVCODEC_LIBS) AC_SUBST(AVCODEC_HEADER)
-PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) -AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") - AC_ARG_WITH([speex], AS_HELP_STRING([--with-speex={builtin|lib|no}], [build speex resampler (built-in code, link with external lib, or no build)]), [PPH=$withval], [PPH="lib"])
+if test "x$with_speex" != "xno"; then + PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) +fi +AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") + USE_LIBSPEEX="" if test "$PPH" = "lib"; then if test "$HAVE_SPEEXDSP" = "yes"; then