diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-09 19:37:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-11 20:11:39 +0200 |
| commit | ca7e5ff61db9d96e1a48e16cd1cb97555cecba6b (patch) | |
| tree | 81dab5557029ae474294b01291f37163008038a6 /configure.in | |
| parent | ca476ed32132a786be934201139ae53a3c6522e2 (diff) | |
configure: don't fail if ant home contains space
Change-Id: I70ee8a557cb0e9aee393939e886cf82d8a9fc79c
(cherry picked from commit 32aa5e6aa0e0e976a16204b23699031192b9bb34)
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 7780d6b6d4e1..8472aed1ddef 100644 --- a/configure.in +++ b/configure.in @@ -10982,17 +10982,15 @@ EOF oldJAVA_HOME=$JAVA_HOME if test "$JAVACISGCJ" = "yes"; then JAVA_HOME=; export JAVA_HOME - ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" - else - ant_cmd="$ANT -buildfile conftest.xml 1>&2" + ant_gcj="-Dbuild.compiler=gcj" fi - AC_TRY_EVAL(ant_cmd) + AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2) if test $? = 0 -a -f ./conftest.class; then AC_MSG_RESULT([Ant works]) if test -z "$WITH_ANT_HOME"; then - ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` + ANT_HOME=`"$ANT" -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then - ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` + ANT_HOME=`echo "$ANT" | $SED -n "s/\/bin\/ant.*\$//p"` fi else ANT_HOME="$WITH_ANT_HOME" @@ -11057,7 +11055,7 @@ EOF ant_minminor1=`echo $ant_minver | cut -d"." -f2` AC_MSG_CHECKING([whether Ant is >= $ant_minver]) - ant_version=`$ANT -version | $AWK '{ print $4; }'` + ant_version=`"$ANT" -version | $AWK '{ print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` echo "configure: ant_version $ant_version " >&5 @@ -11101,11 +11099,9 @@ EOF if test "$JAVACISGCJ" = "yes"; then JAVA_HOME=; export JAVA_HOME - ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" - else - ant_cmd="$ANT -buildfile conftest.xml 1>&2" + ant_gcj="-Dbuild.compiler=gcj" fi - AC_TRY_EVAL(ant_cmd) + AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2) if test $? = 0 -a -f ./conftest.class; then AC_MSG_RESULT([yes]) rm -rf confdir |