]> git.sur5r.net Git - bacula/bacula/commitdiff
Rebuild configure.
authorMarco van Wieringen <mvw@planets.elm.net>
Sun, 22 Apr 2012 17:21:49 +0000 (19:21 +0200)
committerKern Sibbald <kern@sibbald.com>
Sat, 20 Apr 2013 12:50:37 +0000 (14:50 +0200)
bacula/configure

index 2a9bd8ae56f08da582a3ea1fc7c3ec073d3bbf56..71a1c59d917afdf8df798837dd64fdfbb64c39f4 100755 (executable)
@@ -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 \