From: Olaf Faaland Date: Mon, 6 May 2019 18:31:21 +0000 (-0700) Subject: LU-11946 build: no zlib check during configure --enable-dist X-Git-Tag: 2.12.54~25 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e9d9a0eeb0ff71b207e9d0095fce16af74f842b6 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. Change-Id: Ie262b17b63c0edc8e8bfbd0c1a466ec37d05622c Signed-off-by: Olaf Faaland Reviewed-on: https://review.whamcloud.com/34811 Reviewed-by: Nathaniel Clark Reviewed-by: Minh Diep Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 4245ba7..db957d7 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3497,12 +3497,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=""