diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
commit | f409b5bba7f5dd37304c07d276173995b755729c (patch) | |
tree | ebbb827c5e0e7f2873b53158deb5706275f5eeba /codecs | |
parent | d8c8b23c1a8dc24b755e69920fee884a59f4389f (diff) |
Merged revisions 49457,49460-49461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49457 | kpfleming | 2007-01-04 12:05:47 -0600 (Thu, 04 Jan 2007) | 2 lines
make building of codec_gsm against the system GSM library actually work
........
r49460 | kpfleming | 2007-01-04 12:16:40 -0600 (Thu, 04 Jan 2007) | 2 lines
don't define this type either if LOW_MEMORY is enabled
........
r49461 | kpfleming | 2007-01-04 12:17:01 -0600 (Thu, 04 Jan 2007) | 2 lines
don't do frame header caching in the core if LOW_MEMORY is defined
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49463 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index df527ff7c..776f8747f 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -31,7 +31,7 @@ all: _all include $(ASTTOPDIR)/Makefile.moddir_rules -ifneq ($(GSM_INTERNAL),) +ifneq ($(GSM_INTERNAL),no) GSM_INCLUDE:=-Igsm/inc $(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a endif |