Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -181,17 +181,21 @@
 	AC_CHECK_FUNC(objc_sync_enter,, [
 		AC_SUBST(OBJC_SYNC_M, "objc_sync.m")
 		AC_DEFINE(NEED_OBJC_SYNC_INIT, 1,
 			[Whether objc_sync_init needs to be called])])
 
+	atomic_ops="none"
+
+	AC_MSG_CHECKING(whether __sync_* works)
 	AC_TRY_LINK([#include <stdint.h>], [
 		int32_t i, j;
 		if (__sync_add_and_fetch(&i, 1))
 			j = __sync_sub_and_fetch(&i, 1);
 		while (!__sync_bool_compare_and_swap(&i, 0, 1));
 		], [
-		have_gcc_atomic_ops="yes"
+		AC_MSG_RESULT(yes)
+		atomic_ops="gcc builtins"
 		AC_DEFINE(OF_HAVE_GCC_ATOMIC_OPS, 1,
 			[Whether gcc atomic operations are available])
 		], [
 		old_OBJCFLAGS="$OBJCFLAGS"
 		OBJCFLAGS="$OBJCFLAGS -march=i486"
@@ -199,38 +203,34 @@
 			int32_t i, j;
 			if (__sync_add_and_fetch(&i, 1))
 				j = __sync_sub_and_fetch(&i, 1);
 			while (!__sync_bool_compare_and_swap(&i, 0, 1));
 			], [
-			have_gcc_atomic_ops="yes"
+			AC_MSG_RESULT(yes, with -march=i486)
+			atomic_ops="gcc builtins (with -march=i486)"
 			AC_DEFINE(OF_HAVE_GCC_ATOMIC_OPS, 1,
 				[Whether gcc atomic operations are available])
 			], [
-			have_gcc_atomic_ops="no"
+			AC_MSG_RESULT(no)
 			OBJCFLAGS="$old_OBJCFLAGS"])])
 
-	if test x"$have_gcc_atomic_ops" != x"yes"; then
+	if test x"$atomic_ops" = x"none"; then
 		AC_CHECK_HEADER(libkern/OSAtomic.h, [
-			have_libkern_osatomic_h="yes"
+			atomic_ops="libkern/OSAtomic.h"
 			AC_DEFINE(OF_HAVE_LIBKERN_OSATOMIC_H, 1,
 				[Whether we have libkern/OSAtomic.h])])
 	fi
-
-	AC_MSG_CHECKING(for atomic operations)
-	if test x"$have_gcc_atomic_ops" = x"yes"; then
-		AC_DEFINE(OF_ATOMIC_OPS, 1, [Whether we have atomic operations])
-		AC_MSG_RESULT(gcc builtins)
-	elif test x"$have_libkern_osatomic_h" = x"yes"; then
-		AC_DEFINE(OF_ATOMIC_OPS, 1, [Whether we have atomic operations])
-		AC_MSG_RESULT(libkern/OSAtomic.h)
-	else
-		AC_MSG_RESULT(none)
-	fi
-else
-	dnl We can only have one thread - therefore everything is atomic
-	AC_DEFINE(OF_ATOMIC_OPS, 1, [Whether we have atomic operations])
-fi
+else
+	dnl We can only have one thread - therefore everything is atomic
+	atomic_ops="not needed"
+fi
+
+AC_MSG_CHECKING(for atomic operations)
+if test x"$atomic_ops" != x"none"; then
+	AC_DEFINE(OF_ATOMIC_OPS, 1, [Whether we have atomic operations])
+fi
+AC_MSG_RESULT($atomic_ops)
 
 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")
 
 AC_MSG_CHECKING(for getaddrinfo)