From 66d626f5e72115a36808980f8a8a2cc78c9611cc Mon Sep 17 00:00:00 2001 From: Olaf Faaland Date: Mon, 6 May 2019 11:31:21 -0700 Subject: [PATCH] LU-11946 build: no zlib check during configure --enable-dist If the zlib 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/34811 Lustre-commit: e9d9a0eeb0ff71b207e9d0095fce16af74f842b6 Change-Id: Ie262b17b63c0edc8e8bfbd0c1a466ec37d05622c Signed-off-by: Olaf Faaland Reviewed-by: Nathaniel Clark Reviewed-by: Minh Diep Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/35194 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-core.m4 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 6038d8b..1b5175d 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3427,12 +3427,14 @@ AC_CHECK_HEADERS([blkid/blkid.h]) AC_CHECK_HEADERS([ext2fs/ext2fs.h]) # lustre/utils/lfs.c -AC_CHECK_LIB([z], [crc32], [ - AC_CHECK_HEADER([zlib.h], [], [ - AC_MSG_ERROR([zlib.h not found.])]) - ], [ - AC_MSG_ERROR([ -zlib library not found. Please install zlib development package.]) +AS_IF([test "$enable_dist" = "no"], [ + AC_CHECK_LIB([z], [crc32], [ + AC_CHECK_HEADER([zlib.h], [], [ + AC_MSG_ERROR([zlib.h not found.])]) + ], [ + AC_MSG_ERROR([ + zlib library not found. Please install zlib development package.]) + ]) ]) SELINUX="" -- 1.8.3.1