--- configure.orig 2014-06-03 01:28:41.000000000 -0700
+++ configure 2014-06-26 06:42:01.000000000 -0700
@@ -24039,112 +24039,13 @@
if test "${with_mysql+set}" = set; then :
if test "$withval" != "no"; then
- if test "$withval" = "yes"; then
-# This code is very broken on older systems
-# MYSQL_CONFIG=`which mysql_config 2>/dev/null`
-# if test "x${MYSQL_CONFIG}" != x; then
-# MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
-# ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
-# MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
-# MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
-# MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
-# MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
-# elif test -f /usr/local/mysql/include/mysql/mysql.h; then
- if 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 \
- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
- MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
- MYSQL_BINDIR=/usr/local/mysql/bin
- elif test -f /usr/include/mysql/mysql.h; then
- MYSQL_INCDIR=/usr/include/mysql
- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib64/mysql
- elif test -f /usr/lib64/libmysqlclient_r.a \
- -o -f /usr/lib64/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib64
- elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
- -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
- elif test -f /usr/lib/mysql/libmysqlclient_r.a \
- -o -f /usr/lib/mysql/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib/mysql
- elif test -f /usr/include/mysql.h; then
- MYSQL_INCDIR=/usr/include
- if test -f /usr/lib64/libmysqlclient_r.a \
- -o -f /usr/lib64/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib64
- elif test -f /usr/local/include/mysql/mysql.h; then
- MYSQL_INCDIR=/usr/local/include/mysql
- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/local/lib64/mysql