From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 26 Mar 2016 18:31:34 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~26
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ae5cca244ff291c17df1cc36e28f19376958a2eb

Merge branch 'collectd-5.4' into collectd-5.5
---

ae5cca244ff291c17df1cc36e28f19376958a2eb
diff --cc configure.ac
index dc9d324f,5e4c309a..72cdb5c9
--- a/configure.ac
+++ b/configure.ac
@@@ -611,7 -601,28 +611,30 @@@ AC_CHECK_HEADERS(linux/un.h, [], []
  #endif
  ])
  
- AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
+ AC_CHECK_HEADERS([ \
+   ctype.h \
+   fs_info.h \
+   fshelp.h \
+   grp.h \
+   kvm.h \
+   limits.h \
++  locale.h \
+   mntent.h \
+   mnttab.h \
+   paths.h \
+   pwd.h \
+   sys/fs_types.h \
+   sys/fstyp.h \
+   sys/mntent.h \
+   sys/mnttab.h \
+   sys/statfs.h \
+   sys/statvfs.h \
+   sys/un.h \
+   sys/vfs.h \
+   sys/vfstab.h \
++  sys/vmmeter.h \
+   wordexp.h \
+ ])
  
  AC_CHECK_HEADERS([xfs/xqm.h], [], [],
  [