tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp/support wa_apr.m4 wa_apxs.m4 wa_util.m4
Date Wed, 01 May 2002 20:58:37 GMT
pier        02/05/01 13:58:37

  Modified:    webapp/support wa_apr.m4 wa_apxs.m4 wa_util.m4
  Log:
  Added function to append value to environment variable.
  
  Revision  Changes    Path
  1.3       +2 -6      jakarta-tomcat-connectors/webapp/support/wa_apr.m4
  
  Index: wa_apr.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- wa_apr.m4	1 May 2002 18:09:17 -0000	1.2
  +++ wa_apr.m4	1 May 2002 20:58:36 -0000	1.3
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <pier@betaversion.org>
  -dnl Version $Id: wa_apr.m4,v 1.2 2002/05/01 18:09:17 pier Exp $
  +dnl Version $Id: wa_apr.m4,v 1.3 2002/05/01 20:58:36 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -111,11 +111,7 @@
       fi
       wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/^$3="//g'`
       wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/"$//g'`
  -    if test -z "${$1}" ; then
  -      $1="${wa_apr_get_tempval}"
  -    else
  -      $1="${$1} ${wa_apr_get_tempval}"
  -    fi
  +    WA_APPEND([$1],[${wa_apr_get_tempval}])
       AC_MSG_RESULT([${wa_apr_get_tempval}])
       unset wa_apr_get_tempval
     ])
  
  
  
  1.5       +2 -6      jakarta-tomcat-connectors/webapp/support/wa_apxs.m4
  
  Index: wa_apxs.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apxs.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- wa_apxs.m4	1 May 2002 18:19:42 -0000	1.4
  +++ wa_apxs.m4	1 May 2002 20:58:36 -0000	1.5
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <pier@betaversion.org>
  -dnl Version $Id: wa_apxs.m4,v 1.4 2002/05/01 18:19:42 pier Exp $
  +dnl Version $Id: wa_apxs.m4,v 1.5 2002/05/01 20:58:36 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -151,10 +151,6 @@
         WA_ERROR([cannot execute $2])
       fi
       AC_MSG_RESULT([${wa_apxs_get_tempval}])
  -    if test -z "${$1}" ; then
  -      $1="${wa_apxs_get_tempval}"
  -    else
  -      $1="${$1} ${wa_apxs_get_tempval}"
  -    fi
  +    WA_APPEND([$1],[${wa_apxs_get_tempval}])
       unset wa_apxs_get_tempval
     ])
  
  
  
  1.4       +20 -1     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- wa_util.m4	1 May 2002 18:05:37 -0000	1.3
  +++ wa_util.m4	1 May 2002 20:58:36 -0000	1.4
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <pier@betaversion.org>
  -dnl Version $Id: wa_util.m4,v 1.3 2002/05/01 18:05:37 pier Exp $
  +dnl Version $Id: wa_util.m4,v 1.4 2002/05/01 20:58:36 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -83,6 +83,25 @@
     [
       $1=""
       AC_SUBST([$1])
  +  ])
  +
  +dnl --------------------------------------------------------------------------
  +dnl WA_APPEND
  +dnl   Append the extra value to the variable specified
  +dnl   $1 => The environment variable name.
  +dnl   $2 => The extra value
  +dnl --------------------------------------------------------------------------
  +AC_DEFUN(
  +  [WA_APPEND],
  +  [
  +    wa_append_tempval="`echo $2`"
  +    if test -n "${wa_append_tempval}" ; then
  +      if test -z "${$1}" ; then
  +        $1="${wa_append_tempval}"
  +      else 
  +        $1="${$1} ${wa_append_tempval}"
  +      fi
  +    fi 
     ])
   
   dnl --------------------------------------------------------------------------
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message