Hi everybody, I'm new to the list, but for anybody who doesn't know me,
I have been pretty active on httpd 2.0. I decided to port mod_webapp last
week, and Pier committed the code for me, but the build system isn't there, so
I am posting the build system now.
This is currently working, although there seems to be some strangeness when
Tomcat responds to mod_webapp. I'll be looking into that over the next few days.
I hope to be more active as time permits. :-)
The Makefile.in should be placed in jakarta-tomcat-connectors/webapp/apache-2.0
Thanks,
Ryan
Index: webapp/Makefile.in
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.15
diff -u -d -b -w -u -r1.15 Makefile.in
--- webapp/Makefile.in 2001/08/06 22:21:52 1.15
+++ webapp/Makefile.in 2001/08/29 23:51:41
@@ -62,6 +62,7 @@
LOCALDIRS = @TGTDIRS@ @TARGET@
APRDIR = @APRDIR@
+INSTALLDIR = @TARGET@
CFGS = @CONFIGFILES@ \
@SRCDIR@/lib/pr_warp_defs.h \
@@ -71,6 +72,8 @@
all: apr-all local-all
+install: local-install
+
clean: apr-clean local-clean
distclean: clean
@@ -128,6 +131,19 @@
$(ECHO) "Cleaning up $${DIR}..." ; \
cd $${DIR} ; \
$(MAKE) clean ; \
+ RET=$$? ; \
+ cd $(SRCDIR) ; \
+ if test "$${RET}" != "0" ; then \
+ exit $${RET} ; \
+ fi ; \
+ done
+
+local-install:
+ @for DIR in $(INSTALLDIR) ; do \
+ $(ECHO) "" ; \
+ $(ECHO) "Compiling sources in $${DIR}..." ; \
+ cd $${DIR} ; \
+ $(MAKE) install ; \
RET=$$? ; \
cd $(SRCDIR) ; \
if test "$${RET}" != "0" ; then \
Index: webapp/configure.in
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.22
diff -u -d -b -w -u -r1.22 configure.in
--- webapp/configure.in 2001/08/06 22:48:45 1.22
+++ webapp/configure.in 2001/08/29 23:51:41
@@ -214,6 +214,41 @@
AC_SUBST(TARGET)
dnl --------------------------------------------------------------------------
+dnl Process the --with-apxs2[=FILE] command line argument
+dnl --------------------------------------------------------------------------
+AC_ARG_WITH(apxs2,
+ [ --with-apxs2[=FILE] build a shared Apache 2.0.x module.],
+ [
+ if ${TEST} -n "${TARGET}"
+ then
+ AC_MSG_ERROR([target already defined as ${TARGET}])
+ fi
+
+ APXS="${withval}"
+
+ if ${TEST} -z "${APXS}" ; then APXS="yes" ; fi
+ if ${TEST} "${APXS}" = "yes"
+ then
+ AC_PATH_PROG(APXS,apxs,${PATH})
+ fi
+
+ AC_MSG_CHECKING([if apxs is working])
+ ${APXS} -q CC 2>&1 1>/dev/null
+ if ${TEST} ! "$?" -eq "0"
+ then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([apxs is unworkable])
+ fi
+ AC_MSG_RESULT([ok])
+
+ TARGET="${SRCDIR}/apache-2.0"
+ makefile="apache-2.0/Makefile"
+ AC_MSG_RESULT([setting target module to... ${TARGET}])
+ ]
+)
+AC_SUBST(TARGET)
+
+dnl --------------------------------------------------------------------------
dnl Process the --with-apr=... command line argument
dnl --------------------------------------------------------------------------
AC_MSG_CHECKING([APR directory])
@@ -253,7 +288,7 @@
LOCAL_HEADER([Configuring APR])
LOCAL_FILTEREXEC(
- [./configure --enable-static --disable-shared --disable-threads],
+ [./configure --enable-static --disable-threads],
["APR configure"])
if ${TEST} "${ret}" -ne "0"
then
______________________________________________________________
Ryan Bloom [EMAIL PROTECTED]
Covalent Technologies [EMAIL PROTECTED]
--------------------------------------------------------------
# ========================================================================= #
# #
# 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 <[EMAIL PROTECTED]>. #
# #
# 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:[EMAIL PROTECTED]>
# @version $Id: Makefile.in,v 1.9 2001/08/09 20:06:49 pier Exp $
include @SRCDIR@/Makedefs
MODULE = mod_webapp.la
all: $(MODULE)
mod_webapp.la: mod_webapp.c @SRCDIR@/Makedefs
@$(ECHO) Compiling Apache 2.0 WebApp module
@APXS@ -I../include -c -L ../lib -lwebapp 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
