configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea Author: Lionel Elie Mamane <[email protected]> Date: Sun Feb 17 11:57:58 2013 +0100 configure.ac: automatically find versioned servlet-api.jar Change-Id: I87533bb16d0ac2bbcb7c8592c4f6caa1aa05c705 diff --git a/configure.ac b/configure.ac index d8e1abd..7281004 100644 --- a/configure.ac +++ b/configure.ac @@ -10009,7 +10009,11 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then AC_MSG_RESULT([external]) SYSTEM_SERVLETAPI=YES if test -z "$SERVLETAPI_JAR"; then - SERVLETAPI_JAR=/usr/share/java/servlet-api.jar + for version in '' -3.3 -3.2 -3.1 -3.0 -2.5 -2.4; do + if test -r "/usr/share/java/servlet-api${version}.jar"; then + SERVLETAPI_JAR=/usr/share/java/servlet-api${version}.jar + fi + done fi AC_CHECK_FILE($SERVLETAPI_JAR, [], [AC_MSG_ERROR(servlet-api.jar not found.)], []) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
