X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Ffstypename.m4;h=7ff33e20a2b10a20733101c63d024f03c96cf66c;hb=c4f00b7d32160f83e4fb811c6584e8f4e48dfa2e;hp=b0166c161d8d609f73fae890670b2e960bc0da0e;hpb=27739d8615df56dcc22fe232760783aeb6d0e6e5;p=gnulib.git

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index b0166c161..7ff33e20a 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 5
 
 dnl From Jim Meyering.
 dnl
@@ -6,13 +6,19 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
 dnl
 
-AC_DEFUN(jm_FSTYPENAME,
+# Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FSTYPENAME],
   [
     AC_CACHE_CHECK([for f_fstypename in struct statfs],
 		   fu_cv_sys_f_fstypename_in_statfs,
       [
 	AC_TRY_COMPILE(
 	  [
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 	  ],
@@ -24,18 +30,8 @@ AC_DEFUN(jm_FSTYPENAME,
     )
 
     if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
-      if test x = y; then
-	# This code is deliberately never run via ./configure.
-	# FIXME: this is a hack to make autoheader put the corresponding
-	# HAVE_* undef for this symbol in config.h.in.  This saves me the
-	# trouble of having to maintain the #undef in acconfig.h manually.
-	AC_CHECK_FUNCS(F_FSTYPENAME_IN_STATFS)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_F_FSTYPENAME_IN_STATFS
-      AC_DEFINE_UNQUOTED($ac_kludge)
+      AC_DEFINE(HAVE_F_FSTYPENAME_IN_STATFS, 1,
+		[Define if struct statfs has the f_fstypename member.])
     fi
   ]
 )