You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2004/04/01 09:08:20 UTC

cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4

hgomez      2004/03/31 23:08:20

  Modified:    jk/support jk_apxs.m4
  Log:
  Fix configure apr lookup for Tomcat Connectors 2.0.4 on MacOS/X
  
  Revision  Changes    Path
  1.16      +4 -4      jakarta-tomcat-connectors/jk/support/jk_apxs.m4
  
  Index: jk_apxs.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_apxs.m4	22 Mar 2004 16:28:21 -0000	1.15
  +++ jk_apxs.m4	1 Apr 2004 07:08:20 -0000	1.16
  @@ -101,11 +101,11 @@
   			  APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
                 APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
                 LIBTOOL=`${APXS$1} -q LIBTOOL`
  -              if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so; then
  +              if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f ${APACHE2_LIBDIR}/libapr-1.dylib; then
                   APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1"
  -              elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so; then
  +              elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f ${APACHE2_LIBDIR}/libapr-0.dylib; then
                   APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0"
  -              elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so; then
  +              elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f ${APACHE2_LIBDIR}/libapr.dylib; then
                   APR_LIBS="-L${APACHE2_LIBDIR} -lapr"
                 else
                   AC_MSG_ERROR(can't locate libapr)
  
  
  

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