diff --git a/cf/check-netinet-ip-and-tcp.m4 b/cf/check-netinet-ip-and-tcp.m4
index 482334285..657f86f8c 100644
--- a/cf/check-netinet-ip-and-tcp.m4
+++ b/cf/check-netinet-ip-and-tcp.m4
@@ -12,8 +12,7 @@ for i in netinet/ip.h netinet/tcp.h; do
 
 cv=`echo "$i" | sed 'y%./+-%__p_%'`
 
-AC_MSG_CHECKING([for $i])
-AC_CACHE_VAL([ac_cv_header_$cv],
+AC_CACHE_CHECK([for $i],ac_cv_header_$cv,
 [AC_TRY_CPP([\
 #ifdef HAVE_STANDARDS_H
 #include <standards.h>
@@ -22,17 +21,13 @@ AC_CACHE_VAL([ac_cv_header_$cv],
 ],
 eval "ac_cv_header_$cv=yes",
 eval "ac_cv_header_$cv=no")])
-AC_MSG_RESULT(`eval echo \\$ac_cv_header_$cv`)
-changequote(, )dnl
-if test `eval echo \\$ac_cv_header_$cv` = yes; then
-  ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-changequote([, ])dnl
-  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1)
+ac_res=`eval echo \\$ac_cv_header_$cv`
+if test "$ac_res" = yes; then
+	ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+	AC_DEFINE_UNQUOTED($ac_tr_hdr, 1)
 fi
 done
-dnl autoheader tricks *sigh*
-: << END
-@@@headers="$headers netinet/ip.h netinet/tcp.h"@@@
-END
-
+if false;then
+	AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h)
+fi
 ])