Moved Makefile SPEEX and GSM flags to globals.mak

globals.mak

@@ -7,6 +7,18 @@ PJSIP_LIBS = -lpjnath-sfl -lpjsua-sfl -lpjsip-sfl -lpjmedia-sfl -lpjsip-simple-s
 
 DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
 
+if BUILD_SPEEX
+SPEEXCODEC=-DHAVE_SPEEX_CODEC
+else
+SPEEXCODEC= 
+endif
+
+if BUILD_GSM
+GSMCODEC=-DHAVE_GSM_CODEC
+else
+GSMCODEC= 
+endif
+
 # Preprocessor flags
 AM_CPPFLAGS = \
 	-I$(src)/libs \
@@ -23,5 +35,6 @@ AM_CPPFLAGS = \
 	-DCODECS_DIR=\""$(sflcodecdir)"\" \
 	-DPLUGINS_DIR=\""$(sflplugindir)"\" \
 	-DENABLE_TRACE \
-	-DSFLDEBUG
-
+	-DSFLDEBUG \
+         $(SPEEXCODEC) \
+         $(GSMCODEC)

src/audio/Makefile.am

@@ -2,17 +2,6 @@ include $(top_srcdir)/globals.mak
 
 noinst_LTLIBRARIES = libaudio.la
 
-if BUILD_SPEEX
-SPEEX_FLAG = -DBUILD_SPEEX
-else
-SPEEX_FLAG = 
-endif
-
-if BUILD_GSM
-GSM_FLAG = -DBUILD_GSM
-else
-GSM_FLAG = 
-endif
 
 if BUILD_ILBC
 ILBC_FLAG = -DBUILD_ILBC

src/audio/codecDescriptor.cpp

@@ -277,14 +277,14 @@ CodecDescriptor::seemsValid( std::string lib)
     return false;
 
 
-#ifdef HAVE_SPEEX
+#ifdef HAVE_SPEEX_CODEC
   // Nothing special
 #else
     if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == SPEEX_STRING_DESCRIPTION)
       return false;
 #endif
 
-#ifdef HAVE_GSM
+#ifdef HAVE_GSM_CODEC
   // Nothing special
 #else
     if( lib.substr(begin.length() , lib.length() - begin.length() - end.length()) == GSM_STRING_DESCRIPTION )  

src/audio/codecs/Makefile.am

@@ -10,11 +10,11 @@ INSTALL_GSM_RULE = install-libcodec_gsm_so
 endif
 
 if ENABLE_SPEEXDSP
-SPEEXDSP= -DHAVE_SPEEXDSP_LIB
+SPEEXDSP=-DHAVE_SPEEXDSP_LIB
 endif
 
 if BUILD_SPEEX
-SPEEX_LIB = libcodec_speex.so
+SPEEX_LIB=libcodec_speex.so
 libcodec_speex_so_SOURCES = speexcodec.cpp
 libcodec_speex_so_CFLAGS = -fPIC -g -Wall
 libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall $(SPEEXDSP)