From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 11 Apr 2019 11:52:26 +0000 (+0000)
Subject: fix --enable-zlib again
X-Git-Tag: FILE5_37~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c6dcd7ef690e90a3e897e8f886513750ed2c04d;p=file

fix --enable-zlib again
---

diff --git a/ChangeLog b/ChangeLog
index 103df1c9..7084b35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-04-07  14:05  Christos Zoulas <christos@zoulas.com>
+
+	* PR/75: --enable-zlib, did not work.
+
 2019-02-27  11:54  Christos Zoulas <christos@zoulas.com>
 
 	* Improve regex efficiency (Michael Schroeder) by:
diff --git a/configure.ac b/configure.ac
index e1fd48ab..1eba8472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,12 +36,12 @@ fi], [
 
 AC_MSG_CHECKING(for zlib support)
 AC_ARG_ENABLE([zlib],
-[AS_HELP_STRING([--disable-zlib], [disable zlib compression support @<:@default=auto@:>@])], [], [enable_zlib=yes])
+[AS_HELP_STRING([--disable-zlib], [disable zlib compression support @<:@default=auto@:>@])])
 AC_MSG_RESULT($enable_zlib)
 
 AC_MSG_CHECKING(for libseccomp support)
 AC_ARG_ENABLE([libseccomp],
-[AS_HELP_STRING([--disable-libseccomp], [disable libseccomp sandboxing @<:@default=auto@:>@])], [], [enable_seccomp=yes])
+[AS_HELP_STRING([--disable-libseccomp], [disable libseccomp sandboxing @<:@default=auto@:>@])])
 AC_MSG_RESULT($enable_libseccomp)
 
 AC_MSG_CHECKING(for file formats in man section 5)
@@ -175,7 +175,8 @@ if test "$enable_zlib" = "yes"; then
   if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" != "yesyes"; then
     AC_MSG_ERROR([zlib support requested but not found])
   fi
-elif  test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
+fi
+if  test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
   AC_DEFINE([ZLIBSUPPORT], 1, [Enable zlib compression support])
 fi