Merge lp:~stewart/pandora-build/fix-have-libmysqlclient into lp:pandora-build

[Stewart Smith]

I needed to fix pandora_have_libmysqlclient.m4 for percona-playback, here's the fix.

=== modified file 'm4/pandora_have_libmysqlclient.m4'
--- m4/pandora_have_libmysqlclient.m4	2010-01-24 05:35:33 +0000
+++ m4/pandora_have_libmysqlclient.m4	2011-09-29 06:42:11 +0000
@@ -60,7 +60,23 @@
   ])
 
   AM_CONDITIONAL(HAVE_LIBMYSQLCLIENT, [test "x${ac_cv_libmysqlclient_r}" = "xyes"])
-  
+
+  AS_IF([test "x$MYSQL_CONFIG" = "xISDIR"],[
+    IBASE="-I${with_mysql}"
+    MYSQL_CONFIG="${with_mysql}/scripts/mysql_config"
+    ADDIFLAGS="$IBASE/include -isystem $IBASE/include"
+    ADDLDFLAGS="-L${with_mysql}/libmysql_r/.libs/ -L${with_mysql}/mysys/.libs -L${with_mysql}/mysys -L${with_mysql}/strings/.libs -L${with_mysql}/strings "
+  ],[
+    MYSQL_INCLUDES=$(${MYSQL_CONFIG} --include)
+    MYSQL_INCLUDES="$MYSQL_INCLUDES $(echo $MYSQL_INCLUDES|sed -e 's/-I/-isystem /')"
+    MYSQL_LIBS=$(${MYSQL_CONFIG} --libs_r)
+  ])
+
+    AC_SUBST(MYSQL_CONFIG)
+    AC_SUBST(MYSQL_INCLUDES)
+    AC_SUBST(MYSQL_LIBS)
+])
+
 AC_DEFUN([PANDORA_HAVE_LIBMYSQLCLIENT],[
   AC_REQUIRE([_PANDORA_SEARCH_LIBMYSQLCLIENT])
 ])
@@ -71,76 +87,3 @@
       AC_MSG_ERROR([libmysqlclient_r is required for ${PACKAGE}]))
 ])
 
-  AS_IF([test "x$MYSQL_CONFIG" = "xISDIR"],[
-    IBASE="-I${with_mysql}"
-    MYSQL_CONFIG="${with_mysql}/scripts/mysql_config"
-    ADDIFLAGS="$IBASE/include "
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/ndbapi "
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include/mgmapi "
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/include "
-    LDFLAGS="-L${with_mysql}/storage/ndb/src/.libs -L${with_mysql}/libmysql_r/.libs/ -L${with_mysql}/mysys/.libs -L${with_mysql}/mysys -L${with_mysql}/strings/.libs -L${with_mysql}/strings "
-  ],[
-    IBASE=`$MYSQL_CONFIG --include`
-    ADDIFLAGS=""
-    # add regular MySQL C flags
-    ADDCFLAGS=`$MYSQL_CONFIG --cflags` 
-    # add NdbAPI specific C flags
-    LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r | sed 's/-lmysqlclient_r//'`
-    ])
-
-
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb"
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/ndbapi"
-    ADDIFLAGS="$ADDIFLAGS $IBASE/storage/ndb/mgmapi"
-    ADDIFLAGS="$ADDIFLAGS $IBASE/ndb"
-    ADDIFLAGS="$ADDIFLAGS $IBASE/ndb/ndbapi"
-    ADDIFLAGS="$ADDIFLAGS $IBASE/ndb/mgmapi"
-    ADDIFLAGS="$ADDIFLAGS $IBASE"
-
-    CFLAGS="$CFLAGS $ADDCFLAGS $ADDIFLAGS"    
-    CXXFLAGS="$CXXFLAGS $ADDCFLAGS $ADDIFLAGS" 
-    MYSQL_INCLUDES="$IBASE $ADDIFLAGS"   
-
-    
-    dnl AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[AC_MSG_ERROR([Can't link against libmysqlclient_r])])
-    dnl First test to see if we can run with only ndbclient
-    AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[dnl else
-      LDFLAGS="$LDFLAGS -lmysys -ldbug"
-      AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,)
-      AC_CHECK_LIB([ndbclient],[ndb_init],,[
-        AC_MSG_ERROR([Can't link against libndbclient])])
-      AC_CHECK_LIB([mystrings],[decimal_bin_size],,[
-          AC_MSG_ERROR([Can't find decimal_bin_size])])])
-    AC_MSG_CHECKING(for NdbApi headers)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <NdbApi.hpp>]], [[int attr=NdbTransaction::Commit; ]])],[ndbapi_found="yes"],[])
-    AS_IF([test "$ndbapi_found" = "yes"], 
-       [AC_MSG_RESULT(found)],
-       [AC_MSG_ERROR([Couldn't find NdbApi.hpp!])])
-    AC_MSG_CHECKING(for NDB_LE_ThreadConfigLoop)
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mgmapi.h>]], [[int attr=NDB_LE_ThreadConfigLoop; ]])],[have_cge63="yes"],[])
-      AS_IF([test "$have_cge63" = "yes"],
-        [AC_MSG_RESULT(found)
-         HAVE_CGE63="-DCGE63"
-         AC_SUBST(HAVE_CGE63)],
-        [AC_MSG_RESULT(missing)])
-
-    LDFLAGS="$LDFLAGS $LIBS"
-  
-
-    MYSQL_MAJOR_VERSION=`$MYSQL_CONFIG --version | sed -e 's/\.//g' -e 's/-//g' -e 's/[A-Za-z]//g' | cut -c1-2`
-
-    case "$MYSQL_MAJOR_VERSION" in 
-      50) AC_DEFINE(MYSQL_50, [1], [mysql5.0])
-	;;
-      51) AC_DEFINE(MYSQL_51, [1], [mysql5.1])
-        ;;
-      *) echo "Unsupported version of MySQL Detected!"
-        ;;
-     esac
-    
-    AC_SUBST(MYSQL_MAJOR_VERSION)
-    AC_SUBST(MYSQL_CONFIG)
-    
-  
-])
-