make asterisk chan_bluetooth and chan_h323 modules optional,
[openwrt.git] / openwrt / package / asterisk / patches / asterisk-1.2.1-chan_h323.patch
1 diff -ruN asterisk-1.2.1-old/channels/Makefile asterisk-1.2.1-new/channels/Makefile
2 --- asterisk-1.2.1-old/channels/Makefile        2006-05-07 13:06:06.000000000 +0200
3 +++ asterisk-1.2.1-new/channels/Makefile        2006-05-07 15:26:00.000000000 +0200
4 @@ -15,6 +15,7 @@
5  #
6  
7  CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
8 +CXXLIBS=-lstdc++
9  
10  ifneq (${OSARCH},CYGWIN)
11  # if you really, really want to use these drivers, uncomment the line below
12 @@ -230,7 +231,7 @@
13  
14  ifeq (${OSARCH},Linux)
15  chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
16 -       $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
17 +       $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CXXLIBS)
18  else
19  chan_h323.so: chan_h323.o h323/libchanh323.a
20         $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
21 diff -ruN asterisk-1.2.1-old/channels/h323/Makefile asterisk-1.2.1-new/channels/h323/Makefile
22 --- asterisk-1.2.1-old/channels/h323/Makefile   2005-11-29 19:24:39.000000000 +0100
23 +++ asterisk-1.2.1-new/channels/h323/Makefile   2006-05-07 13:18:46.000000000 +0200
24 @@ -30,7 +30,7 @@
25         touch $(SOURCES)
26  
27  libchanh323.a: $(OBJS)
28 -       ar crv $@ $(OBJS)
29 +       $(AR) crv $@ $(OBJS)
30  
31  Makefile.ast:  FORCE
32         @echo H323CFLAGS  = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp