diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-07 16:52:44 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-07 16:52:44 +0200 |
| commit | 8a49f0b13839ea236362df1783dfdc7979aa0d17 (patch) | |
| tree | 83a49a7d2975f2e69b53abacfda81ea1025a41ae /storage/innodb_plugin | |
| parent | 3d27658dae27b99878afc6d1d667eac22e86502a (diff) | |
| download | mariadb-git-8a49f0b13839ea236362df1783dfdc7979aa0d17.tar.gz | |
Followup to vasil.dimov@oracle.com-20110107091222-q23qpb5skev0j9gc
Do not use nested AC_CHECK_FUNC() because they result in:
./configure: line 52688: syntax error: unexpected end of file
(which happens only on some platforms and does not happen on others,
I have no idea what is the reason for this)
Diffstat (limited to 'storage/innodb_plugin')
| -rw-r--r-- | storage/innodb_plugin/plug.in | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in index fa793647b1f..765025149a1 100644 --- a/storage/innodb_plugin/plug.in +++ b/storage/innodb_plugin/plug.in @@ -141,19 +141,22 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ AC_MSG_CHECKING(whether Solaris libc atomic functions are available) # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following # functions are present. - AC_CHECK_FUNC(atomic_add_long_nv, - AC_CHECK_FUNC(atomic_cas_32, - AC_CHECK_FUNC(atomic_cas_64, - AC_CHECK_FUNC(atomic_cas_ulong, - AC_CHECK_FUNC(atomic_swap_uchar, - AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1], - [Define to 1 if Solaris libc atomic functions are available] - ) - ) - ) - ) + AC_CHECK_FUNCS(atomic_add_long_nv \ + atomic_cas_32 \ + atomic_cas_64 \ + atomic_cas_ulong \ + atomic_swap_uchar) + + if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \ + "${ac_cv_func_atomic_cas_32}" = "yes" -a \ + "${ac_cv_func_atomic_cas_64}" = "yes" -a \ + "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \ + "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then + + AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1], + [Define to 1 if Solaris libc atomic functions are available] ) - ) + fi AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not |