From 55fb4097cd416aecd778ccb82e731d25f3ee6fce Mon Sep 17 00:00:00 2001 From: Eric Stanley Date: Fri, 16 Dec 2011 10:18:41 -0600 Subject: Fixed issue for compiling mysql plugin on Solaris On Solaris, in the case where the mysql libraries were compiled using a non-gcc compiler, but the plugins are being compiled with gcc, the configure process would incorrectly determine the MYSQLCFLAGS. This has been corrected in the m4/np_mysqlclient.m4 file. --- m4/np_mysqlclient.m4 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'm4/np_mysqlclient.m4') diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4 index 9bbe63c6..cd36c4f7 100644 --- a/m4/np_mysqlclient.m4 +++ b/m4/np_mysqlclient.m4 @@ -42,6 +42,12 @@ AC_DEFUN([np_mysqlclient], fi np_mysql_libs="`$np_mysql_config --libs`" np_mysql_cflags="`$np_mysql_config --cflags`" + # On Solaris, cflags may contain -xstrconst, which is not acceptable to the + # gcc compiler. In this case, use the include flags as the cflags + echo $np_mysql_cflags | grep -- -xstrconst > /dev/null 2> /dev/null + if test $? -eq 0 -a "$CC" = "gcc" ; then + np_mysql_cflags="`$np_mysql_config --include`" + fi dnl Test a mysql_init. Some systems have mysql_config, but no headers _savedcppflags="$CPPFLAGS" -- cgit v1.2.3