From: Mark Spencer <markster@digium.com>
Date: Wed, 25 Sep 2002 02:36:01 +0000 (+0000)
Subject: Version 0.3.0 from FTP
X-Git-Tag: 0.3.0~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=735a7f709ad711e6d31e9560575348b73e8f6cc0;p=thirdparty%2Fasterisk.git

Version 0.3.0 from FTP


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

diff --git a/cdr/Makefile b/cdr/Makefile
index 754d442af0..62f5ed1765 100755
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -18,12 +18,14 @@ CFLAGS+=
 #
 # MySQL stuff...  Autoconf anyone??
 #
-MODS+=$(shell if [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ]; then echo "cdr_mysql.so"; fi)
+MODS+=$(shell if [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_mysql.so"; 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/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: $(MODS)
 
@@ -37,4 +39,4 @@ clean:
 	$(CC) -shared -Xlinker -x -o $@ $<
 
 cdr_mysql.so: cdr_mysql.o
-	$(CC) -shared -Xlinker -x -o $@ $< -lmysqlclient $(MLFLAGS)
+	$(CC) -shared -Xlinker -x -o $@ $< -lmysqlclient -lz $(MLFLAGS)