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 2002/05/01 17:31:47 UTC
cvs commit: jakarta-tomcat-connectors/webapp configure.in
pier 02/05/01 08:31:47
Modified: webapp configure.in
Log:
Added retrieval of environment variables to build stuff when Apache 2.0 is game.
Revision Changes Path
1.53 +27 -2 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- configure.in 1 May 2002 00:37:16 -0000 1.52
+++ configure.in 1 May 2002 15:31:47 -0000 1.53
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@betaversion.org>
-dnl Version $Id: configure.in,v 1.52 2002/05/01 00:37:16 pier Exp $
+dnl Version $Id: configure.in,v 1.53 2002/05/01 15:31:47 pier Exp $
dnl --------------------------------------------------------------------------
sinclude(./support/wa_util.m4)
@@ -175,8 +175,33 @@
else
+ dnl ----------------------------------------------------------------------
+ dnl APXS version 2.0, meaning Apache 2.0. We use APR from there
+ dnl ----------------------------------------------------------------------
AC_MSG_RESULT([apache 2 distribution])
- AC_MSG_ERROR([using Apache 2.0 apxs will be supported shortly])
+
+ WA_APXS_GET([CC],[${APXS}],[CC])
+ WA_APXS_GET([CPP],[${APXS}],[CPP])
+ WA_APXS_GET([SHELL],[${APXS}],[SHELL])
+ WA_APXS_GET([LIBTOOL],[${APXS}],[LIBTOOL])
+
+ WA_APXS_GET([CPPFLAGS],[${APXS}],[CPPFLAGS])
+ WA_APXS_GET([CPPFLAGS],[${APXS}],[NOTEST_CPPFLAGS])
+ WA_APXS_GET([CPPFLAGS],[${APXS}],[EXTRA_CPPFLAGS])
+
+ WA_APXS_GET([LDFLAGS],[${APXS}],[LDFLAGS])
+ WA_APXS_GET([LDFLAGS],[${APXS}],[NOTEST_LDFLAGS])
+ WA_APXS_GET([LDFLAGS],[${APXS}],[EXTRA_LDFLAGS])
+
+ WA_APXS_GET([CFLAGS],[${APXS}],[CFLAGS])
+ WA_APXS_GET([CFLAGS],[${APXS}],[NOTEST_CFLAGS])
+ WA_APXS_GET([CFLAGS],[${APXS}],[EXTRA_CFLAGS])
+
+ WA_APXS_GET([INCLUDES],[${APXS}],[INCLUDEDIR])
+ WA_PATH_DIR([INCLUDES],[${INCLUDES}],[apache 2.0 headers])
+ INCLUDES="-I${INCLUDES}"
+ AC_SUBST([INCLUDES])
+
MODULE="apache-2.0"
fi
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>