aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-30 15:35:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-30 15:35:23 +0000
commit6ca5fe6da42a32f4fced7833459113a64f039ab2 (patch)
tree7f72bae4a0115aec18659711bf33c9cd3f009ce1 /codecs
parent48f3bd8ccdab38226b8a6b4c5f8cf93ec774494d (diff)
Comment out the parts in the Makefile that make codec_zap get built. It will
not yet build against zaptel 1.2, so I am disabling it to prevent further bug reports until it gets merged. (issue #8940) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@52857 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/Makefile24
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)