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_apxs.m4
Date Wed, 01 May 2002 18:19:42 GMT
pier        02/05/01 11:19:42

  Modified:    webapp/support wa_apxs.m4
  Log:
  More M4 name localization (done!)
  
  Revision  Changes    Path
  1.4       +27 -26    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- wa_apxs.m4	1 May 2002 15:30:58 -0000	1.3
  +++ wa_apxs.m4	1 May 2002 18:19:42 -0000	1.4
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <pier@betaversion.org>
  -dnl Version $Id: wa_apxs.m4,v 1.3 2002/05/01 15:30:58 pier Exp $
  +dnl Version $Id: wa_apxs.m4,v 1.4 2002/05/01 18:19:42 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -68,7 +68,7 @@
   AC_DEFUN(
     [WA_APXS],
     [
  -    tempval="apxs"
  +    wa_apxs_tempval="apxs"
       AC_MSG_CHECKING([for apxs name])
       AC_ARG_WITH(
         [apxs],
  @@ -81,26 +81,25 @@
             WA_ERROR([apxs required for compilation])
             ;;
           *)
  -          tempval="${withval}"
  +          wa_apxs_tempval="${withval}"
             ;;
           esac
         ])
  -    AC_MSG_RESULT([${tempval}])
  -    if test -x "${tempval}" ; then
  -      tempdir=`dirname "${tempval}"`
  -      tempfil=`basename "${tempval}"`
  -      WA_PATH_DIR([tempdir],[${tempdir}],[apxs])
  -      $1="${tempdir}/${tempfil}"
  +    AC_MSG_RESULT([${wa_apxs_tempval}])
  +    if test -x "${wa_apxs_tempval}" ; then
  +      wa_apxs_tempdir=`dirname "${wa_apxs_tempval}"`
  +      wa_apxs_tempfil=`basename "${wa_apxs_tempval}"`
  +      WA_PATH_DIR([wa_apxs_tempdir],[${wa_apxs_tempdir}],[apxs])
  +      $1="${wa_apxs_tempdir}/${wa_apxs_tempfil}"
       else
  -      AC_PATH_PROG($1,[${tempval}])
  +      AC_PATH_PROG($1,[${wa_apxs_tempval}])
       fi
       
       if test -z "${$1}" ; then
  -      AC_MSG_ERROR([cannot find apxs utility "${tempval}"])
  +      AC_MSG_ERROR([cannot find apxs utility "${wa_apxs_tempval}"])
         exit 1
       fi
  -    unset tempval
  -    AC_SUBST($1)
  +    unset wa_apxs_tempval
     ])
   
   dnl --------------------------------------------------------------------------
  @@ -112,18 +111,18 @@
   AC_DEFUN(
     [WA_APXS_CHECK],
     [
  -    tempval=""
  +    wa_apxs_check_tempval=""
       AC_MSG_CHECKING([for apxs version])
       if grep "STANDARD_MODULE_STUFF" "$2" > /dev/null ; then
  -      tempval="1.3"
  +      wa_apxs_check_tempval="1.3"
       elif grep "STANDARD20_MODULE_STUFF" "$2" > /dev/null ; then
  -      tempval="2.0"
  +      wa_apxs_check_tempval="2.0"
       else
         WA_ERROR([$2 invalid])
       fi
  -    AC_MSG_RESULT([$2 (${tempval})])
  -    $1=${tempval}
  -    unset tempval
  +    AC_MSG_RESULT([$2 (${wa_apxs_check_tempval})])
  +    $1=${wa_apxs_check_tempval}
  +    unset wa_apxs_check_tempval
       
       AC_MSG_CHECKING([for apxs sanity])
       $2 -q CC > /dev/null 2>&1
  @@ -134,8 +133,6 @@
         WA_ERROR([apxs cannot compile])
       fi
       AC_MSG_RESULT([ok])
  -
  -    AC_SUBST($1)
     ])
   
   dnl --------------------------------------------------------------------------
  @@ -149,11 +146,15 @@
     [WA_APXS_GET],
     [
       AC_MSG_CHECKING([for apxs $3 variable])
  -    tempval=`"$2" -q "$3" 2> /dev/null`;
  +    wa_apxs_get_tempval=`"$2" -q "$3" 2> /dev/null`
       if test "$?" != "0" ; then
  -        WA_ERROR([cannot execute $2])
  +      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
  -    AC_MSG_RESULT([${tempval}])
  -    $1="${$1} ${tempval}"
  -    unset tempval
  +    unset wa_apxs_get_tempval
     ])
  
  
  

--
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