Specify additional includes when testing for ext2fs/ext2fs.h.

* gnome-undelfs.m4 (GNOME_UNDELFS_CHECKS): Specify additional
includes when testing for ext2fs/ext2fs.h.

svn path=/trunk/; revision=1945

diff --git a/macros/ChangeLog b/macros/ChangeLog
index dbd00dc..438a302 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-20  Pavel Roskin  <proski@gnu.org>
 
+       * gnome-undelfs.m4 (GNOME_UNDELFS_CHECKS): Specify additional
+       includes when testing for ext2fs/ext2fs.h.
+
        * gnome-vfs.m4 (GNOME_WITH_VFS): Specify additional includes
        when testing for rpc/pmap_clnt.h.  Needed for Autoconf 2.50+
        only - older versions don't try to compile headers and ignore

diff --git a/macros/gnome-undelfs.m4 b/macros/gnome-undelfs.m4
index c8ea6f4..fe031cd 100644 (file)
--- a/macros/gnome-undelfs.m4
+++ b/macros/gnome-undelfs.m4
@@ -5,12 +5,14 @@ dnl    "no" otherwise.  May define USE_EXT2FSLIB for cpp.
 dnl    Will set EXT2FS_UNDEL_LIBS to required libraries.
 
 AC_DEFUN([GNOME_UNDELFS_CHECKS], [
-  AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h)
   ext2fs_undel=no
   EXT2FS_UNDEL_LIBS=
-  if test x$ac_cv_header_ext2fs_ext2fs_h = xyes
+  AC_CHECK_HEADERS(linux/ext2_fs.h)
+  if test x$ac_cv_header_linux_ext2_fs_h = xyes
   then
-    if test x$ac_cv_header_linux_ext2_fs_h = xyes
+    AC_CHECK_HEADERS(ext2fs/ext2fs.h, , , [#include <stdio.h>
+#include <linux/ext2_fs.h>])
+    if test x$ac_cv_header_ext2fs_ext2fs_h = xyes
     then
       AC_DEFINE(USE_EXT2FSLIB)
       ext2fs_undel=yes