Index: /trunk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4	(revision 46)
+++ /trunk/aclocal.m4	(revision 47)
@@ -1195,9 +1195,11 @@
 	#
 	if test "x$GCC" = xyes; then
-	  AC_MSG_CHECKING([for i386])
+	  AC_MSG_CHECKING([for non-apple i386])
 	  samhain_i386=no
-	  touch conf_foo.h 
-	  $CC -E -dM conf_foo.h | egrep '__i386__' >/dev/null 2>&1 && samhain_i386=yes
-	  rm -f conf_foo.h
+          $CC -E -dM - < /dev/null | egrep '__i386__' >/dev/null 2>&1 
+          if test $? = 0; then
+            # apples gcc does not understand the assembly we provide
+            $CC -E -dM - < /dev/null | egrep '__APPLE__' >/dev/null 2>&1 || samhain_i386=yes
+          fi
 	  if test "x$samhain_i386" = xyes; then
 	    tiger_src=sh_tiger1.s
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 46)
+++ /trunk/configure.ac	(revision 47)
@@ -13,5 +13,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.2.1)
+AM_INIT_AUTOMAKE(samhain, 2.2.1a)
 AC_CANONICAL_HOST
 
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 46)
+++ /trunk/docs/Changelog	(revision 47)
@@ -1,2 +1,5 @@
+2.2.1a:
+	* fix compile error on i686/MacOS X (reported by Andreas Neth)
+
 2.2.1:
 	* fix gcc 4 warnings and build failure on x86_64 (debian bug #370808)
@@ -18,5 +21,5 @@
 	* fix concurrent inserts with postgres in sh_database.c
 	* code cleanup
-	* fix manual version in spec file, noticed by Imre Gergely
+	* fix manual version in spec file, first noticed by Imre Gergely
 	
 2.2.0: