diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-08-06 10:46:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-08-06 10:46:29 +0100 |
| commit | f4127d6eed12788d2887901dfab4b6ed0af6317c (patch) | |
| tree | a80e142942c26fa20dbf5d902849672dd4c2f3af | |
| parent | 20a83f5da72b4b16b713ce8804c991f5d2856c96 (diff) | |
cmcfixes77: #i113199# add lucene.jar as final fallback
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 29 insertions, 1 deletions
diff --git a/configure b/configure index 0886cbe4e90f..165873db4a56 100755 --- a/configure +++ b/configure @@ -15190,6 +15190,26 @@ echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_jar" >&6 if test $ac_cv_file__usr_share_java_lucene_core_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar else + echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/lucene.jar"; then + ac_cv_file__usr_share_java_lucene_jar=yes +else + ac_cv_file__usr_share_java_lucene_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_jar = yes; then + LUCENE_CORE_JAR=/usr/share/java/lucene.jar +else { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 echo "$as_me: error: lucene-core.jar replacement not found" >&2;} { (exit 1); exit 1; }; } @@ -15200,6 +15220,10 @@ fi fi + + +fi + else as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 diff --git a/configure.in b/configure.in index 2925ad033aba..ec482fa9464d 100644 --- a/configure.in +++ b/configure.in @@ -3864,7 +3864,11 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ [ AC_CHECK_FILE(/usr/share/java/lucene-core.jar, [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ], - [ AC_MSG_ERROR(lucene-core.jar replacement not found)] + [ AC_CHECK_FILE(/usr/share/java/lucene.jar, + [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ], + [ AC_MSG_ERROR(lucene-core.jar replacement not found)] + ) + ] ) ] ) |