diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
index b2af11295bc..fa793647b1f 100644
--- a/storage/innodb_plugin/plug.in
+++ b/storage/innodb_plugin/plug.in
@@ -139,16 +139,20 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
   )
 
   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-  # either define HAVE_IB_SOLARIS_ATOMICS or not
-  AC_CHECK_FUNCS(atomic_cas_ulong \
-		 atomic_cas_32 \
-		 atomic_cas_64 \
-		 atomic_add_long_nv \
-		 atomic_swap_uchar,
-
-		 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-			   [Define to 1 if 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_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)