mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.ac: automatically find versioned servlet-api.jar

Browse Source 
Change-Id: I87533bb16d0ac2bbcb7c8592c4f6caa1aa05c705
This commit is contained in:
Lionel Elie Mamane
2013-02-17 11:57:58 +01:00
parent 93c69637ff
commit 850b4c7e2d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -10009,7 +10009,11 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_SERVLETAPI=YES SYSTEM_SERVLETAPI=YES
if test -z "$SERVLETAPI_JAR"; then 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 fi
AC_CHECK_FILE($SERVLETAPI_JAR, [], AC_CHECK_FILE($SERVLETAPI_JAR, [],
[AC_MSG_ERROR(servlet-api.jar not found.)], []) [AC_MSG_ERROR(servlet-api.jar not found.)], [])