Fix channels/Makefile so USE_MYSQL_FRIENDS implies USE_SIP_MYSQL_FRIENDS

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2874 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/Makefile b/channels/Makefile
index 16c9d6c..3dbcc14 100755 (executable)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -73,6 +73,7 @@ CFLAGS+=-fPIC
 
 ifeq ($(USE_MYSQL_FRIENDS),1)
 CFLAGS+=-DMYSQL_FRIENDS
+USE_SIP_MYSQL_FRIENDS=1
 endif
 ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
 CFLAGS+=-DSIP_MYSQL_FRIENDS
@@ -151,8 +152,6 @@ chan_zap.so: chan_zap.o
 chan_sip.so: chan_sip.o
 ifeq ($(USE_MYSQL_FRIENDS),1)
        $(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz
-elifeq ($(USE_SIP_MYSQL_FRIENDS),1)
-       $(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz
 else
        $(CC) $(SOLINK) -o $@ chan_sip.o
 endif