Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Patch still doesn't work for me, but its easier to read now ...

...

Wiki Markup
This is a patch for PHP's configure script to account for the servlet jar name change (from servlet.jar in Servlet Spec 2.3 and previous \[tomcat 4 and previous\] to servlet-api.jar in Servlet Spec 2.4 and above \[tomcat 5 and later\]):

No Format

--- configure.org       2004-04-07 11:20:24.000000000 +0200

...


+++ configure   2004-04-07 11:22:50.000000000 +0200

...


      if test "$withval" = "yes";

...

 then
        SERVLET_CLASSPATH=.

...


      else
+      if test -f $withval/common/lib/servlet-api.jar; then

...


+        SERVLET_CLASSPATH=$withval/common/lib/servlet-api.jar

...


+      fi
+
        if test -f $withval/lib/servlet.jar;

...

 then
          SERVLET_CLASSPATH=$withval/lib/servlet.jar

...


       fi
++++