CVS kaffe (robilad): disable zlib-zip by default

PatchSet 7683 
Date: 2008/01/17 21:10:15
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
disable zlib-zip by default

2008-01-17  Dalibor Topic  <[email protected]>

* configure.ac: Disabled zlib-zip by default.

Members: 
	ChangeLog:1.5185->1.5186 
	configure:1.629->1.630 
	configure.ac:1.298->1.299 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5185 kaffe/ChangeLog:1.5186
--- kaffe/ChangeLog:1.5185	Thu Jan 17 20:29:25 2008
+++ kaffe/ChangeLog	Thu Jan 17 21:10:15 2008
@@ -1,5 +1,9 @@
 2008-01-17  Dalibor Topic  <[email protected]>
 
+	* configure.ac: Disabled zlib-zip by default.
+
+2008-01-17  Dalibor Topic  <[email protected]>
+
 	* configure.ac: Rewritten checking for pure java math to make the 
 	native GNU MP implementation disabled by default.
 
Index: kaffe/configure
diff -u kaffe/configure:1.629 kaffe/configure:1.630
--- kaffe/configure:1.629	Thu Jan 17 20:29:26 2008
+++ kaffe/configure	Thu Jan 17 21:10:15 2008
@@ -1669,8 +1669,7 @@
                           default)
   --disable-xawt-xi18n    disable build of Xi18n support of Xlib AWT backend
                           (enabled by default)
-  --disable-zlib-zip      Disable java.util.zip implementation using zlib
-                          [default=enabled]
+  --enable-zlib-zip       Enable java.util.zip implementation using zlib
   --disable-pure-java-math
                           Disable pure java java.math.* package
   --disable-direct-threading
@@ -7043,7 +7042,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7046 "configure"' > conftest.$ac_ext
+  echo '#line 7045 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9607,11 +9606,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9610: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9609: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9614: \$? = $ac_status" >&5
+   echo "$as_me:9613: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9897,11 +9896,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9900: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9899: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9904: \$? = $ac_status" >&5
+   echo "$as_me:9903: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10001,11 +10000,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10004: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10003: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10008: \$? = $ac_status" >&5
+   echo "$as_me:10007: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12363,7 +12362,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12366 "configure"
+#line 12365 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12463,7 +12462,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12466 "configure"
+#line 12465 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14887,11 +14886,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14889: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14894: \$? = $ac_status" >&5
+   echo "$as_me:14893: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14991,11 +14990,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14994: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14993: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14998: \$? = $ac_status" >&5
+   echo "$as_me:14997: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16568,11 +16567,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16571: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16575: \$? = $ac_status" >&5
+   echo "$as_me:16574: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16672,11 +16671,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16675: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16674: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16679: \$? = $ac_status" >&5
+   echo "$as_me:16678: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18876,11 +18875,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18879: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18878: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18883: \$? = $ac_status" >&5
+   echo "$as_me:18882: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19166,11 +19165,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19169: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19168: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19173: \$? = $ac_status" >&5
+   echo "$as_me:19172: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19270,11 +19269,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19273: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19272: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19277: \$? = $ac_status" >&5
+   echo "$as_me:19276: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -25589,7 +25588,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 25592 "configure" */
+/* #line 25591 "configure" */
 public class Test {
 }
 EOF
@@ -41542,11 +41541,11 @@
 if test "${enable_zlib_zip+set}" = set; then
   enableval=$enable_zlib_zip;
 else
-  enable_zlib_zip="yes"
+  enable_zlib_zip="no"
 fi
 
 
- if test x"$enable_zlib_zip" != x"no"; then
+ if test x"$enable_zlib_zip" = x"yes"; then
   COND_ZLIB_ZIP_TRUE=
   COND_ZLIB_ZIP_FALSE='#'
 else
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.298 kaffe/configure.ac:1.299
--- kaffe/configure.ac:1.298	Thu Jan 17 20:29:27 2008
+++ kaffe/configure.ac	Thu Jan 17 21:10:15 2008
@@ -1574,11 +1574,11 @@
 fi
 
 AC_ARG_ENABLE([zlib_zip],
-              AS_HELP_STRING([--disable-zlib-zip],
-                             [Disable java.util.zip implementation using zlib @<:@default=enabled@:>@]),
-                             [], [enable_zlib_zip="yes"])
+              AS_HELP_STRING([--enable-zlib-zip],
+                             [Enable java.util.zip implementation using zlib]),
+                             [], [enable_zlib_zip="no"])
 
-AM_CONDITIONAL([COND_ZLIB_ZIP], [test x"$enable_zlib_zip" != x"no"])
+AM_CONDITIONAL([COND_ZLIB_ZIP], [test x"$enable_zlib_zip" = x"yes"])
 
 dnl -----------------------------------------------------------------------
 dnl                 Pure java imlementation of java.math.*