configure.ac (19ce5e0b) configure.ac (ba4fa4fa)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 2868 unchanged lines hidden (view full) ---

2877dnl Custom build version
2878dnl ===================================================================
2879
2880AC_MSG_CHECKING([whether to add custom build version])
2881if test "z$with_build_version" != "z"; then
2882 BUILD_VER_STRING=$with_build_version
2883 AC_MSG_RESULT([yes, $BUILD_VER_STRING])
2884else
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 2868 unchanged lines hidden (view full) ---

2877dnl Custom build version
2878dnl ===================================================================
2879
2880AC_MSG_CHECKING([whether to add custom build version])
2881if test "z$with_build_version" != "z"; then
2882 BUILD_VER_STRING=$with_build_version
2883 AC_MSG_RESULT([yes, $BUILD_VER_STRING])
2884else
2885 BUILD_VER_STRING=
2885 BUILD_VER_STRING=`date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)"`
2886 AC_MSG_RESULT([no])
2887fi
2888AC_SUBST(BUILD_VER_STRING)
2889
2890dnl ===================================================================
2891dnl Java support enable
2892dnl ===================================================================
2893AC_MSG_CHECKING([whether to build with Java support])

--- 3395 unchanged lines hidden (view full) ---

6289# commons-logging
6290if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
6291 AC_MSG_CHECKING([which Apache commons-* libs to use])
6292 if test "$with_system_apache_commons" = "yes"; then
6293 SYSTEM_APACHE_COMMONS=YES
6294 AC_MSG_RESULT([external])
6295 if test "$ENABLE_MEDIAWIKI" = "YES"; then
6296 if test -z $COMMONS_CODEC_JAR; then
2886 AC_MSG_RESULT([no])
2887fi
2888AC_SUBST(BUILD_VER_STRING)
2889
2890dnl ===================================================================
2891dnl Java support enable
2892dnl ===================================================================
2893AC_MSG_CHECKING([whether to build with Java support])

--- 3395 unchanged lines hidden (view full) ---

6289# commons-logging
6290if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
6291 AC_MSG_CHECKING([which Apache commons-* libs to use])
6292 if test "$with_system_apache_commons" = "yes"; then
6293 SYSTEM_APACHE_COMMONS=YES
6294 AC_MSG_RESULT([external])
6295 if test "$ENABLE_MEDIAWIKI" = "YES"; then
6296 if test -z $COMMONS_CODEC_JAR; then
6297 AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
6298 [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ],
6297 AC_CHECK_FILE(/usr/share/java/commons-codec-1.9.jar,
6298 [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ],
6299 [
6300 AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
6301 [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
6302 [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
6303 )
6304 ]
6305 )
6306 else
6307 AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
6308 [AC_MSG_ERROR(commons-codec.jar not found.)], [])
6309 fi
6310
6311 if test -z $COMMONS_LANG_JAR; then
6299 [
6300 AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
6301 [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
6302 [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
6303 )
6304 ]
6305 )
6306 else
6307 AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
6308 [AC_MSG_ERROR(commons-codec.jar not found.)], [])
6309 fi
6310
6311 if test -z $COMMONS_LANG_JAR; then
6312 AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
6313 [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
6312 AC_CHECK_FILE(/usr/share/java/commons-lang3-3.3.jar,
6313 [ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.jar ],
6314 [
6315 AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
6316 [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
6317 [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
6318 )
6319 ]
6320 )
6321 else

--- 13 unchanged lines hidden (view full) ---

6335 )
6336 else
6337 AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
6338 [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
6339 fi
6340 fi
6341 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
6342 if test -z $COMMONS_LOGGING_JAR; then
6314 [
6315 AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
6316 [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
6317 [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
6318 )
6319 ]
6320 )
6321 else

--- 13 unchanged lines hidden (view full) ---

6335 )
6336 else
6337 AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
6338 [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
6339 fi
6340 fi
6341 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
6342 if test -z $COMMONS_LOGGING_JAR; then
6343 AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
6344 [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
6343 AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.3.jar,
6344 [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ],
6345 [
6346 AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
6347 [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
6348 [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
6349 )
6350 ]
6351 )
6352 else

--- 984 unchanged lines hidden ---
6345 [
6346 AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
6347 [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
6348 [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
6349 )
6350 ]
6351 )
6352 else

--- 984 unchanged lines hidden ---