* search gzread in zlib1 after trying in libz (win32)

 * remove critical exit from java macros

9 files changed, 11 insertions, 11 deletions

diff --git a/macros/ac_check_rqrd_class.m4 b/macros/ac_check_rqrd_class.m4
index 7157dfe9..fb13fff1 100644
--- a/macros/ac_check_rqrd_class.m4
+++ b/macros/ac_check_rqrd_class.m4
@@ -60,6 +60,6 @@ AC_DEFUN([AC_CHECK_RQRD_CLASS],[
 CLASS=`echo $1|sed 's/\./_/g'`
 AC_CHECK_CLASS($1)
 if test "$HAVE_LAST_CLASS" = "no"; then
-        AC_MSG_ERROR([Required class $1 missing, exiting.])
+true
 fi
 ])
diff --git a/macros/ac_prog_jar.m4 b/macros/ac_prog_jar.m4
index 18d453fc..266d310c 100644
--- a/macros/ac_prog_jar.m4
+++ b/macros/ac_prog_jar.m4
@@ -47,6 +47,6 @@ if test "x$JAVAPREFIX" = x; then
 else
         test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar, $JAVAPREFIX)
 fi
-test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH])
+true
 AC_PROVIDE([$0])dnl
 ])
diff --git a/macros/ac_prog_java.m4 b/macros/ac_prog_java.m4
index 6c0abf33..af2b6cbd 100644
--- a/macros/ac_prog_java.m4
+++ b/macros/ac_prog_java.m4
@@ -116,7 +116,7 @@ if test x$JAVAPREFIX = x; then
 else
         test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX)
 fi
-test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH])
+true
 AC_PROG_JAVA_WORKS
 AC_PROVIDE([$0])dnl
 ])
diff --git a/macros/ac_prog_java_cc.m4 b/macros/ac_prog_java_cc.m4
index 0ad33f16..df127856 100644
--- a/macros/ac_prog_java_cc.m4
+++ b/macros/ac_prog_java_cc.m4
@@ -103,5 +103,5 @@ if test "$JAVA_CC" = "gcj"; then
    AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@,
         [Define the compilation options for GCJ])
 fi
-test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH])
+true
 ])# AC_PROG_JAVA_CC
diff --git a/macros/ac_prog_java_works.m4 b/macros/ac_prog_java_works.m4
index aa9c2ef9..e450c6c8 100644
--- a/macros/ac_prog_java_works.m4
+++ b/macros/ac_prog_java_works.m4
@@ -95,7 +95,7 @@ if test x$ac_cv_prog_uudecode_base64 != xyes; then
         rm -f Test.class
         AC_MSG_WARN([I have to compile Test.class from scratch])
         if test x$ac_cv_prog_javac_works = xno; then
-                AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly])
+true
         fi
         if test x$ac_cv_prog_javac_works = x; then
                 AC_PROG_JAVAC
@@ -120,7 +120,7 @@ if test x$ac_cv_prog_uudecode_base64 != xyes; then
         else
           echo "configure: failed program was:" >&AC_FD_CC
           cat $JAVA_TEST >&AC_FD_CC
-          AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?))
+true
         fi
 fi
 if AC_TRY_COMMAND($JAVA $JAVAFLAGS $TEST) >/dev/null 2>&1; then
@@ -128,7 +128,7 @@ if AC_TRY_COMMAND($JAVA $JAVAFLAGS $TEST) >/dev/null 2>&1; then
 else
   echo "configure: failed program was:" >&AC_FD_CC
   cat $JAVA_TEST >&AC_FD_CC
-  AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?))
+true
 fi
 rm -fr $JAVA_TEST $CLASS_TEST Test.uue
 ])
diff --git a/macros/ac_prog_javac.m4 b/macros/ac_prog_javac.m4
index 6f2989e2..630c3cfe 100644
--- a/macros/ac_prog_javac.m4
+++ b/macros/ac_prog_javac.m4
@@ -78,7 +78,7 @@ if test "x$JAVAPREFIX" = x; then
 else
         test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" jikes$EXEEXT guavac$EXEEXT javac$EXEEXT, $JAVAPREFIX)
 fi
-test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
+true
 AC_PROG_JAVAC_WORKS
 AC_PROVIDE([$0])dnl
 ])
diff --git a/macros/ac_prog_javac_works.m4 b/macros/ac_prog_javac_works.m4
index 5a16ca7f..d3ceb5cc 100644
--- a/macros/ac_prog_javac_works.m4
+++ b/macros/ac_prog_javac_works.m4
@@ -65,7 +65,7 @@ EOF
 if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then
   ac_cv_prog_javac_works=yes
 else
-  AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
+true
   echo "configure: failed program was:" >&AC_FD_CC
   cat $JAVA_TEST >&AC_FD_CC
 fi
diff --git a/macros/ac_prog_javadoc.m4 b/macros/ac_prog_javadoc.m4
index 357a4a0e..0920c559 100644
--- a/macros/ac_prog_javadoc.m4
+++ b/macros/ac_prog_javadoc.m4
@@ -48,6 +48,6 @@ if test "x$JAVAPREFIX" = x; then
 else
         test "x$JAVADOC" = x && AC_CHECK_PROGS(JAVADOC, javadoc, $JAVAPREFIX)
 fi
-test "x$JAVADOC" = x && AC_MSG_ERROR([no acceptable javadoc generator found in \$PATH])
+true
 AC_PROVIDE([$0])dnl
 ])
diff --git a/macros/ac_prog_javah.m4 b/macros/ac_prog_javah.m4
index 3285ba74..6da77847 100644
--- a/macros/ac_prog_javah.m4
+++ b/macros/ac_prog_javah.m4
@@ -39,5 +39,5 @@ changequote([, ])dnl
                AC_MSG_WARN([unable to include <jni.h>]))
     CPPFLAGS="$ac_save_CPPFLAGS"])
 else
- AC_MSG_ERROR([no acceptable Javah compiler found in \$PATH])
+true
 fi])