.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 08bae80056ada41acc572c2efced1ee0c38d064e..314cf65e64e508f58ea484d0a32aa45108fac27e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -62,10 +62,12 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-DF_PROG = @DF_PROG@
 GENCAT = @GENCAT@
+GETHOSTBYNAME_LIB = @GETHOSTBYNAME_LIB@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
@@ -73,16 +75,24 @@ INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
+KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
+MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MVDIR_PROG = @MVDIR_PROG@
+NEED_SETGID = @NEED_SETGID@
+OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
+OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SEQ_LIBM = @SEQ_LIBM@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
new file mode 100644 (file)
index 0000000..b0166c1
--- /dev/null
+++ b/m4/fstypename.m4
@@ -0,0 +1,41 @@
+#serial 1
+
+dnl From Jim Meyering.
+dnl
+dnl See if struct statfs has the f_fstypename member.
+dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
+dnl
+
+AC_DEFUN(jm_FSTYPENAME,
+  [
+    AC_CACHE_CHECK([for f_fstypename in struct statfs],
+                  fu_cv_sys_f_fstypename_in_statfs,
+      [
+       AC_TRY_COMPILE(
+         [
+#include <sys/types.h>
+#include <sys/mount.h>
+         ],
+         [struct statfs s; int i = sizeof s.f_fstypename;],
+         fu_cv_sys_f_fstypename_in_statfs=yes,
+         fu_cv_sys_f_fstypename_in_statfs=no
+       )
+      ]
+    )
+
+    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)
+    fi
+  ]
+)