Skip to content
Snippets Groups Projects
Commit 3b367480 authored by James Golovich's avatar James Golovich
Browse files

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
parent bbaf536f
Branches
Tags
No related merge requests found
...@@ -73,6 +73,7 @@ CFLAGS+=-fPIC ...@@ -73,6 +73,7 @@ CFLAGS+=-fPIC
ifeq ($(USE_MYSQL_FRIENDS),1) ifeq ($(USE_MYSQL_FRIENDS),1)
CFLAGS+=-DMYSQL_FRIENDS CFLAGS+=-DMYSQL_FRIENDS
USE_SIP_MYSQL_FRIENDS=1
endif endif
ifeq ($(USE_SIP_MYSQL_FRIENDS),1) ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
CFLAGS+=-DSIP_MYSQL_FRIENDS CFLAGS+=-DSIP_MYSQL_FRIENDS
...@@ -151,8 +152,6 @@ chan_zap.so: chan_zap.o ...@@ -151,8 +152,6 @@ chan_zap.so: chan_zap.o
chan_sip.so: chan_sip.o chan_sip.so: chan_sip.o
ifeq ($(USE_MYSQL_FRIENDS),1) ifeq ($(USE_MYSQL_FRIENDS),1)
$(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz $(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz
elifeq ($(USE_SIP_MYSQL_FRIENDS),1)
$(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz
else else
$(CC) $(SOLINK) -o $@ chan_sip.o $(CC) $(SOLINK) -o $@ chan_sip.o
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment