From: Olaf Faaland <faaland1@llnl.gov>
Date: Mon, 6 May 2019 18:38:37 +0000 (-0700)
Subject: LU-11946 build: no yaml check during configure --enable-dist
X-Git-Tag: 2.12.3-RC1~175
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F35088%2F3;p=fs%2Flustre-release.git

LU-11946 build: no yaml check during configure --enable-dist

If the yaml libraries are not found, the error is fatal, and prevents
the sources from being packaged.

This check is unnecessary when sources are being packaged, so this patch
disables the test when configure is run with --enable-dist.

Lustre-change: https://review.whamcloud.com/34812
Lustre-commit: 748ede308d0eb2bb2762cae9c45978808e20a735

Change-Id: I160e0d54efc59480d2f830607467dbc9f34c9de3
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35088
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 1a49733..d4d632d 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -81,10 +81,12 @@ AS_IF([test "x$enable_backoff" = xyes], [
 # fail to build if libyaml is not installed
 #
 AC_DEFUN([LN_CONFIG_DLC], [
-	AC_CHECK_LIB([yaml], [yaml_parser_initialize],
-		     [LIBYAML="libyaml"],
-		     [AC_MSG_ERROR([YAML development libraries not not installed])],
-		     [-lm])
+	AS_IF([test "x$enable_dist" = xno], [
+		AC_CHECK_LIB([yaml], [yaml_parser_initialize],
+			     [LIBYAML="libyaml"],
+			     [AC_MSG_ERROR([YAML development libraries not not installed])],
+			     [-lm])
+	])
 ])
 
 #