Bug 547637 – unconditional #include of sys/statfs.h in configure impedes

2008-08-13  Matthias Clasen  <mclasen@redhat.com>

        Bug 547637 – unconditional #include of sys/statfs.h in configure
        impedes detection of statfs things if non-existant

        * configure.in: Protect the statfs.h include by guards.

svn path=/trunk/; revision=7352

diff --git a/ChangeLog b/ChangeLog
index d2312f3..0c9f0bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 547637 – unconditional #include of sys/statfs.h in configure
+       impedes detection of statfs things if non-existant
+
+       * configure.in: Protect the statfs.h include by guards.
+

 2008-08-12  Federico Mena Quintero  <federico@novell.com>
 
        * glib/gi18n-lib.h: In the #error about having to define
 2008-08-12  Federico Mena Quintero  <federico@novell.com>
 
        * glib/gi18n-lib.h: In the #error about having to define

diff --git a/configure.in b/configure.in
index eb4bc46..a2a43e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -858,7 +858,9 @@ AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct
 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

+#ifdef HAVE_SYS_STATFS_H

 #include <sys/statfs.h>
 #include <sys/statfs.h>

+#endif

 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif