[asterisk-commits] kpfleming: branch 1.2 r53034 - /branches/1.2/codecs/Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jan 31 11:28:15 2007
New Revision: 53034

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53034
Log:
allow codec_zap to build again, now that transcoder support is in zaptel 1.2

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=53034&r1=53033&r2=53034
==============================================================================
--- branches/1.2/codecs/Makefile (original)
+++ branches/1.2/codecs/Makefile Wed Jan 31 11:28:15 2007
@@ -28,18 +28,18 @@
   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)