Index: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	(revision 235)
+++ trunk/aclocal.m4	(revision 236)
@@ -1222,11 +1222,11 @@
   if test "X$CC" != "X"; then
     AC_CACHE_CHECK([whether ${CC} accepts -Wno-empty-body],
-      empty_body,
+      empty_cv_body,
       [empty_body_cflags="$CFLAGS"
        CFLAGS="$CFLAGS -Wno-empty-body"
-       AC_TRY_COMPILE(,, empty_body=yes, empty_body=no)
+       AC_TRY_COMPILE(,, empty_cv_body=yes, empty_cv_body=no)
        CFLAGS="$empty_body_cflags"
       ])
-    if test $empty_body = yes; then
+    if test $empty_cv_body = yes; then
       CFLAGS="$CFLAGS -Wno-empty-body"
     fi