portaudio integration

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)

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)
 
 ])
 

portaudio/Makefile.am

 
 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/