look for Tomcat binaries too

diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 0dbb3178e554e7e726938241813362ebdae050a3..2734683d7e6ae46c7ba3d321330955601f364742 100644 (file)
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -12,15 +12,21 @@ AC_ARG_WITH(servlet,
     if test "$withval" = "yes"; then
       SERVLET_CLASSPATH=.
     else
+      if test -f $withval/lib/servlet.jar; then
+       SERVLET_CLASSPATH=$withval/lib/servlet.jar
+      fi
+
       if test -f $withval/lib/jsdk.jar; then
        SERVLET_CLASSPATH=$withval/lib/jsdk.jar
-      else
-       if test -d $withval/javax; then
-         SERVLET_CLASSPATH=$withval
-       else
-         AC_MSG_RESULT(no)
-         AC_MSG_ERROR(unable to find JSDK libraries)
-       fi
+      fi
+
+      if test -d $withval/javax; then
+       SERVLET_CLASSPATH=$withval
+      fi
+
+      if test -z "$JAVA_INCLUDE"; then
+       AC_MSG_RESULT(no)
+       AC_MSG_ERROR(unable to find servlet libraries)
       fi
     fi