use the system libgsm if available (issue #5434, modified to still work with builtin...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7539 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/Makefile b/codecs/Makefile
index d1feb8a54678d48612645e6792e96cb03f9633d3..c4999417424a98a792f6715fc913f0f37eb42994 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -60,8 +60,18 @@ ifneq ($(wildcard ilbc/iLBC_decode.h),)
 endif
 
 
+LIBGSM_PATH:=/usr/local/include /usr/include
+LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))
+ifneq (,$(LIBGSM_SYSTEM_HEADERS))
+LIBGSM=-lgsm
+LIBGSMT=
+CFLAGS+=-DUSE_EXTERNAL_GSM_LIB
+else
 LIBGSM=gsm/lib/libgsm.a
-LIBGSMT=gsm/lib/libgsm.a
+LIBGSMT=$(LIBGSM)
+CFLAGS+=-I.
+endif
+
 LIBLPC10=lpc10/liblpc10.a
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)

diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 65800476ed265d6c77e24bbc0711bd9e6639df07..b8afd3bd733373a47331d2d2cedbfc7b9082500f 100644 (file)
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -45,7 +45,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 
+#ifdef USE_EXTERNAL_GSM_LIB
+#include <gsm/gsm.h>
+#else
 #include "gsm/inc/gsm.h"
+#endif
+
 #include "../formats/msgsm.h"
 
 /* Sample frame data */