From 77cc02e69529d5949c89ebca87659bc8f7d19042 Mon Sep 17 00:00:00 2001 From: johann Date: Fri, 21 Mar 2008 16:32:27 +0000 Subject: [PATCH] Branch HEAD b=15251 i=adilger i=bowen.zhou Fix configure check when zlib is installed but not zlib-devel. --- lustre/autoconf/lustre-core.m4 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index fa84b1f..1fd2674 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1746,19 +1746,18 @@ LC_READLINK_SSIZE_T # utils/llverfs.c AC_CHECK_HEADERS([ext2fs/ext2fs.h]) -# include/linux/obd_support.h -AC_CHECK_HEADERS([zlib.h]) - # check for -lz support -AC_CHECK_LIB(z, [adler32], - [ - ZLIB="-lz" - AC_DEFINE([HAVE_ADLER], 1, [support alder32 checksum type]) - ], - [ - ZLIB="" - AC_MSG_WARN([No zlib-devel package found, unable to use adler32 checksum]) - ]) +ZLIB="" +AC_CHECK_LIB([z], + [adler32], + [AC_CHECK_HEADERS([zlib.h], + [ZLIB="-lz" + AC_DEFINE([HAVE_ADLER], 1, + [support alder32 checksum type])], + [AC_MSG_WARN([No zlib-devel package found, + unable to use adler32 checksum])])], + [AC_MSG_WARN([No zlib package found, unable to use adler32 checksum])] +) AC_SUBST(ZLIB) # Super safe df -- 1.8.3.1