[asterisk-commits] russell: branch 1.2 r52857 - /branches/1.2/codecs/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan 30 09:35:23 2007
New Revision: 52857

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52857
Log:
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)

Modified:
    branches/1.2/codecs/Makefile

Modified: branches/1.2/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/codecs/Makefile?view=diff&rev=52857&r1=52856&r2=52857
==============================================================================
--- branches/1.2/codecs/Makefile (original)
+++ branches/1.2/codecs/Makefile Tue Jan 30 09:35:23 2007
@@ -28,18 +28,18 @@
   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)