Changeset 474 for trunk/aclocal.m4

Timestamp:

May 30, 2015, 7:57:16 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #372 (Replace obsolete smatch by clang in test suite).

File:

• trunk/aclocal.m4 (modified) (2 diffs)

trunk/aclocal.m4

@@ -1224 +1224 @@
 ])
 
+AC_DEFUN([GCC_FLAG_CHECK],[
+  AC_LANG_ASSERT(C)
+  if test "X$CC" != "X"; then
+     AC_MSG_CHECKING([whether ${CC} accepts $1])
+dnl      flag_check_cv,
+     saved_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -Werror $1"
+     AC_TRY_COMPILE(,, flag_check_cv=yes, flag_check_cv=no)
+     CFLAGS="$saved_cflags"
+
+     if test $flag_check_cv = yes; then
+        CFLAGS="$CFLAGS $1"
+        AC_MSG_RESULT([yes])
+     else
+        AC_MSG_RESULT([no])
+     fi
+  fi
+])
+
 AC_DEFUN([GCC_WEMPTY_BODY],[
   AC_LANG_ASSERT(C)
   if test "X$CC" != "X"; then
-    AC_CACHE_CHECK([whether ${CC} accepts -Wno-empty-body],
-      empty_cv_body,
+    AC_CHECK([whether ${CC} accepts -Wno-empty-body],
+dnl      empty_cv_body,
       [empty_body_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -Wno-empty-body"
+       CFLAGS="$CFLAGS -Werror -Wno-empty-body"
        AC_TRY_COMPILE(,, empty_cv_body=yes, empty_cv_body=no)
        CFLAGS="$empty_body_cflags"
@@ -1380 +1399 @@
   #
   if test "x$GCC" = xyes; then
-     case "$host_os" in
-        *linux*)
-        SAMHAIN_X86_64
-        ;;
-        *bsd*)
-        SAMHAIN_X86_64
-        ;;
-        *)
-        SAMHAIN_X86_64
-        ;;
-      esac      
+     $CC -E -dM - < /dev/null | egrep '__clang__' >/dev/null 2>&1 
+     if ! test $? = 0; then
+         case "$host_os" in
+             *linux*)
+             SAMHAIN_X86_64
+             ;;
+             *bsd*)
+             SAMHAIN_X86_64
+             ;;
+             *)
+             SAMHAIN_X86_64
+             ;;
+         esac
+     fi 
   fi
 fi