Whamcloud - gitweb
LU-8116 build: Fix libmount configure message 55/20055/3
authorChristopher J. Morrone <morrone2@llnl.gov>
Sat, 7 May 2016 01:53:07 +0000 (18:53 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 22 Jun 2016 02:55:18 +0000 (02:55 +0000)
The configure messages for libmount checking were incorrectly nested resulting
in messages like this:

checking whether build with libmount... checking libmount/libmount.h usability... no
checking libmount/libmount.h presence... no
checking for libmount/libmount.h... no
no

This patch unwinds that mistake.

Change-Id: Iec716d8152880902d3e6961cd1d3b821e37c349a
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/20055
Tested-by: Jenkins
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
config/lustre-build.m4

index 3709185..765c021 100644 (file)
@@ -124,15 +124,20 @@ AC_SUBST(LIBCFS_SUBDIR)
 # We need it to manipulate utab file.
 #
 AC_DEFUN([LB_LIBMOUNT], [
-AC_MSG_CHECKING([whether build with libmount])
 AC_CHECK_HEADER([libmount/libmount.h], [
        AC_CHECK_LIB([mount], [mnt_update_set_fs], [
                LDLIBMOUNT="-lmount"
                AC_SUBST(LDLIBMOUNT)
                AC_DEFINE(HAVE_LIBMOUNT, 1, [build with libmount])
-               AC_MSG_RESULT(yes)
-       ],[AC_MSG_RESULT(no)])
-], [AC_MSG_RESULT(no)])
+               with_libmount="yes"
+       ],[with_libmount="no"])
+], [with_libmount="no"])
+AC_MSG_CHECKING([whether to build with libmount])
+AS_IF([test "x$with_libmount" = xyes], [
+       AC_MSG_RESULT([yes])
+], [
+       AC_MSG_RESULT([no])
+])
 ]) # LB_LIBMOUNT
 
 #