diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-02-17 11:57:58 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-02-17 12:03:13 +0100 |
| commit | 850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea (patch) | |
| tree | c313ef8842dcd9666e8fc32d87928355aa7c2c25 | |
| parent | Improve configure support for --with-system-boost --with-boost=... (diff) | |
| download | core-850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea.tar.gz core-850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea.zip | |
configure.ac: automatically find versioned servlet-api.jar
Change-Id: I87533bb16d0ac2bbcb7c8592c4f6caa1aa05c705
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d8e1abd9f47a..728100489b34 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.)], []) |