diff -ur cyrus-imapd-2.3.8.orig/cmulocal/c-attribute.m4 cyrus-imapd-2.3.8/cmulocal/c-attribute.m4
--- cyrus-imapd-2.3.8.orig/cmulocal/c-attribute.m4	2003-10-08 16:35:24.000000000 -0400
+++ cyrus-imapd-2.3.8/cmulocal/c-attribute.m4	2007-04-24 22:09:39.000000000 -0400
@@ -11,8 +11,6 @@
 AC_CACHE_VAL(ac_cv___attribute__, [
 AC_TRY_COMPILE([
 #include <stdlib.h>
-],
-[
 static void foo(void) __attribute__ ((noreturn));
 
 static void
@@ -21,6 +19,8 @@
   exit(1);
 }
 ],
+[
+],
 ac_cv___attribute__=yes,
 ac_cv___attribute__=no)])
 if test "$ac_cv___attribute__" = "yes"; then
diff -ur cyrus-imapd-2.3.8.orig/cmulocal/c-fpic.m4 cyrus-imapd-2.3.8/cmulocal/c-fpic.m4
--- cyrus-imapd-2.3.8.orig/cmulocal/c-fpic.m4	2003-10-08 16:35:24.000000000 -0400
+++ cyrus-imapd-2.3.8/cmulocal/c-fpic.m4	2007-04-24 22:09:55.000000000 -0400
@@ -13,14 +13,14 @@
 CFLAGS="${CFLAGS} -fPIC"
 AC_TRY_COMPILE([
 #include <stdlib.h>
-],
-[
 static void
 foo(void)
 {
   exit(1);
 }
 ],
+[
+],
 ac_cv_fpic=yes,
 ac_cv_fpic=no)
 CFLAGS=$save_CFLAGS