diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-30 16:13:24 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-30 16:13:24 +0000 |
| commit | a1a377ab86aafd40a919b91bf8bbc002d124eb5c (patch) | |
| tree | 66894635ef6c70a6febb48a169508382135b3b50 /codecs | |
| parent | f9c1927b746c3cd9ece3eb0a544d749bed8beb73 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@52902 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 8fa454109..915a048e9 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -28,18 +28,18 @@ ifneq ($(wildcard g723.1b/coder2.c),) LIBG723B=g723.1b/libg723b.a endif -ifndef WITHOUT_ZAPTEL -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib - endif - CODECS+=codec_zap.so -endif -endif # WITHOUT_ZAPTEL - +# XXX Uncomment this when transcoder support is merged into zaptel 1.2 ! +#ifndef WITHOUT_ZAPTEL +#ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) +# ifeq (${OSARCH},NetBSD) +# SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib +# endif +# ifeq (${OSARCH},FreeBSD) +# SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib +# endif +# CODECS+=codec_zap.so +#endif +#endif # WITHOUT_ZAPTEL UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) |