From: Mr NeilBrown <neilb@suse.de>
Date: Tue, 13 Dec 2022 00:59:26 +0000 (+1100)
Subject: LU-16382 config: ensure lutf.sh is included in dist
X-Git-Tag: 2.15.54~105
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b486347abdb2f0c12f01deb5424c41a532c952a8;p=fs%2Flustre-release.git

LU-16382 config: ensure lutf.sh is included in dist

The official 2.15.1 source distribution does not contain
lutf.sh.  As lustre.spec lists it (when LUTF is enabled) this causes a
build error.

It is likely not included because "./configure --enable-dist" was run
in a context where swig was not installed.

So when determining whether to enable lutf, first check for
enable_dist and in the case for enable_lutf="yes"

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: If5f856985a6d642822baba4b6ee301c04f851217
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49382
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Cyril Bordage <cbordage@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index afe606e..84e73e4 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -225,11 +225,15 @@ AC_ARG_ENABLE([tests],
 # Check to see if we can build the lutf
 #
 AX_PYTHON_DEVEL()
-AS_IF([test "x$PYTHON_VERSION_CHECK" = xno], [
-	enable_lutf="no"
+AS_IF([test "x$enable_dist" != xno], [
+	enable_lutf="yes"
 ], [
+  AS_IF([test "x$PYTHON_VERSION_CHECK" = xno], [
+	enable_lutf="no"
+  ], [
 	AX_PKG_SWIG(2.0, [ enable_lutf="yes" ],
 			 [ enable_lutf="no" ])
+  ])
 ])
 
 AC_MSG_RESULT([$enable_tests])