From 786780275294f97c42c427d0d769bc48bdddb524 Mon Sep 17 00:00:00 2001
From: waterson <waterson@maubi.net>
Date: Tue, 13 Jan 2009 16:40:05 +0000
Subject: [PATCH] drive mysql-config better.

--HG--
extra : convert_revision : f8079fcf09a86d22914e908df5285dd2bda5c79c
---
 HDBC-mysql.buildinfo.in |  2 +-
 HDBC-mysql.cabal        |  1 -
 configure               | 16 ++++++++--------
 configure.ac            | 10 +++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/HDBC-mysql.buildinfo.in b/HDBC-mysql.buildinfo.in
index e37b054..48770df 100644
--- a/HDBC-mysql.buildinfo.in
+++ b/HDBC-mysql.buildinfo.in
@@ -1,2 +1,2 @@
-extra-lib-dirs: @MYSQLLIBDIR@
 include-dirs: @MYSQLINCDIR@
+ld-options: @MYSQLLDOPTS@
diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
index 77b3b31..dd2b640 100644
--- a/HDBC-mysql.cabal
+++ b/HDBC-mysql.cabal
@@ -12,5 +12,4 @@ Build-Depends:    base, time, HDBC>=1.1.0
 Exposed-modules:  Database.HDBC.MySQL
 Other-modules:    Database.HDBC.MySQL.Connection
 ghc-options:      -Wall -O
-Extra-Libraries:  mysqlclient
 Build-Type:       Custom
diff --git a/configure b/configure
index eb4f5f7..ec11f6c 100644
--- a/configure
+++ b/configure
@@ -616,7 +616,7 @@ host_alias
 target_alias
 mysql_config
 MYSQLINCDIR
-MYSQLLIBDIR
+MYSQLLDOPTS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1668,14 +1668,14 @@ echo "$as_me: error: mysql_config executable not found. Make sure mysql_config i
 else
     { echo "$as_me:$LINENO: checking MySQL header dir" >&5
 echo $ECHO_N "checking MySQL header dir... $ECHO_C" >&6; }
-    MYSQLINCDIR=`${mysql_config} --include`
+    MYSQLINCDIR=`${mysql_config} --include | sed -e 's/-I//g'`
     { echo "$as_me:$LINENO: result: $MYSQLINCDIR" >&5
 echo "${ECHO_T}$MYSQLINCDIR" >&6; }
-    { echo "$as_me:$LINENO: checking MySQL library dir" >&5
-echo $ECHO_N "checking MySQL library dir... $ECHO_C" >&6; }
-    PGLIBDIR=`${mysql_config} --libs`
-    { echo "$as_me:$LINENO: result: $MYSQLLIBDIR" >&5
-echo "${ECHO_T}$MYSQLLIBDIR" >&6; }
+    { echo "$as_me:$LINENO: checking MySQL linker options" >&5
+echo $ECHO_N "checking MySQL linker options... $ECHO_C" >&6; }
+    MYSQLLDOPTS=`${mysql_config} --libs`
+    { echo "$as_me:$LINENO: result: $MYSQLLDOPTS" >&5
+echo "${ECHO_T}$MYSQLLDOPTS" >&6; }
 fi
 
 
@@ -2349,7 +2349,7 @@ host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
 mysql_config!$mysql_config$ac_delim
 MYSQLINCDIR!$MYSQLINCDIR$ac_delim
-MYSQLLIBDIR!$MYSQLLIBDIR$ac_delim
+MYSQLLDOPTS!$MYSQLLDOPTS$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
diff --git a/configure.ac b/configure.ac
index bd42062..2c35584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,14 +8,14 @@ if test [ -z "$mysql_config" ]; then
     AC_MSG_ERROR([mysql_config executable not found. Make sure mysql_config is in your path])
 else
     AC_MSG_CHECKING([MySQL header dir])
-    MYSQLINCDIR=`${mysql_config} --include`
+    MYSQLINCDIR=`${mysql_config} --include | sed -e 's/-I//g'`
     AC_MSG_RESULT([$MYSQLINCDIR])
-    AC_MSG_CHECKING([MySQL library dir])
-    PGLIBDIR=`${mysql_config} --libs`
-    AC_MSG_RESULT([$MYSQLLIBDIR])
+    AC_MSG_CHECKING([MySQL linker options])
+    MYSQLLDOPTS=`${mysql_config} --libs`
+    AC_MSG_RESULT([$MYSQLLDOPTS])
 fi
 
 AC_SUBST([MYSQLINCDIR])
-AC_SUBST([MYSQLLIBDIR])
+AC_SUBST([MYSQLLDOPTS])
 AC_CONFIG_FILES([HDBC-mysql.buildinfo])
 AC_OUTPUT