tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/support jk_ws.m4
Date Fri, 06 Feb 2004 23:26:30 GMT
jfclere     2004/02/06 15:26:30

  Modified:    jk/native2 configure.in
               jk/support jk_ws.m4
  Log:
  WEBSERVER was missing when using --with-server.
  Prevent test $APACHE${n}-CC with CC when $APACHE${n}-CC is empty.
  
  Revision  Changes    Path
  1.17      +8 -8      jakarta-tomcat-connectors/jk/native2/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure.in	6 Feb 2004 22:37:17 -0000	1.16
  +++ configure.in	6 Feb 2004 23:26:29 -0000	1.17
  @@ -124,21 +124,21 @@
   
   dnl APACHE13 settings
   AC_MSG_RESULT([Checking for apache13...])
  -JK_WS_DIR([apache13], [APACHE], [src/include/httpd.h])
  +JK_WS_DIR([apache13], [APACHE], [src/include/httpd.h], [server/apache13])
   JK_WS_INCDIR([apache13], [httpd.h])
   JK_WS_LIBDIR([apache13])
   
   
   dnl APACHE2 settings
   AC_MSG_RESULT([Checking for apache20...])
  -JK_WS_DIR([apache2], [APACHE2], [include/httpd.h])
  +JK_WS_DIR([apache2], [APACHE2], [include/httpd.h], [server/apache2])
   JK_WS_INCDIR([apache2], [httpd.h])
   JK_WS_LIBDIR([apache2])
   
   
   dnl IIS settings
   AC_MSG_RESULT([Checking for iis...])
  -JK_WS_DIR([iis], [IIS], [.])
  +JK_WS_DIR([iis], [IIS], [.], [server/isapi])
   JK_WS_INCDIR([iis], [.])
   JK_WS_LIBDIR([iis])
   
  @@ -152,7 +152,7 @@
   
   dnl iPlanet settings
   AC_MSG_RESULT([Checking for iPlanet...])
  -JK_WS_DIR([iplanet], [IPLANET], [.])
  +JK_WS_DIR([iplanet], [IPLANET], [.], [server/aolserver])
   JK_WS_INCDIR([iplanet], [.])
   JK_WS_LIBDIR([iplanet])
   
  @@ -216,7 +216,7 @@
                   AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use --with-apr
and --with-apr-util])
           fi
   dnl make sure compiler matchs apxs
  -        if ${TEST} "$APACHE_CC" != "$CC"; then
  +        if ${TEST} -n "$APACHE_CC" -a "$APACHE_CC" != "$CC"; then
                   AC_MSG_RESULT([error])
                   AC_MSG_RESULT([compiler discovered by configure: ${CC}])
                   AC_MSG_RESULT([compiler used by apache: ${APACHE_CC}])
  @@ -232,7 +232,7 @@
                   AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
           fi
   dnl make sure compiler matchs apxs
  -        if ${TEST} "$APACHE2_CC" != "$CC"; then
  +        if ${TEST} -n "$APACHE2_CC" -a "$APACHE2_CC" != "$CC"; then
                   AC_MSG_RESULT([error])
                   AC_MSG_RESULT([compiler discovered by configure: ${CC}])
                   AC_MSG_RESULT([compiler used by apache: ${APACHE2_CC}])
  
  
  
  1.4       +3 -1      jakarta-tomcat-connectors/jk/support/jk_ws.m4
  
  Index: jk_ws.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_ws.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_ws.m4	5 Nov 2003 09:14:28 -0000	1.3
  +++ jk_ws.m4	6 Feb 2004 23:26:29 -0000	1.4
  @@ -69,6 +69,7 @@
   dnl   $1 => Webserver name
   dnl   $2 => Webserver vars prefix name
   dnl   $3 => File which should be present
  +dnl   $4 => Server specific source directory 
   dnl --------------------------------------------------------------------------
   AC_DEFUN(
     [JK_WS_DIR],
  @@ -103,6 +104,7 @@
               $2_INCDIR="${tempval}/include"
               $2_LDFLAGS=""
               $2_LIBDIR=""
  +	    WEBSERVERS="${WEBSERVERS} $4"
               AC_MSG_RESULT($1_DIR)
             fi
             ;;
  
  
  

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


Mime
View raw message