diff options
author | Timothy Smith <timothy.smith@sun.com> | 2009-11-04 16:06:49 -0700 |
---|---|---|
committer | Timothy Smith <timothy.smith@sun.com> | 2009-11-04 16:06:49 -0700 |
commit | 377c1dc5843e8cbee0876e86753281e1fa815eca (patch) | |
tree | 6e4420e2264684778b0c53c82ad88080ff01bacc /config | |
parent | 9a95a85c395068db91a99646eeaaaded5e108f51 (diff) | |
parent | 6d79f4a1e1b8b08ee6d1718a9515b692b5375fb2 (diff) | |
download | mariadb-git-377c1dc5843e8cbee0876e86753281e1fa815eca.tar.gz |
auto-merge
Diffstat (limited to 'config')
-rw-r--r-- | config/ac-macros/misc.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 9e575862848..7c829ed303a 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -726,15 +726,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 |