=== modified file 'ChangeLog'
--- ChangeLog	2011-01-06 13:24:38 +0000
+++ ChangeLog	2011-01-06 21:27:31 +0000
@@ -1,3 +1,7 @@
+2011-01-06  Grégoire Sutre  <address@hidden>
+
+	* configure.ac: Check for libdevmapper header.
+
 2011-01-06  Colin Watson  <address@hidden>
 
 	* tests/util/grub-shell.in: Set serial terminfo type to `dumb', to

=== modified file 'configure.ac'
--- configure.ac	2010-11-16 15:50:20 +0000
+++ configure.ac	2011-01-06 21:31:21 +0000
@@ -867,6 +867,12 @@ if test x"$enable_device_mapper" = xno ;
 fi
 
 if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper header.
+  AC_CHECK_HEADER([libdevmapper.h], [],
+               [device_mapper_excuse="need libdevmapper header"])
+fi
+
+if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
   AC_CHECK_LIB([devmapper], [dm_task_create], [],
                [device_mapper_excuse="need devmapper library"])