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)

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