Changeset 47

Timestamp:

Jun 16, 2006, 10:47:44 PM (18 years ago)

Author:

rainer

Message:

Fix compile error on i686/MacOS X

Location:

trunk

Files:

• aclocal.m4 (modified) (1 diff)
• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (2 diffs)

trunk/aclocal.m4

@@ -1195 +1195 @@
         #
         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

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.2.1)
+AM_INIT_AUTOMAKE(samhain, 2.2.1a)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ +1 @@
+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 +21 @@
         * 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: