jon 01/05/12 14:13:25 Modified: connectors configure.in Log: fixed apxs related bugs that i introduced the other day. thanks to craig for the testing Revision Changes Path 1.5 +12 -11 jakarta-tomcat-4.0/connectors/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in 2001/05/12 04:35:56 1.4 +++ configure.in 2001/05/12 21:13:25 1.5 @@ -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.4 2001/05/12 04:35:56 jon Exp $ +dnl Version $Id: configure.in,v 1.5 2001/05/12 21:13:25 jon Exp $ dnl ----------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------- @@ -118,11 +118,12 @@ AC_SUBST(TGTDIRS) dnl ----------------------------------------------------------------------------- -dnl Process the --with-apxs=FILE... command line argument +dnl Process the --with-apxs[=FILE]... command line argument dnl ----------------------------------------------------------------------------- AC_ARG_WITH(apxs, -[ --with-apxs[=FILE] Build shared Apache module. FILE is the optional - pathname to the Apache apxs tool; defaults to apxs.], +[ --with-apxs[=FILE] Build shared Apache module. FILE is the optional + pathname to the apxs tool; defaults to finding + apxs in your PATH.], [ case "${withval}" in y | yes | true) find_apxs=true ;; @@ -135,18 +136,18 @@ AC_PATH_PROG(PERL,perl,$PATH)dnl if ${TEST} ${find_apxs} ; then - AC_PATH_PROG(APXS_CMD,apxs,$PATH)dnl + AC_PATH_PROG(APXS,apxs,$PATH)dnl else - APXS_CMD=${withval} + APXS=${withval} fi - if ${TEST} -n "${APXS_CMD}" ; then + if ${TEST} -n "${APXS}" ; then dnl Seems that we have it, but have to check if it is OK first - if ${TEST} ! -x "${APXS_CMD}" ; then - AC_MSG_ERROR(Invalid location for apxs: '${APXS_CMD}') + if ${TEST} ! -x "${APXS}" ; then + AC_MSG_ERROR(Invalid location for apxs: '${APXS}') fi - $APXS_CMD -q PREFIX >/dev/null 2>/dev/null || apxs_support=false + $APXS -q PREFIX >/dev/null 2>/dev/null || apxs_support=false if ${TEST} "${apxs_support}" = "false" ; then AC_MSG_RESULT(could not find apxs) @@ -157,7 +158,7 @@ AC_MSG_RESULT([adding apache-1.3 to target directories: \"$TGTDIRS\"]) AC_SUBST(TGTDIRS) - AC_SUBST(APXS_CMD) + AC_SUBST(APXS) fi fi ],
