From ee81b64d50865719b096a80ad1c6d239517840da Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 26 Jun 2008 20:33:25 +0000
Subject: [PATCH] fix for bug in mysql to display threaded lib when there is
none
---
auxdir/x_ac_databases.m4 | 33 ++++++++++++++---
configure | 76 +++++++++++++++++++++++++++++++++++++---
2 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/auxdir/x_ac_databases.m4 b/auxdir/x_ac_databases.m4
index 8bed9a70397..63c87fc6296 100644
--- a/auxdir/x_ac_databases.m4
+++ b/auxdir/x_ac_databases.m4
@@ -48,9 +48,6 @@ AC_DEFUN([X_AC_DATABASES],
# want that so we remove it.
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
- if test -z "$MYSQL_LIBS"; then
- MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
- fi
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
@@ -73,10 +70,36 @@ AC_DEFUN([X_AC_DATABASES],
AC_SUBST(MYSQL_CFLAGS)
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
else
+ MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
+ MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
+ LIBS="$MYSQL_LIBS $save_LIBS"
+ AC_TRY_LINK([#include <mysql.h>],[
+ int main()
+ {
+ MYSQL mysql;
+ (void) mysql_init(&mysql);
+ (void) mysql_close(&mysql);
+ }
+ ],
+ [ac_have_mysql="yes"],
+ [ac_have_mysql="no"])
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+
MYSQL_CFLAGS=""
MYSQL_LIBS=""
- AC_MSG_WARN([*** MySQL test program execution failed.])
- fi
+ if test "$ac_have_mysql" == "yes"; then
+ AC_MSG_RESULT([MySQL (non-threaded) test program built properly.])
+ AC_SUBST(MYSQL_LIBS)
+ AC_SUBST(MYSQL_CFLAGS)
+ AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
+ else
+ AC_MSG_WARN([*** MySQL test program execution failed.])
+ fi
+ fi
fi
fi
diff --git a/configure b/configure
index 4da18856535..3e8f0950ef5 100755
--- a/configure
+++ b/configure
@@ -25500,9 +25500,6 @@ echo "$as_me: WARNING: *** mysql-$mysql_config_major_version.$mysql_config_minor
# want that so we remove it.
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
- if test -z "$MYSQL_LIBS"; then
- MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
- fi
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
@@ -25570,10 +25567,81 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
+ MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
+ MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
+ LIBS="$MYSQL_LIBS $save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <mysql.h>
+int
+main ()
+{
+
+ int main()
+ {
+ MYSQL mysql;
+ (void) mysql_init(&mysql);
+ (void) mysql_close(&mysql);
+ }
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_have_mysql="yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_have_mysql="no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+
MYSQL_CFLAGS=""
MYSQL_LIBS=""
- { echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
+ if test "$ac_have_mysql" == "yes"; then
+ { echo "$as_me:$LINENO: result: MySQL (non-threaded) test program built properly." >&5
+echo "${ECHO_T}MySQL (non-threaded) test program built properly." >&6; }
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MYSQL 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
echo "$as_me: WARNING: *** MySQL test program execution failed." >&2;}
+ fi
fi
fi
fi
--
GitLab