svn commit: r795335 - /commons/sandbox/runtime/trunk/src/main/native/configure

[mt...@apache.org]

Author: mturk
Date: Sat Jul 18 10:11:20 2009
New Revision: 795335

URL: http://svn.apache.org/viewvc?rev=795335&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=795335&r1=795334&r2=795335&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Sat Jul 18 10:11:20 2009
@@ -79,6 +79,7 @@
 openssl_inc=""
 openssl_lib=""
 has_zlib=false
+has_zlib_set=false
 zlib_inc=""
 zlib_lib=""
 cccinc="stdio"
@@ -91,11 +92,13 @@
      ;;
     --enable-*) a=`echo "$o" | sed -e 's/--enable-//' -e 's/-/_/'`
         eval has_$a=true
+        eval has_$a_set=true
         shift
         continue
      ;;
     --disable-*) a=`echo "$o" | sed -e 's/--disable-//' -e 's/-/_/'`
         eval has_$a=false
+        eval has_$a_set=true
         shift
         continue
      ;;
@@ -765,7 +768,9 @@
     fi
     have_zlib=1
 else
-    if $is_unix; then
+    if $has_zlib_set; then
+        have_zlib=0
+    elif $is_unix; then
         ok=`have_library z zlib`
         if [ ".$ok" = ".1" ]; then
             varadds ldflags "-lz"