fix cacao/gennativetable to not crash on zipfile input, whole classpath in cacaodev...

[cacao.git] / configure.in

diff --git a/configure.in b/configure.in
index cf9a42c54c1f00d7d6886aa9f713febe6c36a0f3..1019ce830ff11f52f6f2f5cc775255f8729944f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -202,20 +202,18 @@ else
 fi
 
 dnl check if zlib should be used
-AC_ARG_ENABLE(zlib, [  --enable-zlib           enable zip archive class storage (experimental), needs zlib [default=no]])
+AC_ARG_ENABLE(zlib, [  --enable-zlib           enable zip archive class storage (experimental), needs zlib [[yes]]])
 
 AC_MSG_CHECKING(whether zip archives should be supported)
-if test x"$enable_zlib" = "xyes"; then
+if test x"$enable_zlib" = "xno"; then
+       ZIP_LIBS=""
+       ZIP_C=""
+       AC_MSG_RESULT(no)
+else
        ZIP_LIBS="-lz"
        ZIP_C="unzip.c"
        AC_DEFINE([USE_ZLIB], 1, [use zlib])
        AC_MSG_RESULT(yes)
-
-else
-       ZIP_LIBS=""
-       ZIP_C=""
-       AC_MSG_RESULT(no)
-
 fi
 AC_SUBST(ZIP_LIBS)
 AC_SUBST(ZIP_C)
@@ -260,7 +258,7 @@ if test x"$enable_gtk_peer" = "xyes"; then
                gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
                gnu.java.awt.peer.gtk.GtkClipboard \
                gnu.java.awt.peer.gtk.GtkWindowPeer"
-               AWT_OBJS="gnuclasspathnat/native/jni/gtk-peer/.libs/libgtkpeer.a \
+               AWT_OBJS="classpath/native/jni/gtk-peer/.libs/libgtkpeer.a \
                        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 \
                        -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 \
                        -lgthread-2.0 -lart_lgpl_2"
@@ -283,7 +281,7 @@ fi
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
-AC_CONFIG_SUBDIRS(mm/boehm-gc gnuclasspathnat)
+AC_CONFIG_SUBDIRS(mm/boehm-gc classpath)
 
 AC_OUTPUT(Makefile \
           mm/Makefile \