From 1784df91360a123f32d7a9a76513720ce7b1074c Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Fri, 11 Nov 2005 01:11:00 +0000
Subject: [PATCH] portaudio integration

---
 configure.ac          | 6 ++----
 m4/portaudio.m4       | 7 +++----
 portaudio/Makefile.am | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8b149a2a32..fddca749d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,10 +81,8 @@ SFLPHONE_CXXFLAGS="$SFLPHONE_CXXFLAGS $libccrtp1_CFLAGS"
 SFLPHONE_LIBS="$SFLPHONE_LIBS $libccrtp1_LIBS"
 
 
-SFLPHONE_CXXFLAGS="$SFLPHONE_CXXFLAGS $OSIP_CFLAGS"
-SFLPHONE_LIBS="$SFLPHONE_LIBS $OSIP_LIBS"
-SFLPHONE_CXXFLAGS="$SFLPHONE_CXXFLAGS $EXOSIP_CFLAGS"
-SFLPHONE_LIBS="$SFLPHONE_LIBS $EXOSIP_LIBS"
+SFLPHONE_CXXFLAGS="$SFLPHONE_CXXFLAGS $OSIP_CFLAGS $EXOSIP_CFLAGS $PORTAUDIO_CFLAGS"
+SFLPHONE_LIBS="$SFLPHONE_LIBS $OSIP_LIBS $EXOSIP_LIBS "
 
 
 AC_SUBST(SFLPHONE_CXXFLAGS)
diff --git a/m4/portaudio.m4 b/m4/portaudio.m4
index 0d290382d1..167cf3319d 100644
--- a/m4/portaudio.m4
+++ b/m4/portaudio.m4
@@ -61,9 +61,6 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(NASM)
 AC_SUBST(NASMOPT)
 
-AC_SUBST(PORTAUDIO_CFLAGS)
-AC_SUBST(PORTAUDIO_CXXFLAGS)
-AC_SUBST(PORTAUDIO_LIBS)
 
 CFLAGS="-g -O2 -Wall -pedantic -pipe -fPIC"
 
@@ -112,7 +109,9 @@ CFLAGS=$CFLAGS_save
 LIBS=$LIBS_save
 CXXFLAGS=$CXXFLAGS_save
 
-AC_SUBST(OTHER_SOURCES, $OTHER_SOURCES)
+AC_SUBST(PORTAUDIO_CFLAGS)
+AC_SUBST(PORTAUDIO_CXXFLAGS)
+AC_SUBST(PORTAUDIO_LIBS)
 
 ])
 
diff --git a/portaudio/Makefile.am b/portaudio/Makefile.am
index f9b7d7cde4..928eaa0c59 100644
--- a/portaudio/Makefile.am
+++ b/portaudio/Makefile.am
@@ -1,7 +1,7 @@
 
 noinst_LTLIBRARIES = libportaudio.la
 libportaudio_la_CFLAGS = $(PORTAUDIO_CFLAGS) 
-libportaudio_la_LIBS = $(PORTAUDIO_LIBS)
+libportaudio_la_LIBADD = $(PORTAUDIO_LIBS)
 libportaudio_la_CXXFLAGS = $(PORTAUDIO_CXXFLAGS)
 libportaudio_la_CPPFLAGS = $(PORTAUDIO_CPPFLAGS) -Ipa_common/
 
-- 
GitLab