You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/07/02 16:06:03 UTC
cvs commit: jakarta-tomcat-connectors/webapp Makedefs.in configure.in
jfclere 01/07/02 07:06:02
Modified: webapp Makedefs.in configure.in
Log:
Add APXSCFLAGS and APXSLDFLAGS to work-around APR problems.
Revision Changes Path
1.4 +2 -2 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makedefs.in 2001/05/10 09:02:28 1.3
+++ Makedefs.in 2001/07/02 14:05:59 1.4
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makedefs.in,v 1.3 2001/05/10 09:02:28 pier Exp $
+# @version $Id: Makedefs.in,v 1.4 2001/07/02 14:05:59 jfclere Exp $
CC = @CC@
AR = @AR@
@@ -64,7 +64,7 @@
APXSFLAGS = -I@SRCDIR@/include -I@APRDIR@/include \
-L@SRCDIR@/lib -lwebapp \
-L@APRDIR@/lib -lapr \
- -Wc,-Wall
+ -Wc,"-Wall @APXSCFLAGS@" @APXSLDFLAGS@
RANLIB = @RANLIB@
CFLAGS = -Wall -Wstrict-prototypes @CFLAGS@
CPPFLAGS = -I@SRCDIR@/include -I@APRDIR@/include @CPPFLAGS@
1.7 +7 -1 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in 2001/06/06 10:13:36 1.6
+++ configure.in 2001/07/02 14:06:00 1.7
@@ -58,12 +58,13 @@
dnl -----------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.6 2001/06/06 10:13:36 jfclere Exp $
+dnl Version $Id: configure.in,v 1.7 2001/07/02 14:06:00 jfclere Exp $
dnl -----------------------------------------------------------------------------
dnl -----------------------------------------------------------------------------
dnl Initialize GNU AutoConf
dnl -----------------------------------------------------------------------------
+sinclude(../common/build/apache.m4)dnl
AC_INIT(Makefile.in)
dnl -----------------------------------------------------------------------------
@@ -186,5 +187,10 @@
TGTDIR=`pwd`
AC_MSG_RESULT($TGTDIR)
AC_SUBST(TGTDIR)
+
+dnl -----------------------------------------------------------------------------
+dnl LDFLAGS and CFLAGS to APXS command
+dnl -----------------------------------------------------------------------------
+JTC_SET_APXS_FLAGS()
AC_OUTPUT(Makedefs Makefile lib/Makefile apache-1.3/Makefile)