jfclere     2002/06/06 09:43:17

  Modified:    jk/support jk_apxs.m4
  Log:
  Apache-2.0 needs both CFLAGS and EXTRA_CFLAGS.
  
  Revision  Changes    Path
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_apxs.m4        24 May 2002 07:05:07 -0000      1.1
  +++ jk_apxs.m4        6 Jun 2002 16:43:16 -0000       1.2
  @@ -60,7 +60,7 @@
   dnl
   dnl Inspired by Pier works on webapp m4 macros :)
   dnl 
  -dnl Version $Id: jk_apxs.m4,v 1.1 2002/05/24 07:05:07 hgomez Exp $
  +dnl Version $Id: jk_apxs.m4,v 1.2 2002/06/06 16:43:16 jfclere Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -121,7 +121,7 @@
               if ${TEST} -z "$APA" ; then
                 WEBSERVERS="${WEBSERVERS} server/apache13"
                 RWEBSERVER="apache-1.3"
  -                   APXS$1_CFLAGS="`${APXS$1} -q CFLAGS`"
  +              APXS$1_CFLAGS="`${APXS$1} -q CFLAGS`"
                 APXS$1_CPPFLAGS=""
               else
                 WEBSERVERS="${WEBSERVERS} server/apache2"
  @@ -130,8 +130,8 @@
                 JK_CHANNEL_APR_SOCKET="\${JK}jk_channel_apr_socket\${OEXT}"
                 JK_POOL_APR="\${JK}jk_pool_apr\${OEXT}"
                 HAS_APR="-DHAS_APR"
  -                   APXS$1_CFLAGS="`${APXS$1} -q EXTRA_CFLAGS`"
  -                   APXS$1_CPPFLAGS="`${APXS$1} -q EXTRA_CPPFLAGS`"
  +              APXS$1_CFLAGS="`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`"
  +              APXS$1_CPPFLAGS="`${APXS$1} -q EXTRA_CPPFLAGS`"
               fi
               
               AC_MSG_RESULT([building connector for \"$RWEBSERVER\"])
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to