aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-30 23:27:16 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-30 23:27:16 +0000
commit137db7490c7b03f8ec778e4796db7bbeac77b6bb (patch)
tree125c40028069be38c899fc9b6e8d48d2cb7ad2ea /codecs
parent6776231953a6d1e4791a326220a71ac94fc949b6 (diff)
Merged revisions 52997 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r52997 | russell | 2007-01-30 17:23:24 -0600 (Tue, 30 Jan 2007) | 5 lines When we are checking for a system installed version of libgsm, we need to check for gsm.h as well. Furthermore, when checking for this header, it may be located in a gsm/ sub directory, so check for that, as well. (issue #8773) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@52998 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/codec_gsm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 3533650ce..8a3749319 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -50,7 +50,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/utils.h"
+#ifdef HAVE_GSM_HEADER
#include "gsm.h"
+#elif defined(HAVE_GSM_GSM_HEADER)
+#include <gsm/gsm.h>
+#endif
#include "../formats/msgsm.h"