pier        01/07/09 08:46:00

  Modified:    webapp   configure.in
  Log:
  Removed color grief once for all (nifty but useless and unportable).
  Fixed the exit $ret bug introduced by JFC.
  
  Revision  Changes    Path
  1.11      +8 -8      jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- configure.in      2001/07/09 14:09:16     1.10
  +++ configure.in      2001/07/09 15:45:57     1.11
  @@ -58,7 +58,7 @@
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
   dnl Author Jon S. Stevens <mailto:[EMAIL PROTECTED]>
  -dnl Version $Id: configure.in,v 1.10 2001/07/09 14:09:16 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.11 2001/07/09 15:45:57 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -67,15 +67,16 @@
   AC_DEFUN(LOCAL_INIT,[
     AC_PATH_PROG(test,test,${PATH})
     AC_PATH_PROG(true,true,${PATH})
  -  AC_PATH_PROG(printf,printf,${PATH})
  +  AC_PATH_PROG(echo,echo,${PATH})
   ])
   
   AC_DEFUN(LOCAL_HEADER,[
  -  ${printf} "\n\033\13301;31m%s\033\13300m\n" "$1" 1>&2
  +  ${echo} ""
  +  ${echo} "$1" 1>&2
   ])
   
   AC_DEFUN(LOCAL_FILTEREXEC,[
  -  ${printf} "\033\13301mInvoking\033\13300m: %s\n" "$1"
  +  ${echo} "  Invoking: $1"
     {
       $1
       echo retvalue $?
  @@ -92,13 +93,12 @@
           then
             ret="${line}"
           else
  -          ${printf} "\033\13301m%s\033\13300m: %s\n" "$2" "${first} ${line}"
  +          ${echo} "    $2: ${first} ${line}"
           fi
         fi
       done
       unset first
       unset line
  -    exit $ret
     }
     ret=$?
   ])
  @@ -217,7 +217,7 @@
   cd ${APRDIR}
   
   LOCAL_HEADER([Building APR configure script])
  -LOCAL_FILTEREXEC([./buildconf],[  APR buildconf])
  +LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
   if ${test} "${ret}" -ne "0"
   then
     AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
  @@ -225,7 +225,7 @@
   
   LOCAL_HEADER([Configuring APR])
   LOCAL_FILTEREXEC([./configure --enable-static --disable-shared --disable-threads],
  -                 [  APR configure])
  +                 [APR configure])
   if ${test} "${ret}" -ne "0"
   then
     AC_MSG_ERROR([APR configure script terminated with error code ${ret}])
  
  
  

Reply via email to