diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-19 20:45:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-19 20:45:36 +0000 |
| commit | 900d8d6ec2103e5205083e18e76a68d560107918 (patch) | |
| tree | fdc0e604d0d68d815d6bb24138c0413a1b633d5e /configure.in | |
| parent | da8ef83f41bee5a4f68c53ed34b292d1807ee606 (diff) | |
cmcfixes67: #i107060#: make system jars easier
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 89 |
1 files changed, 63 insertions, 26 deletions
diff --git a/configure.in b/configure.in index b29bec95b2b6..e38c866424b7 100644 --- a/configure.in +++ b/configure.in @@ -5914,37 +5914,74 @@ AC_SUBST(LIBSERIALIZER_JAR) if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES - AC_MSG_RESULT([external]) + SYSTEM_APACHE_COMMONS=YES + AC_MSG_RESULT([external]) if test "$ENABLE_MEDIAWIKI" = "YES"; then - if test -z "$COMMONS_CODEC_JAR"; then - COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar - fi - AC_CHECK_FILE($COMMONS_CODEC_JAR, [], - [AC_MSG_ERROR(commons-codec.jar not found.)], []) - if test -z "$COMMONS_LANG_JAR"; then - COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar - fi - AC_CHECK_FILE($COMMONS_LANG_JAR, [], - [AC_MSG_ERROR(commons-lang.jar not found.)], []) - if test -z "$COMMONS_HTTPCLIENT_JAR"; then - COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar - fi - AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], - [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + if test -z $COMMONS_CODEC_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-codec.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ], + [AC_MSG_ERROR(commons-codec.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_CODEC_JAR, [], + [AC_MSG_ERROR(commons-codec.jar not found.)], []) + fi + + if test -z $COMMONS_LANG_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-lang.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ], + [AC_MSG_ERROR(commons-lang.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LANG_JAR, [], + [AC_MSG_ERROR(commons-lang.jar not found.)], []) + fi + + if test -z $COMMONS_HTTPCLIENT_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ], + [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], + [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + fi fi if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - if test -z "$COMMONS_LOGGING_JAR"; then - COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar - fi - AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], - [AC_MSG_ERROR(commons-logging.jar not found.)], []) - + if test -z $COMMONS_LOGGING_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-logging.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], + [AC_MSG_ERROR(commons-logging.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], + [AC_MSG_ERROR(commons-logging.jar not found.)], []) + fi fi else - AC_MSG_RESULT([internal]) - SYSTEM_APACHE_COMMONS=NO - BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" + AC_MSG_RESULT([internal]) + SYSTEM_APACHE_COMMONS=NO + BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi AC_SUBST(SYSTEM_APACHE_COMMONS) |