summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
commit151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch)
tree1972ed60ad937e632cf111e7beafb2148a87efeb /config
parent2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff)
parentb495b3db2346a98650946ad5907ba3fe164eadc7 (diff)
downloadmariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/misc.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 1eec0e9e18c..996ac62e025 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -601,15 +601,15 @@ dnl ---------------------------------------------------------------------------
dnl MYSQL_NEEDS_MYSYS_NEW
AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
-[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,
+[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
[
AC_LANG_PUSH(C++)
AC_TRY_LINK([], [
class A { public: int b; }; A *a=new A; a->b=10; delete a;
-], mysql_use_mysys_new=no, mysql_use_mysys_new=yes)
+], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes)
AC_LANG_POP(C++)
])
-if test "$mysql_use_mysys_new" = "yes"
+if test "$mysql_cv_use_mysys_new" = "yes"
then
AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])
fi