From c56888da7c91ef3fe236c2152070d06d1e73585c Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@php.net>
Date: Wed, 5 Apr 2000 09:47:34 +0000
Subject: [PATCH] look for Tomcat binaries too

---
 sapi/servlet/config.m4 | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 0dbb3178e5..2734683d7e 100644
--- 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
 
-- 
2.50.1