[Asterisk-cvs] asterisk/channels Makefile,1.46,1.47

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv23262/channels

Modified Files:
	Makefile 
Log Message:
Fix channels/Makefile so USE_MYSQL_FRIENDS implies USE_SIP_MYSQL_FRIENDS


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile	30 Apr 2004 01:09:52 -0000	1.46
+++ Makefile	3 May 2004 19:14:50 -0000	1.47
@@ -73,6 +73,7 @@
 
 ifeq ($(USE_MYSQL_FRIENDS),1)
 CFLAGS+=-DMYSQL_FRIENDS
+USE_SIP_MYSQL_FRIENDS=1
 endif
 ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
 CFLAGS+=-DSIP_MYSQL_FRIENDS
@@ -150,8 +151,6 @@
 
 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