[Asterisk-cvs] asterisk/cdr Makefile,1.6,1.7 cdr_mysql.c,1.16,NONE

[markster at lists.digium.com]

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

Modified Files:
	Makefile 
Removed Files:
	cdr_mysql.c 
Log Message:
Remove MySQL support from default Asterisk in accordance with new MySQL library licensing


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	19 Aug 2003 16:42:30 -0000	1.6
+++ Makefile	26 Sep 2003 22:03:10 -0000	1.7
@@ -15,19 +15,6 @@
 
 CFLAGS+=-fPIC
 
-#
-# MySQL stuff...  Autoconf anyone??
-#
-MODS+=$(shell if [ -d /usr/local/mysql/include ] || [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_mysql.so"; fi)
-CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi)
-CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi)
-CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi)
-CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi)
-MLFLAGS=
-MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi)
-MLFLAGS+=$(shell if [ -d /usr/local/mysql/lib ]; then echo "-L/usr/local/mysql/lib"; fi)
-MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi)
-MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi)
 
 all: depend $(MODS)
 
@@ -43,9 +30,6 @@
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-cdr_mysql.so: cdr_mysql.o
-	$(CC) -shared -Xlinker -x -o $@ $< -lmysqlclient -lz $(MLFLAGS)
 
 depend: .depend
 

--- cdr_mysql.c DELETED ---