From d7e2ad074405656fc1318b0d786e9bae1b16c535 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 27 Feb 2015 11:32:53 +0100
Subject: [PATCH] fix configure.ac and Makefile.am

---
 configure.ac         | 17 ++++++++++++++++-
 msbcg729/Makefile.am |  3 +--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 81f3f28..1c16f14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,22 @@ fi
 # check for libraries that have pkg-config files installed
 PKG_CHECK_MODULES(ORTP, ortp >= 0.21.0,[found_ortp=true],foo=bar)
 PKG_CHECK_MODULES(MEDIASTREAMER, mediastreamer >= 2.8.99,[found_ms2=true],foo=bar)
-AM_CONDITIONAL(BUILD_MSBCG729, test x${found_ms2}x${found_ortp}x${enable_msplugin} = xtruextruexyes)
+
+if test x${found_ms2}x${found_ortp}x${enable_msplugin} = xtruextruexyes ; then
+	build_msbcg729=true
+else
+	ORTP_CFLAGS=
+	ORTP_LIBS=
+	MEDIASTREAMER_CFLAGS=
+	MEDIASTREAMER_LIBS=
+fi
+
+AC_SUBST(ORTP_CFLAGS)
+AC_SUBST(ORTP_LIBS)
+AC_SUBST(MEDIASTREAMER_CFLAGS)
+AC_SUBST(MEDIASTREAMER_LIBS)
+
+AM_CONDITIONAL(BUILD_MSBCG729, test x$build_msbcg729 = xtrue)
 
 VISIBILITY_CFLAGS=
 case "$target_os" in
diff --git a/msbcg729/Makefile.am b/msbcg729/Makefile.am
index 83d75d2..6d1c39e 100644
--- a/msbcg729/Makefile.am
+++ b/msbcg729/Makefile.am
@@ -5,12 +5,11 @@ plugins_LTLIBRARIES=libmsbcg729.la
 
 libmsbcg729_la_SOURCES=bcg729_dec.c bcg729_enc.c
 
-
 libmsbcg729_la_LIBADD=\
 	$(ORTP_LIBS) \
 	$(MEDIASTREAMER_LIBS) \
 	$(top_builddir)/src/libbcg729.la
 
-libmsbcg729_la_LDFLAGS=-module -no-undefined $(MEDIASTREAMER_LDFLAGS)
+libmsbcg729_la_LDFLAGS=-module -no-undefined
 AM_CPPFLAGS = -I$(top_srcdir)/include
 libmsbcg729_la_CFLAGS=  $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS)