You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/07/15 10:44:50 UTC
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in README.txt configure.in
pier 01/07/15 01:44:50
Modified: webapp Makefile.in README.txt configure.in
Log:
Fixes in build process (and documented).
Revision Changes Path
1.11 +4 -8 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 2001/07/13 02:27:47 1.10
+++ Makefile.in 2001/07/15 08:44:49 1.11
@@ -56,21 +56,17 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.10 2001/07/13 02:27:47 pier Exp $
+# @version $Id: Makefile.in,v 1.11 2001/07/15 08:44:49 pier Exp $
include @SRCDIR@/Makedefs
LOCALDIRS = @TGTDIRS@ @TARGET@
APRDIR = @APRDIR@
-CFGS = config.cache \
+CFGS = @CONFIGFILES@ \
+ config.cache \
config.log \
- config.status \
- Makedefs \
- Makefile \
- lib/Makefile \
- apache-1.3/Makefile \
- java/Makefile
+ config.status
all: apr_all local_all
1.7 +1 -1 jakarta-tomcat-connectors/webapp/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README.txt 2001/07/13 02:05:43 1.6
+++ README.txt 2001/07/15 08:44:49 1.7
@@ -42,7 +42,7 @@
want to use them instead of checking them out from CVS, you can
specify where these can be found.
- --with-java=DIR
+ --with-jdk=DIR
If the JAVA_HOME environment variable has not been set, you will
need to specify this option on the command line for the configure
script in order to compile the Java portion of WebApp.
1.17 +14 -4 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 2001/07/13 02:51:36 1.16
+++ configure.in 2001/07/15 08:44:49 1.17
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.16 2001/07/13 02:51:36 pier Exp $
+dnl Version $Id: configure.in,v 1.17 2001/07/15 08:44:49 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -137,10 +137,13 @@
[
AC_MSG_RESULT([enabling debug output])
CFLAGS="$CFLAGS -DDEBUG"
+ DEBUG="true"
],[
AC_MSG_RESULT([disabling debug output])
+ DEBUG="false"
]
)
+AC_SUBST(DEBUG)
dnl -------------------------------------------------------------------------
dnl Check JAVA environment
@@ -291,10 +294,17 @@
dnl Defining variables used by Make
dnl --------------------------------------------------------------------------
CFLAGS="-Wall ${CFLAGS}"
-CPPFLAGS="-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}"
-TGTDIRS="${SRCDIR}/java ${SRCDIR}/lib"
AC_SUBST(CFLAGS)
+
+CPPFLAGS="-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}"
AC_SUBST(CPPFLAGS)
+
+TGTDIRS="${SRCDIR}/java ${SRCDIR}/lib"
AC_SUBST(TGTDIRS)
+
+CONFIGFILES="./Makedefs ./Makefile ./lib/Makefile ./java/Makefile"
+CONFIGFILES="$CONFIGFILES ./java/Constants.java ${makefile}"
+AC_SUBST(CONFIGFILES)
+
+AC_OUTPUT(${CONFIGFILES})
-AC_OUTPUT(./Makedefs ./Makefile ./lib/Makefile ./java/Makefile ${makefile})