Bug#342139: disable chan_zap building (in channels makefile) against old libmfcr2

[Caio Begotti]

Package: asterisk
Version: 1.2.0.dfsg-4

Please, it's needed so that extra channels can be packaged without requiring 
to patch and merge Asterisk source code with anything. The upstream author of 
it can tell more. The transcript of his mail follows:

---
Caio Begotti wrote:

>Hi there Steve,
>
>Still, remains a small "bug" about this linking. The my Debian package
>of Asterisk must to remove the ${ZAPR2} part of the linkage of
>chan_zap.so (otherwise the chan_unicall.so won't work) and I have to
>collect some arguments to convince them about it:
>
>What's the real impact for Zap users of removing the linking of
>chan_zap.so against the R2 library shipped with Asterisk? It's related
>to your patch to compile chan_unicall.so, of course.
>
>
ZAPR2 doesn't really do anything. There is not R2 library shipped with
Asterisk. ZAPR2 is just left over junk. At one time I started an R2
implementation based on chan_zap. I abandoned that, and built the one
people use now. The ZAPR2 stuff is just a useless leftover from that
earlier work. I have asked for it o be removed from chan_zap.c and the
Makefile, but nothing has been done so far.

Steve
--

Here's my generic patch to fix the channels Makefile (it's generic, so ignore 
the adds parts about chan_unicall). Thanks in advance, and I hope it'll be 
fixed soon, so I can upload my channel and deps libs to the Debian repo more 
easily.

http://caio.ueberalles.net/asterisk/caio_channels_generic.diff

What seems really necessary is:

@@ -95,11 +99,6 @@
   ZAPPRI=-lpri
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard 
$(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
-  CFLAGS+=-DZAPATA_R2
-  ZAPR2=-lmfcr2
-endif
-
 ALSA_SRC=chan_alsa.c
 
 ifneq ($(wildcard alsa-monitor.h),)


And:

@@ -202,7 +207,7 @@
 	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
 
 chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -ltonezone
+	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) -ltonezone
 
 chan_sip.so: chan_sip.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_sip.o ${CYGSOLIB}

Regards,

-- 
Caio Begotti (caio1982)
http://caio.ueberalles.net