pier 02/05/01 11:09:17 Modified: webapp/support wa_apr.m4 Log: Some more variable localization, now WA_APR_GET appends data to the variable instead of replacing it, and removed a little useless check in WA_APR (WA_PATH_DIR already exits if the directory is not found) Revision Changes Path 1.2 +17 -16 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wa_apr.m4 1 May 2002 00:19:18 -0000 1.1 +++ wa_apr.m4 1 May 2002 18:09:17 -0000 1.2 @@ -57,7 +57,7 @@ dnl -------------------------------------------------------------------------- dnl Author Pier Fumagalli <[EMAIL PROTECTED]> -dnl Version $Id: wa_apr.m4,v 1.1 2002/05/01 00:19:18 pier Exp $ +dnl Version $Id: wa_apr.m4,v 1.2 2002/05/01 18:09:17 pier Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -68,7 +68,7 @@ AC_DEFUN( [WA_APR], [ - tempval="apr" + wa_apr_tempval="apr" AC_MSG_CHECKING([for apr sources]) AC_ARG_WITH( [apr], @@ -81,19 +81,14 @@ WA_ERROR([apr library sources required for compilation]) ;; *) - tempval="${withval}" + wa_apr_tempval="${withval}" ;; esac ]) - AC_MSG_RESULT([${tempval}]) - WA_PATH_DIR($1,[${tempval}],[apr sources]) + AC_MSG_RESULT([${wa_apr_tempval}]) + WA_PATH_DIR($1,[${wa_apr_tempval}],[apr sources]) - if test -z "$1" ; then - AC_MSG_ERROR([cannot find apr directory "${tempval}"]) - exit 1 - fi - unset tempval - AC_SUBST($1) + unset wa_apr_tempval ]) dnl -------------------------------------------------------------------------- @@ -110,11 +105,17 @@ if test ! -f "$2/APRVARS" ; then WA_ERROR([cannot find APRVARS file in $2]) fi - $1=`cat $2/APRVARS | grep $3= 2> /dev/null` - if test -z "$1" ; then + wa_apr_get_tempval=`cat $2/APRVARS | grep "^$3=" 2> /dev/null` + if test -z "${wa_apr_get_tempval}" ; then WA_ERROR([value for $3 not specified in $2/APRVARS]) fi - $1=`echo [$]$1 | sed 's/^$3="//g' | sed 's/"$//g'` - AC_MSG_RESULT([[$]$1]) - AC_SUBST([$1]) + 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 + AC_MSG_RESULT([${wa_apr_get_tempval}]) + unset wa_apr_get_tempval ])
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>