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/webapp/apache-2.0 Makefile.in
Date Wed, 29 Aug 2001 14:29:29 GMT
jfclere     01/08/29 07:29:29

  Modified:    webapp   configure.in
  Added:       webapp/apache-2.0 Makefile.in
  Log:
  Copy/add configure logic for Apache-2.0 from mod_jk.
  
  Revision  Changes    Path
  1.23      +12 -3     jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- configure.in	2001/08/06 22:48:45	1.22
  +++ configure.in	2001/08/29 14:29:29	1.23
  @@ -58,7 +58,7 @@
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
   dnl Author Jon S. Stevens <mailto:jon@latchkey.com>
  -dnl Version $Id: configure.in,v 1.22 2001/08/06 22:48:45 pier Exp $
  +dnl Version $Id: configure.in,v 1.23 2001/08/29 14:29:29 jfclere Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -206,8 +206,17 @@
       AC_SUBST(APXS_LIBS_SHLIB)
       AC_SUBST(APXS_PREFIX)
   
  -    TARGET="${SRCDIR}/apache-1.3"
  -    makefile="apache-1.3/Makefile"
  +    dnl test apache version (from mod_jk)
  +    $RM -rf test
  +    $APXS -n test -g
  +    APA=`grep STANDARD20 test/mod_test.c`
  +    if  ${TEST} -z "$APA" ; then
  +      TARGET="${SRCDIR}/apache-1.3"
  +      makefile="apache-1.3/Makefile"
  +    else
  +      TARGET="${SRCDIR}/apache-2.0"
  +      makefile="apache-2.0/Makefile"
  +    fi
       AC_MSG_RESULT([setting target module to... ${TARGET}])
     ]
   )
  
  
  
  1.1                  jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  # ========================================================================= #
  #                                                                           #
  #                 The Apache Software License,  Version 1.1                 #
  #                                                                           #
  #          Copyright (c) 1999-2001 The Apache Software Foundation.          #
  #                           All rights reserved.                            #
  #                                                                           #
  # ========================================================================= #
  #                                                                           #
  # Redistribution and use in source and binary forms,  with or without modi- #
  # fication, are permitted provided that the following conditions are met:   #
  #                                                                           #
  # 1. Redistributions of source code  must retain the above copyright notice #
  #    notice, this list of conditions and the following disclaimer.          #
  #                                                                           #
  # 2. Redistributions  in binary  form  must  reproduce the  above copyright #
  #    notice,  this list of conditions  and the following  disclaimer in the #
  #    documentation and/or other materials provided with the distribution.   #
  #                                                                           #
  # 3. The end-user documentation  included with the redistribution,  if any, #
  #    must include the following acknowlegement:                             #
  #                                                                           #
  #       "This product includes  software developed  by the Apache  Software #
  #        Foundation <http://www.apache.org/>."                              #
  #                                                                           #
  #    Alternately, this acknowlegement may appear in the software itself, if #
  #    and wherever such third-party acknowlegements normally appear.         #
  #                                                                           #
  # 4. The names  "The  Jakarta  Project",  "WebApp",  and  "Apache  Software #
  #    Foundation"  must not be used  to endorse or promote  products derived #
  #    from this  software without  prior  written  permission.  For  written #
  #    permission, please contact <apache@apache.org>.                        #
  #                                                                           #
  # 5. Products derived from this software may not be called "Apache" nor may #
  #    "Apache" appear in their names without prior written permission of the #
  #    Apache Software Foundation.                                            #
  #                                                                           #
  # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
  # INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY #
  # AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL #
  # THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY #
  # DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL #
  # DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS #
  # OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) #
  # HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, #
  # STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
  # ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE #
  # POSSIBILITY OF SUCH DAMAGE.                                               #
  #                                                                           #
  # ========================================================================= #
  #                                                                           #
  # This software  consists of voluntary  contributions made  by many indivi- #
  # duals on behalf of the  Apache Software Foundation.  For more information #
  # on the Apache Software Foundation, please see <http://www.apache.org/>.   #
  #                                                                           #
  # ========================================================================= #
  
  # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  # @version $Id: Makefile.in,v 1.1 2001/08/29 14:29:29 jfclere Exp $
  
  include @SRCDIR@/Makedefs
  
  APXS_CC =            @APXS_CC@
  APXS_TARGET =        @APXS_TARGET@
  APXS_CFLAGS =        @APXS_CFLAGS@
  APXS_SBINDIR =       @APXS_SBINDIR@
  APXS_CFLAGS_SHLIB =  @APXS_CFLAGS_SHLIB@
  APXS_INCLUDEDIR =    @APXS_INCLUDEDIR@
  APXS_LD_SHLIB =      @APXS_LD_SHLIB@
  APXS_LIBEXECDIR =    @APXS_LIBEXECDIR@
  APXS_LDFLAGS_SHLIB = @APXS_LDFLAGS_SHLIB@
  APXS_SYSCONFDIR =    @APXS_SYSCONFDIR@
  APXS_LIBS_SHLIB =    @APXS_LIBS_SHLIB@
  APXS_PREFIX =        @APXS_PREFIX@
  
  APXS =               @APXS@
  
  MODULE = mod_webapp.la
  
  all: $(MODULE)
  
  mod_webapp.la: mod_webapp.c @SRCDIR@/lib/libwebapp.la @APRDIR@/libapr.la
  	@$(ECHO) Compiling and Linking Apache 2.0 WebApp Module
  	$(APXS) -c -o $@ \
  		-Wc,"$(APXS_CFLAGS) -I$(APXS_INCLUDEDIR) -I../include" \
  		@SRCDIR@/lib/libwebapp.la \
  		$(LIBTOOL_LIBS) $(EXTRA_LIBS) @APRDIR@/libapr.la \
  		mod_webapp.c
  
  install: mod_webapp.la
  	$(APXS) -i mod_webapp.la
  
  clean:
  	@for ENTRY in *.o *.lo $(MODULE) .libs ; \
  	do \
  		if $(TEST) -f $${ENTRY} ; \
  		then \
  			$(ECHO) Removing file $${ENTRY} ; \
  			$(RM) -f $${ENTRY} ; \
  		fi ; \
  		if $(TEST) -d $${ENTRY} ; \
  		then \
  			$(ECHO) Removing directory $${ENTRY} ; \
  			$(RM) -rf $${ENTRY} ; \
  		fi ; \
  	done
  
  
  

Mime
View raw message