Index: channels/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- channels/Makefile	23 Jan 2004 20:57:48 -0000	1.37
+++ channels/Makefile	24 Jan 2004 19:58:36 -0000
@@ -14,6 +14,7 @@
 OSARCH=$(shell uname -s)
 
 USE_MYSQL_FRIENDS=0
+USE_SIP_MYSQL_FRIENDS=0
 
 CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
 	     chan_modem_aopen.so \
@@ -52,6 +53,9 @@
 
 ifeq ($(USE_MYSQL_FRIENDS),1)
 CFLAGS+=-DMYSQL_FRIENDS
+endif
+ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+CFLAGS+=-DSIP_MYSQL_FRIENDS
 endif
 
 CFLAGS+=#-DVOFRDUMPER
Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.281
diff -u -r1.281 chan_sip.c
--- channels/chan_sip.c	23 Jan 2004 15:43:31 -0000	1.281
+++ channels/chan_sip.c	24 Jan 2004 19:58:38 -0000
@@ -52,7 +52,8 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#ifdef MYSQL_FRIENDS
+#ifdef SIP_MYSQL_FRIENDS
+#define MYSQL_FRIENDS
 #include <mysql/mysql.h>
 #endif