build-sys: Make echo-cancel use speex cflags/libs conditionally

diff --git a/src/Makefile.am b/src/Makefile.am
index cef3114..0c54d11 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2021,8 +2021,8 @@ module_echo_cancel_la_SOURCES = \
                modules/echo-cancel/null.c \
                modules/echo-cancel/echo-cancel.h
 module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS)
-module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSPEEX_CFLAGS)
+module_echo_cancel_la_LIBADD = $(MODULE_LIBADD)
+module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS)
 if HAVE_ADRIAN_EC
 module_echo_cancel_la_SOURCES += \
                modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
@@ -2039,6 +2039,8 @@ endif
 endif
 if HAVE_SPEEX
 module_echo_cancel_la_SOURCES += modules/echo-cancel/speex.c
+module_echo_cancel_la_CFLAGS += $(LIBSPEEX_CFLAGS)
+module_echo_cancel_la_LIBADD += $(LIBSPEEX_LIBS)
 endif
 if HAVE_WEBRTC
 # The webrtc code is split off into a helper library to avoid having automake