From fe394f23d4ac43e3c93b70c9f0d05021736d3adc Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 31 Jan 2007 17:28:15 +0000 Subject: [PATCH] allow codec_zap to build again, now that transcoder support is in zaptel 1.2 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@53034 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/codecs/Makefile b/codecs/Makefile index 915a048e93..8fa4541095 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) -- 2.47.2