Whamcloud - gitweb
LU-11946 build: no zlib check during configure --enable-dist 11/34811/5
authorOlaf Faaland <faaland1@llnl.gov>
Mon, 6 May 2019 18:31:21 +0000 (11:31 -0700)
committerOleg Drokin <green@whamcloud.com>
Sat, 1 Jun 2019 03:55:26 +0000 (03:55 +0000)
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 <faaland1@llnl.gov>
Reviewed-on: https://review.whamcloud.com/34811
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/autoconf/lustre-core.m4

index 4245ba7..db957d7 100644 (file)
@@ -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=""