Makefile.am | 2 +- src/Makefile.am | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 6a12d96233f45a9e49b22535eebe3a9eefaf1b1e Author: Arun Raghavan <[email protected]> Date: Tue Jul 28 09:32:25 2015 +0530 build-sys: Make echo-cancel use speex cflags/libs conditionally diff --git a/src/Makefile.am b/src/Makefile.am index cef3114..0c54d11 100644 --- 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 commit 3e7b6e8cb50a2e813c51771fb0c331d9d7e99b3e Author: Arun Raghavan <[email protected]> Date: Tue Jul 28 09:31:48 2015 +0530 build-sys: Fix distcheck for systemd user unit dir diff --git a/Makefile.am b/Makefile.am index b39fc41..887cbe5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -113,4 +113,4 @@ $(top_srcdir)/.version: DISTCLEANFILES = \ po/.intltool-merge-cache -DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" +DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" --with-systemduserunitdir="$$dc_install_base/lib/systemd/user" _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
