X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fcf%2Flinux-test1.m4;h=fb5e061b6e7a6a5ca87df6c739767d01880c88c8;hp=65457170bfd15df7404a86c8bcf18d21e1907478;hb=a89d6b029d059d01b8bbfc18b9ee6e3f5a964b85;hpb=02f2c7cb3734d44dc90b77d631909373daefacd3

diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4
index 6545717..fb5e061 100644
--- a/src/cf/linux-test1.m4
+++ b/src/cf/linux-test1.m4
@@ -85,19 +85,25 @@ AC_DEFUN([LINUX_KBUILD_USES_EXTRA_CFLAGS], [
     CPPFLAGS="$save_CPPFLAGS"
     AC_MSG_RESULT($ac_linux_kbuild_requires_extra_cflags)])
 
+dnl AC_CHECK_LINUX_BUILD([msg], [var], [includes], [code], [define])
+AC_DEFUN([AC_CHECK_LINUX_BUILD],
+ [AS_VAR_PUSHDEF([ac_linux_build], [$2])dnl
+  AC_CACHE_CHECK([$1], [ac_linux_build],
+   [AC_TRY_KBUILD([$3], [$4],
+		  AS_VAR_SET([ac_linux_build], [yes]),
+		  AS_VAR_SET([ac_linux_build], [no]))
+   ])
+  AS_IF([test AS_VAR_GET([ac_linux_build]) = yes],
+        [AC_DEFINE([$5],1,[$6])])
+ ])
+
 dnl AC_CHECK_LINUX_HEADER(header)
 AC_DEFUN([AC_CHECK_LINUX_HEADER],
- [AS_VAR_PUSHDEF([ac_linux_header], [ac_cv_linux_header_$1])dnl
-  AC_CACHE_CHECK([for linux/$1], [ac_linux_header],
-   [AC_TRY_KBUILD([#include <linux/$1>],
-		  [return;],
-		  AS_VAR_SET([ac_linux_header], [yes]),
-		  AS_VAR_SET([ac_linux_header], [no]))
-   ])
-  AS_IF([test AS_VAR_GET([ac_linux_header]) = yes],
-        [AC_DEFINE(AS_TR_CPP(HAVE_LINUX_$1),
-		  1,
-		  [Define if your kernel has linux/$1])])
+ [AC_CHECK_LINUX_BUILD([for linux/$1], [ac_cv_linux_header_$1],
+		       [#include <linux/$1>],
+		       [return;],
+		       AS_TR_CPP(HAVE_LINUX_$1),
+		       [Define if your kernel has linux/$1])
  ])
 
 dnl AC_CHECK_LINUX_FUNC([function], [includes], [code])
@@ -118,15 +124,11 @@ AC_DEFUN([AC_CHECK_LINUX_FUNC],
 
 dnl AC_CHECK_LINUX_STRUCT([structure], [element], [includes])
 AC_DEFUN([AC_CHECK_LINUX_STRUCT],
- [AS_VAR_PUSHDEF([ac_linux_struct], [ac_cv_linux_struct_$1_has_$2])dnl
-  AC_CACHE_CHECK([for $2 in struct $1], [ac_linux_struct],
-   [AC_TRY_KBUILD([#include <linux/$3>],
-		  [struct $1 _test; printk("%x\n", &_test.$2); ],
-		  AS_VAR_SET([ac_linux_struct], [yes]),
-		  AS_VAR_SET([ac_linux_struct], [no]))
-   ])
-  AS_IF([test AS_VAR_GET([ac_linux_struct]) = yes],
-	[AC_DEFINE(AS_TR_CPP(STRUCT_$1_HAS_$2), 1,
-		   [Define if kernel struct $1 has the $2 element])])
+ [AC_CHECK_LINUX_BUILD([for $2 in struct $1],
+		       [ac_cv_linux_struct_$1_has_$2],
+		       [#include <linux/$3>],
+		       [struct $1 _test; printk("%x\n", &_test.$2); ],
+		       AS_TR_CPP(STRUCT_$1_HAS_$2),
+		       [Define if kernel struct $1 has the $2 element])
  ])