pier 02/05/14 12:57:48
Modified: webapp/support wa_ant.m4
Log:
Fix problem observed by J.F.Clere with older/newer versions of Ant: it seems
that "ant -version" might report "Apache Ant version X.X" or "Ant version X.X"
Sed rules the world! :)
Revision Changes Path
1.2 +5 -2 jakarta-tomcat-connectors/webapp/support/wa_ant.m4
Index: wa_ant.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_ant.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wa_ant.m4 13 May 2002 23:22:51 -0000 1.1
+++ wa_ant.m4 14 May 2002 19:57:48 -0000 1.2
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: wa_ant.m4,v 1.1 2002/05/13 23:22:51 pier Exp $
+dnl Version $Id: wa_ant.m4,v 1.2 2002/05/14 19:57:48 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -119,7 +119,10 @@
if test -n "${wa_ant_tempval}" ; then
AC_MSG_CHECKING([if ant (${wa_ant_tempval}) is working])
- wa_ant_enabled=`${wa_ant_tempval} -version | grep "^Ant version" | cut -d\
-f1,3`
+ wa_ant_enabled=`${wa_ant_tempval} -version`
+ wa_ant_enabled=`echo ${wa_ant_enabled} | sed 's/^Apache Ant/Ant/g'`
+ wa_ant_enabled=`echo ${wa_ant_enabled} | grep "^Ant version"`
+ wa_ant_enabled=`echo ${wa_ant_enabled} | cut -d\ -f3`
if test -z "${wa_ant_enabled}" ; then
WA_ERROR([ant misconfigured, reconfigure with --without-ant])
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
