diff --git a/cf/ChangeLog b/cf/ChangeLog
index 6b54d19bc..4c02ec7f5 100644
--- a/cf/ChangeLog
+++ b/cf/ChangeLog
@@ -1,3 +1,7 @@
+Fri May  1 23:31:28 1998  Assar Westerlund  <assar@sics.se>
+
+	* c-attribute.m4, c-function.m4: new files (from arla)
+
 Wed Mar 18 23:11:29 1998  Assar Westerlund  <assar@sics.se>
 
 	* krb-ipv6.m4: rename HAVE_STRUCT_SOCKADDR_IN6 to HAVE_IPV6
diff --git a/cf/c-attribute.m4 b/cf/c-attribute.m4
new file mode 100644
index 000000000..cc3dc0c5c
--- /dev/null
+++ b/cf/c-attribute.m4
@@ -0,0 +1,31 @@
+dnl
+dnl $Id$
+dnl
+
+dnl
+dnl Test for __attribute__
+dnl
+
+AC_DEFUN(AC_C___ATTRIBUTE__, [
+AC_MSG_CHECKING(for __attribute__)
+AC_CACHE_VAL(ac_cv___attribute__, [
+AC_TRY_COMPILE([
+#include <stdlib.h>
+],
+[
+static void foo(void) __attribute__ ((noreturn));
+
+static void
+foo(void)
+{
+  exit(1);
+}
+],
+ac_cv___attribute__=yes,
+ac_cv___attribute__=no)])
+if test "$ac_cv___attribute__" = "yes"; then
+  AC_DEFINE(HAVE___ATTRIBUTE__)
+fi
+AC_MSG_RESULT($ac_cv___attribute__)
+])
+
diff --git a/cf/c-function.m4 b/cf/c-function.m4
new file mode 100644
index 000000000..86eb5eb6b
--- /dev/null
+++ b/cf/c-function.m4
@@ -0,0 +1,33 @@
+dnl
+dnl $Id$
+dnl
+
+dnl
+dnl Test for __FUNCTION__
+dnl
+
+AC_DEFUN(AC_C___FUNCTION__, [
+AC_MSG_CHECKING(for __FUNCTION__)
+AC_CACHE_VAL(ac_cv___function__, [
+AC_TRY_RUN([
+#include <string.h>
+
+static char *foo()
+{
+  return __FUNCTION__;
+}
+
+int main()
+{
+  return strcmp(foo(), "foo") != 0;
+}
+],
+ac_cv___function__=yes,
+ac_cv___function__=no,
+ac_cv___function__=no)])
+if test "$ac_cv___function__" = "yes"; then
+  AC_DEFINE(HAVE___FUNCTION__)
+fi
+AC_MSG_RESULT($ac_cv___function__)
+])
+