From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Tue, 20 Dec 2011 18:30:01 +0000 (-0200)
Subject: configure: disable static zlib build.
X-Git-Tag: v2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e482783ad22e01f3d82b68f9a4dca4d358b4960;p=thirdparty%2Fkmod.git

configure: disable static zlib build.

It was not being done correctly, disable until we find a way for
libtool to cooperate.
---

diff --git a/configure.ac b/configure.ac
index e9eb08d6..d0bdeb44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,33 +45,15 @@ AS_IF([test "x$enable_logging" = "xyes"], [
 ])
 
 AC_ARG_ENABLE([zlib],
-        AS_HELP_STRING([--enable-zlib], [handle gzipped modules (options: static or dynamic) @<:@default=disabled@:>@]),
+        AS_HELP_STRING([--enable-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
 	[], enable_zlib=no)
-if test "x$enable_zlib" = "xyes" -o "x$enable_zlib" = "xstatic"; then
-        enable_zlib="static"
-        zlib_libs="-Wl,-Bstatic -lz -Wl,-Bdynamic"
-        SAVE_LIBS="${LIBS}"
-        LIBS="${LIBS} ${zlib_libs}"
-        AC_MSG_CHECKING([if static zlib exists])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-                #include <zlib.h>
-        ]], [[
-                gzFile f = gzopen("/tmp", "rb");
-        ]])],
-        [have_zlib=yes], [have_zlib=no])
-        LIBS="${SAVE_LIBS}"
-        AC_MSG_RESULT([$have_zlib])
-        if test "x$have_zlib" != "xyes"; then
-                zlib_libs=""
-                AC_MSG_ERROR([static zlib is not present])
-        fi
-elif test "x$enable_zlib" = "xdynamic"; then
+if test "x$enable_zlib" != "xno"; then
         AC_CHECK_LIB([z], [gzopen],
                 [
                         zlib_libs="-lz"
                         required_private_libs="${required_private_libs} ${zlib_libs}"
                 ],
-                [AC_MSG_ERROR([dynamic zlib is not present])])
+                [AC_MSG_ERROR([zlib is not present])])
 else
         AC_MSG_NOTICE([zlib support not requested])
         zlib_libs=""