pier 02/05/14 17:34:05
Modified: webapp/support wa_ant.m4 wa_perl.m4 wa_util.m4
Log:
Aesthetic checks and Solaris-8 build confirmation (it works!)
Revision Changes Path
1.6 +4 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wa_ant.m4 15 May 2002 00:25:49 -0000 1.5
+++ wa_ant.m4 15 May 2002 00:34:05 -0000 1.6
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: wa_ant.m4,v 1.5 2002/05/15 00:25:49 pier Exp $
+dnl Version $Id: wa_ant.m4,v 1.6 2002/05/15 00:34:05 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -89,7 +89,7 @@
*)
AC_MSG_RESULT([yes (${withval})])
wa_ant_enabled="yes"
- WA_PATH_PROG([wa_ant_tempval],[${withval}],[])
+ WA_PATH_PROG([wa_ant_tempval],[${withval}],[ant])
if test -z "${wa_ant_tempval}" ; then
AC_MSG_ERROR([${withval} is invalid])
fi
@@ -103,10 +103,10 @@
wa_ant_tempval=""
else
if test -z "${wa_ant_tempval}" ; then
- WA_PATH_PROG([wa_ant_tempval],[ant],[])
+ WA_PATH_PROG([wa_ant_tempval],[ant],[ant])
fi
if test -z "${wa_ant_tempval}" ; then
- WA_PATH_PROG([wa_ant_tempval],[ant.sh],[])
+ WA_PATH_PROG([wa_ant_tempval],[ant.sh],[ant.sh])
fi
if test -z "${wa_ant_tempval}" ; then
if test "${wa_ant_enabled}" = "yes" ; then
1.4 +3 -3 jakarta-tomcat-connectors/webapp/support/wa_perl.m4
Index: wa_perl.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_perl.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wa_perl.m4 15 May 2002 00:25:49 -0000 1.3
+++ wa_perl.m4 15 May 2002 00:34:05 -0000 1.4
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: wa_perl.m4,v 1.3 2002/05/15 00:25:49 pier Exp $
+dnl Version $Id: wa_perl.m4,v 1.4 2002/05/15 00:34:05 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -89,7 +89,7 @@
*)
AC_MSG_RESULT([yes (${withval})])
wa_perl_enabled="yes"
- WA_PATH_PROG([wa_perl_tempval],[${withval}],[])
+ WA_PATH_PROG([wa_perl_tempval],[${withval}],[perl])
if test -z "${wa_perl_tempval}" ; then
AC_MSG_ERROR([${withval} is invalid])
fi
@@ -103,7 +103,7 @@
wa_perl_tempval=""
else
if test -z "${wa_perl_tempval}" ; then
- WA_PATH_PROG([wa_perl_tempval],[perl],[])
+ WA_PATH_PROG([wa_perl_tempval],[perl],[perl])
fi
if test -z "${wa_perl_tempval}" ; then
if test "${wa_perl_enabled}" = "yes" ; then
1.8 +3 -3 jakarta-tomcat-connectors/webapp/support/wa_util.m4
Index: wa_util.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_util.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wa_util.m4 15 May 2002 00:25:49 -0000 1.7
+++ wa_util.m4 15 May 2002 00:34:05 -0000 1.8
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: wa_util.m4,v 1.7 2002/05/15 00:25:49 pier Exp $
+dnl Version $Id: wa_util.m4,v 1.8 2002/05/15 00:34:05 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -140,10 +140,10 @@
[
wa_path_prog_tempval="`echo $2`"
if test -x "${wa_path_prog_tempval}" ; then
- AC_MSG_CHECKING([for $3])
wa_path_prog_tempdir=`dirname "${wa_path_prog_tempval}"`
wa_path_prog_tempfil=`basename "${wa_path_prog_tempval}"`
WA_PATH_DIR([wa_path_prog_tempdir],[${wa_path_prog_tempdir}],[$3])
+ AC_MSG_CHECKING([for $3])
$1="${wa_path_prog_tempdir}/${wa_path_prog_tempfil}"
AC_MSG_RESULT([${$1}])
else
@@ -162,7 +162,7 @@
AC_DEFUN(
[WA_PATH_PROG_FAIL],
[
- WA_PATH_PROG($1,$2,$3)
+ WA_PATH_PROG([$1],[$2],[$3])
AC_MSG_CHECKING([for $3 availability])
if test -z "${$1}" ; then
AC_MSG_ERROR([cannot find $3 "${wa_apxs_tempval}"])
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
