automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52902 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/Makefile b/codecs/Makefile
index 8fa45410953801741da299da611fe28da64aa066..915a048e93e7f5e0e008acd0320ec7024ecbef2f 100644 (file)
--- 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)