Whamcloud - gitweb
LU-16382 config: ensure lutf.sh is included in dist 99/53299/4
authorMr NeilBrown <neilb@suse.de>
Thu, 21 Mar 2024 19:39:11 +0000 (12:39 -0700)
committerOleg Drokin <green@whamcloud.com>
Sat, 4 May 2024 03:02:00 +0000 (03:02 +0000)
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"

Lustre-change: https://review.whamcloud.com/49382
Lustre-commit: b486347abdb2f0c12f01deb5424c41a532c952a8

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: If5f856985a6d642822baba4b6ee301c04f851217
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53299
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Timothy Day <timday@amazon.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
config/lustre-build.m4

index a81ce27..3d80397 100644 (file)
@@ -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])