summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-09 19:37:12 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-11 20:27:27 +0200
commitf0d246028e37f4d71e2a4fb580d277e5a485ceba (patch)
tree831d3285f4ab0d6be85cfa8e22246a3c6effa3a9 /configure.in
parent7b139452515f90f536ecb2725c8c86343031bf76 (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> (cherry picked from commit ca7e5ff61db9d96e1a48e16cd1cb97555cecba6b) Conflicts: configure.in
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in18
1 files changed, 7 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 5830bdf5a88c..20e81aa16df2 100644
--- a/configure.in
+++ b/configure.in
@@ -9008,17 +9008,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 && test -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"
@@ -9075,7 +9073,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
@@ -9119,11 +9117,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 && test -f ./conftest.class ; then
AC_MSG_RESULT([yes])
rm -rf confdir