diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-31 17:28:15 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-31 17:28:15 +0000 |
| commit | 5bba369dc576def82603efb24de949e2e6b83a3d (patch) | |
| tree | 622cad7c2597f8330e7af14407acafe55851d7e1 /codecs | |
| parent | a7e84797154fc5dfe2977b87c051d8bc2c214f95 (diff) | |
allow codec_zap to build again, now that transcoder support is in zaptel 1.2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@53034 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 915a048e9..8fa454109 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -28,18 +28,18 @@ ifneq ($(wildcard g723.1b/coder2.c),) LIBG723B=g723.1b/libg723b.a endif -# 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 +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) |