From b4715a70a87d6ddb0e3e00a5b1a1c66c0b7e7ef6 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 22 Apr 2012 19:21:49 +0200
Subject: [PATCH] Rebuild configure.

---
 bacula/configure | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bacula/configure b/bacula/configure
index 2a9bd8ae56..71a1c59d91 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -23968,10 +23968,16 @@ if test "${with_mysql+set}" = set; then :
   if test "$withval" != "no"; then
         if test "$withval" = "yes"; then
            MYSQL_CONFIG=`which mysql_config 2>/dev/null`
-           if test "x$MYSQL_CONFIG" != x; then
+           if test "x${MYSQL_CONFIG}" != x; then
               MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
-              MYSQL_LIBDIR=`"$MYSQL_CONFIG" --variable=pkglibdir`
-              MYSQL_INCDIR=`"$MYSQL_CONFIG" --variable=pkgincludedir`
+              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
+              if test $? = 0 ; then
+                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
+                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
+              else
+                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
+                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
+              fi
            elif test -f /usr/local/mysql/include/mysql/mysql.h; then
               MYSQL_INCDIR=/usr/local/mysql/include/mysql
               if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
-- 
2.39.5