jfclere 01/11/23 04:12:59 Modified: webapp configure.in Log: Add --with-apr-lib and --with-apr-include for "special" httpd-2.0 installations. Revision Changes Path 1.49 +76 -4 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- configure.in 2001/11/22 11:36:21 1.48 +++ configure.in 2001/11/23 12:12:59 1.49 @@ -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.48 2001/11/22 11:36:21 jfclere Exp $ +dnl Version $Id: configure.in,v 1.49 2001/11/23 12:12:59 jfclere Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -346,6 +346,8 @@ dnl New vars: N/A dnl Upd vars: APR_SRCDIR dnl -------------------------------------------------------------------------- +LOCAL_HEADER([APR location]) +AC_MSG_CHECKING([for APR sources]) AC_ARG_WITH(apr, [ --with-apr[=DIR] path of an APR (Apache Portable Runtime) source distribution or CVS snapshot. (DIR defaults to @@ -360,12 +362,62 @@ APR_SRCDIR="${withval}" ;; esac + AC_MSG_RESULT([${APR_SRCDIR}]) ],[ APR_SRCDIR="${SRCDIR}/apr" + AC_MSG_RESULT([${APR_SRCDIR}]) ] ) +dnl -------------------------------------------------------------------------- +dnl Process the --with-apr-lib=... command line argument +dnl FHS System does not have apr library installed local_prefix/lib +dnl but somewhere else. +dnl -------------------------------------------------------------------------- +AC_MSG_CHECKING([for APR libraries]) +AC_ARG_WITH(apr-lib, + [ --with-apr-lib=DIR path where the APR libraries are installed.], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + AC_MSG_ERROR([--with-apr-lib need a directory]) + ;; + *) + APR_LIBDIR="${withval}" + ;; + esac + AC_MSG_RESULT([${APR_LIBDIR}]) + ], + [ + AC_MSG_RESULT([no]) + ] +) dnl -------------------------------------------------------------------------- +dnl Process the --with-apr-include=... command line argument +dnl FHS System does not have apr include installed local_prefix/include +dnl but somewhere else. +dnl -------------------------------------------------------------------------- +AC_MSG_CHECKING([for APR includes]) +AC_ARG_WITH(apr-include, + [ --with-apr-include=DIR path where the APR includes are + installed.], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + AC_MSG_ERROR([--with-apr-include need a directory]) + ;; + *) + APR_INCDIR="${withval}" + ;; + esac + AC_MSG_RESULT([${APR_INCDIR}]) + ], + [ + AC_MSG_RESULT([no]) + ] +) + +dnl -------------------------------------------------------------------------- dnl Target module to build dnl -------------------------------------------------------------------------- LOCAL_HEADER([Target web-server]) @@ -428,9 +480,29 @@ local_prefix="`${APXS} -q PREFIX`" LIBTOOL="$local_prefix/build/libtool" APR_CFGFLG="" - APR_VARFIL="${local_prefix}/lib/APRVARS" - APR_LIBDIR="${local_prefix}/lib" - APR_INCDIR="${local_prefix}/include" + + dnl check APR_LIBDIR + if ${TEST} -z "${APR_LIBDIR}" + then + APR_VARFIL="${local_prefix}/lib/APRVARS" + APR_LIBDIR="${local_prefix}/lib" + else + APR_VARFIL="${APR_LIBDIR}/APRVARS" + fi + + dnl check APR_INCDIR + if ${TEST} -z "${APR_INCDIR}" + then + APR_INCDIR="${local_prefix}/include" + fi + if ${TEST} ! -d "${APR_LIBDIR}" + then + AC_MSG_ERROR([\"${APR_LIBDIR}\" not found. Use --with-apr-lib=DIR.]) + fi + if ${TEST} ! -d "${APR_INCDIR}" + then + AC_MSG_ERROR([\"${APR_INCDIR}\" not found. Use --with-apr-include=DIR.]) + fi unset local_prefix else
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
