From b0ed19fe38f86f3a6b47d8d2158960fbf8cc733d Mon Sep 17 00:00:00 2001
From: GRMrGecko <GRMrGecko@gmail.com>
Date: Sun, 12 Feb 2012 21:21:27 -0600
Subject: [PATCH] Fixed the build script for MySQL so it uses MySQL_Config
 instead of guessing based on what my configuration was.

---
 buildLogMySQL | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/buildLogMySQL b/buildLogMySQL
index cf486aa..f7d9d76 100755
--- a/buildLogMySQL
+++ b/buildLogMySQL
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-INSTALLNAMETOOL=`which install_name_tool` # Fixes Mac OS X issue with linking.
-ZNCBUILD=`which znc-buildmod`
+INSTALLNAMETOOL=`which install_name_tool 2>> /dev/null` # Fixes Mac OS X issue with linking.
+ZNCBUILD=`which znc-buildmod 2>> /dev/null`
+MYSQLCONFIG=`which mysql_config 2>> /dev/null`
 
 if [ -f logMySQL.buildconfig ]; then
 	. ./logMySQL.buildconfig
@@ -15,11 +16,11 @@ if [ "$ZNCBUILD" = "" ]; then
 	fi
 fi
 
-if [ "$MYSQL" = "" ]; then
-	echo "Where is MySQL path [/usr/local/mysql]:"
-	read MYSQL
-	if [ "$MYSQL" = "" ]; then
-		MYSQL="/usr/local/mysql"
+if [ "$MYSQLCONFIG" = "" ]; then
+	echo "Where is MySQL_Config path [/usr/local/mysql/bin/mysql_config]:"
+	read MYSQLCONFIG
+	if [ "$MYSQLCONFIG" = "" ]; then
+		MYSQLCONFIG="/usr/local/mysql/bin/mysql_config"
 	fi
 fi
 
@@ -34,13 +35,17 @@ fi
 if [ ! -f logMySQL.buildconfig ]; then
 	echo "#!/bin/bash" > logMySQL.buildconfig
 	echo "ZNCBUILD=\"$ZNCBUILD\"" >> logMySQL.buildconfig
-	echo "MYSQL=\"$MYSQL\"" >> logMySQL.buildconfig
+	echo "MYSQLCONFIG=\"$MYSQLCONFIG\"" >> logMySQL.buildconfig
 	echo "ZNCCONFIG=\"$ZNCCONFIG\"" >> logMySQL.buildconfig
 	chmod 755 logMySQL.buildconfig
 fi
 
-LDFLAGS="-L $MYSQL/lib -lmysqlclient -I $MYSQL/include" "$ZNCBUILD" logmysql.cpp
+MYSQLINCLUDE=`$MYSQLCONFIG --include`
+MYSQLLIBS=`$MYSQLCONFIG --libs`
+
+LDFLAGS="$MYSQLLIBS $MYSQLINCLUDE" "$ZNCBUILD" logmysql.cpp
 if [ "$INSTALLNAMETOOL" != "" ]; then
+	MYSQL=`$MYSQLCONFIG --libs | sed -e "s/.*-L//;s/ .*//"`
 	"$INSTALLNAMETOOL" -change libmysqlclient.18.dylib "$MYSQL/libmysqlclient.dylib" logmysql.so
 fi
 cp logmysql.so "$ZNCCONFIG/modules/logmysql.so"
\ No newline at end of file