Check also <ntfs/*> include files when checking 'libntfs' availability.

diff --git a/configure.in b/configure.in
index c6f56a0..91e4b3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -378,13 +378,22 @@ GLADE_W_INIT([
                AC_CHECK_LIB(ntfs,ntfs_mount,[
                        LIBNTFS_LIBS="-lntfs"
 
-                       captive_save_CPPFLAGS="$CPPFLAGS"
-                       CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
-                       AC_CHECK_HEADERS(libxml/xmlreader.h,
-                               [ glade_addon=yes ],
-                               [ AC_MSG_WARN([Captive requires libxml >= 2.4.29 for --enable-install-pkg.]) ])
-                       CPPFLAGS="$captive_save_CPPFLAGS"
-                       ])
+                       have_libntfs_includes=true
+                       AC_CHECK_HEADERS
+                       AC_CHECK_HEADERS(ntfs/types.h ntfs/volume.h,,[ have_libntfs_includes=false ])
+                       if $have_libntfs_includes;then
+
+                               captive_save_CPPFLAGS="$CPPFLAGS"
+                               CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
+                               AC_CHECK_HEADERS(libxml/xmlreader.h,
+                                       [ glade_addon=yes ],
+                                       [ AC_MSG_WARN([Captive requires libxml >= 2.4.29 for --enable-install-pkg.]) ])
+                               CPPFLAGS="$captive_save_CPPFLAGS"
+
+                       else
+                               AC_MSG_WARN([Captive requires ntfs/* include files (of ntfsprogs-devel) for --enable-install-pkg.])
+                       fi
+                       ],[ AC_MSG_WARN([Captive requires libntfs (of ntfsprogs-devel) for --enable-install-pkg.]) ])
                ])
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)