cvs: /php4/sapi/servlet config.m4

rubys Wed Apr 5 02:48:03 2000 EDT Modified files: /php4/sapi/servlet config.m4 Log: look for Tomcat binaries too Index: php4/sapi/servlet/config.m4 diff -u php4/sapi/servlet/config.m4:1.6 php4/sapi/servlet/config.m4:1.7 --- php4/sapi/servlet/config.m4:1.6 Tue Mar 7 07:41:33 2000 +++ php4/sapi/servlet/config.m4 Wed Apr 5 02:47:33 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.6 2000/03/07 15:41:33 rubys Exp $ +# $Id: config.m4,v 1.7 2000/04/05 09:47:33 rubys Exp $ # config.m4 for servlet sapi AC_MSG_CHECKING(for Servlet support) @@ -12,15 +12,21 @@ 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