pier        01/08/06 13:18:26

  Modified:    webapp/support apjava.m4 aplocal.m4
  Log:
  Values like ${1}, ${2}, ${?}... don't run in ZSH
  
  Revision  Changes    Path
  1.7       +4 -4      jakarta-tomcat-connectors/webapp/support/apjava.m4
  
  Index: apjava.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/apjava.m4,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apjava.m4 2001/08/06 18:04:14     1.6
  +++ apjava.m4 2001/08/06 20:18:26     1.7
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: apjava.m4,v 1.6 2001/08/06 18:04:14 pier Exp $
  +dnl Version $Id: apjava.m4,v 1.7 2001/08/06 20:18:26 pier Exp $
   dnl --------------------------------------------------------------------------
   
   AC_DEFUN([AP_PROG_JAVAC_WORKS],[
  @@ -65,7 +65,7 @@
       ap_cv_prog_javac_works,[
       echo "public class Test {}" > Test.java
       ${JAVAC} ${JAVACFLAGS} Test.java > /dev/null 2>&1
  -    if ${TEST} ${?} -eq 0
  +    if ${TEST} $? -eq 0
       then
         rm -f Test.java Test.class
         ap_cv_prog_javac_works=yes
  @@ -83,7 +83,7 @@
       ${JAVA_HOME}/bin:${PATH}
     )
     AP_PROG_JAVAC_WORKS()
  -  AC_PROVIDE([${0}])
  +  AC_PROVIDE([$0])
     AC_SUBST(JAVAC)
     AC_SUBST(JAVACFLAGS)
   ])
  @@ -92,7 +92,7 @@
     AC_PATH_PROG(JAR,jar,
       AC_MSG_ERROR([jar not found]),
       ${JAVA_HOME}/bin:${PATH})
  -  AC_PROVIDE([${0}])
  +  AC_PROVIDE([$0])
     AC_SUBST(JAR)
   ])
   
  
  
  
  1.3       +8 -11     jakarta-tomcat-connectors/webapp/support/aplocal.m4
  
  Index: aplocal.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aplocal.m4        2001/08/06 18:04:14     1.2
  +++ aplocal.m4        2001/08/06 20:18:26     1.3
  @@ -57,13 +57,10 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
  -dnl Version $Id: aplocal.m4,v 1.2 2001/08/06 18:04:14 pier Exp $
  +dnl Version $Id: aplocal.m4,v 1.3 2001/08/06 20:18:26 pier Exp $
   dnl --------------------------------------------------------------------------
   
   AC_DEFUN(LOCAL_INIT,[
  -  AC_MSG_RESULT([])
  -  AC_MSG_RESULT([Initializing])
  -  ac_t="    "
     AC_PATH_PROG(TEST,test,${PATH})
     AC_PATH_PROG(TRUE,true,${PATH})
     AC_PATH_PROG(ECHO,echo,${PATH})
  @@ -82,21 +79,21 @@
   
   AC_DEFUN(LOCAL_HEADER,[
     ${ECHO} ""
  -  ${ECHO} "${1}" 1>&2
  +  ${ECHO} "$1" 1>&2
   ])
   
   AC_DEFUN(LOCAL_FILTEREXEC,[
  -  ${ECHO} "  Invoking: ${1}"
  +  ${ECHO} "  Invoking: $1"
     ${ECHO} "-1" > retvalue.tmp
     {
  -    ${1}
  -    ${ECHO} retvalue ${?}
  +    $1
  +    ${ECHO} retvalue $?
     }|{
       ret=0
       while ${TRUE}
       do
         read first line
  -      if ${TEST} ! "${?}" -eq "0"
  +      if ${TEST} ! "$?" -eq "0"
         then
           break
         else
  @@ -104,7 +101,7 @@
           then
             ret="${line}"
           else
  -          ${ECHO} "    ${2}: ${first} ${line}"
  +          ${ECHO} "    $2: ${first} ${line}"
           fi
         fi
       done
  @@ -114,6 +111,6 @@
     }
     ret=`${CAT} retvalue.tmp`
     ${RM} retvalue.tmp
  -  ${ECHO} "  Execution of ${1} returned ${ret}"
  +  ${ECHO} "  Execution of $1 returned ${ret}"
   ])
   
  
  
  

Reply via email to