tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Bloom <...@covalent.net>
Subject Build system for mod_webapp and Apache 2.0
Date Wed, 29 Aug 2001 23:55:41 GMT

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				rbb@apache.org
Covalent Technologies			rbb@covalent.net
--------------------------------------------------------------

Mime
View raw message