diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-10 16:51:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-10 16:51:50 +0000 |
| commit | 0cf4c1fe938aeb0a0fcd5505d9eaf92b9765d164 (patch) | |
| tree | 08c2aaf9e23e4a9ebfc3cf8997862092cfe20407 /config_office | |
| parent | cf24ea0686ab5fedd44264cd993fd9b61b0ff835 (diff) | |
INTEGRATION: CWS ant02 (1.58.4); FILE MERGED
2004/11/18 16:01:13 bei 1.58.4.1: #i27028# improve ant detection
Diffstat (limited to 'config_office')
| -rwxr-xr-x | config_office/configure | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config_office/configure b/config_office/configure index d6679b1bc0ef..f64e1b6794f3 100755 --- a/config_office/configure +++ b/config_office/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.77 . +# From configure.in Revision . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -13091,6 +13091,7 @@ fi if test "$enable_java" != "no"; then ANT_HOME=; export ANT_HOME +WITH_ANT_HOME=; export WITH_ANT_HOME if test -z "$with_ant_home"; then for ac_prog in jakarta-ant ant ant.sh ant.bat do @@ -13152,7 +13153,8 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $with_ant_home/bin +as_dummy="$with_ant_home/bin:$PATH" +for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -13181,6 +13183,7 @@ fi test -n "$ANT" && break done + WITH_ANT_HOME=$with_ant_home fi @@ -13227,7 +13230,11 @@ EOF if test $? = 0 && test -f ./conftest.class ; then echo "$as_me:$LINENO: result: Ant works" >&5 echo "${ECHO_T}Ant works" >&6 - ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` + if test -z "$WITH_ANT_HOME"; then + ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` + else + ANT_HOME="$WITH_ANT_HOME" + fi else echo "configure: Ant test failed" >&5 cat conftest.java >&5 |