diff options
| author | rbuj <robert.buj@gmail.com> | 2014-08-18 13:52:32 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 07:29:55 -0500 |
| commit | d8a7f72bab1745cbf122400d81380ed66a6c36fc (patch) | |
| tree | 81551cbe01456f53fb9de23b75762ff192281fe1 /configure.ac | |
| parent | 1b0baa5799a56432d45cb1ec63d77ab93a3ebf9a (diff) | |
Use COMMONS_LOGGING_VERSION vble
Change-Id: I0c76ec7e3f9b95166b4005dd1ad5349b3889c3e4
Reviewed-on: https://gerrit.libreoffice.org/10993
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f4b765987464..bc823c797ea3 100644 --- a/configure.ac +++ b/configure.ac @@ -10865,6 +10865,7 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging +COMMONS_LOGGING_VERSION=1.2 if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then @@ -10930,8 +10931,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then fi if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then if test -z $COMMONS_LOGGING_JAR; then - AC_CHECK_FILE(/usr/share/java/commons-logging-1.2.jar, - [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.2.jar ], + AC_CHECK_FILE(/usr/share/java/commons-logging-$(COMMONS_LOGGING_VERSION).jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-$(COMMONS_LOGGING_VERSION).jar ], [ AC_CHECK_FILE(/usr/share/java/commons-logging.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], @@ -10955,6 +10956,7 @@ AC_SUBST(COMMONS_CODEC_JAR) AC_SUBST(COMMONS_LANG_JAR) AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) +AC_SUBST(COMMONS_LOGGING_VERSION) # scripting provider for BeanShell? AC_MSG_CHECKING([whether to build support for scripts in BeanShell]) |