From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Sep 2010 22:53:41 +0000 (+0200)
Subject: 	* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
X-Git-Tag: 1.99~608
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61d720e53536d3c6bb57b26e427bc11d2dbf9e4f;p=thirdparty%2Fgrub.git

	* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
	echo if libdevmapper will be used.
---

diff --git a/ChangeLog b/ChangeLog
index 6587cf6b6..e0249e4ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
+	echo if libdevmapper will be used.
+
 2010-09-02  Ian Turner  <Ian.Turner@deshaw.com>
 
 	* grub-core/fs/i386/pc/pxe.c (grub_pxefs_read): Keep the blocksize
diff --git a/configure.ac b/configure.ac
index 9fa460620..d71d94522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -822,12 +822,23 @@ fi
 
 if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
-  AC_CHECK_LIB([devmapper], [dm_task_create],
-               [LIBDEVMAPPER="-ldevmapper"
-                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
-                          [Define to 1 if you have the devmapper library.])],
+  AC_CHECK_LIB([devmapper], [dm_task_create], [],
                [device_mapper_excuse="need devmapper library"])
 fi
+
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper library.
+  AC_CHECK_LIB([devmapper], [dm_log_with_errno_init],
+               [],
+               [device_mapper_excuse="need devmapper library"])
+fi
+
+if test x"$device_mapper_excuse" = x ; then
+   LIBDEVMAPPER="-ldevmapper";
+   AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+             [Define to 1 if you have the devmapper library.])
+fi
+
 AC_SUBST([LIBDEVMAPPER])
 
 AC_CHECK_LIB([zfs], [libzfs_init],
@@ -942,6 +953,11 @@ else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
 fi
+if test x"$device_mapper_excuse" = x ; then
+echo With devmapper support: Yes
+else
+echo With devmapper support: No "($device_mapper_excuse)"
+fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
 else