Use the new 3-arg form of AC_DEFINE instead of my gross kludge.

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index 87569f8d36927fbf418f9aeadb52904b70f9d4be..70abc12b38a8a11ec6e49c7f8c7699b66e54f24f 100644 (file)
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 dnl From Jim Meyering.
 dnl
@@ -25,18 +25,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_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1,
+                        [Define if struct statfs has the f_fstypename member.])
     fi
   ]
 )