From 9f57d8c4f86323cf7481c9a7e512486087bb5542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 16 Jan 2014 14:37:34 +0100 Subject: configure: Prefer the system's zlib over own our zlib source WxWidgets (used by the wx application) also uses zlib. To ensure that the run-time system and WxWidgets use the same version of zlib, use the system's zlib if present. Also, the system's zlib may be specially optimized and thus faster than our own generic source code. We only use zlib versions that are "good enough". For now, that means 1.2.5 or higher. Remove the option --enable-shared-zlib and add the option --enable-builtin-zlib to force the use of the built-in zlib. --- configure.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index f25a068be9..d33e8bf125 100644 --- a/configure.in +++ b/configure.in @@ -255,8 +255,9 @@ AC_ARG_ENABLE(dynamic-ssl-lib, AS_HELP_STRING([--disable-dynamic-ssl-lib], [disable using dynamic openssl libraries])) -AC_ARG_ENABLE(shared-zlib, -AS_HELP_STRING([--enable-shared-zlib], [enable using shared zlib library])) +AC_ARG_ENABLE(builtin-zlib, +AS_HELP_STRING([--enable-builtin-zlib], + [force use of our own built-in zlib])) dnl This functionality has been lost along the way... :( dnl It could perhaps be nice to reintroduce some day; therefore, -- cgit v1.2.3