Author: mturk
Date: Sat Jul 18 10:16:44 2009
New Revision: 795337
URL: http://svn.apache.org/viewvc?rev=795337&view=rev
Log:
Add option to completely disable the zlib
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=795337&r1=795336&r2=795337&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Sat Jul 18 10:16:44
2009
@@ -758,8 +758,14 @@
if $is_unix; then
if [ -n "$zlib_lib" ]; then
varadds ldflags "-L$zlib_lib"
+ varadds ldflags "-lz"
+ else
+ ok=`have_library z zlib`
+ if [ ".$ok" = ".1" ]; then
+ varadds ldflags "-lz"
+ have_zlib=1
+ fi
fi
- varadds ldflags "-lz"
else
if [ -n "$zlib_lib" ]; then
varadds ldflags "/libpath:\"$zlib_lib\""
@@ -768,18 +774,15 @@
fi
have_zlib=1
else
- if $has_zlib_set; then
- have_zlib=0
- elif $is_unix; then
- ok=`have_library z zlib`
- if [ ".$ok" = ".1" ]; then
- varadds ldflags "-lz"
- have_zlib=1
- else
- have_zlib=0
+ have_zlib=0
+ if ! $has_zlib_set; then
+ if $is_unix; then
+ ok=`have_library z zlib`
+ if [ ".$ok" = ".1" ]; then
+ varadds ldflags "-lz"
+ have_zlib=1
+ fi
fi
- else
- have_zlib=0
fi
fi
