hgomez 2002/06/27 07:34:18
Modified: jk/native configure.in
jk/native/apache-2.0 Makefile.in
jk/native/common Makefile.in
Log:
APXS/APXS2 flags are needed by the build,
ie -DEAPI or -pthread, so we get flags from
apxs (apache 1.3) or apxs2 (apache 2.0)
Revision Changes Path
1.17 +9 -4 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 22 Nov 2001 08:30:13 -0000 1.16
+++ configure.in 27 Jun 2002 14:34:18 -0000 1.17
@@ -93,8 +93,12 @@
APA=`${GREP} STANDARD20 ${APXS}`
if ${TEST} -z "$APA" ; then
WEBSERVER="apache-1.3"
+ APXSCFLAGS=`$APXS -q CFLAGS`
+ APXS_CPPFLAGS=""
else
WEBSERVER="apache-2.0"
+ APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
+ APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
fi
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
@@ -216,16 +220,17 @@
dnl the APXSCFLAGS is given by apxs to the C compiler
dnl the APXSLDFLAGS is given to the linker (for APRVARS).
-APXSLDFLAGS=""
-APXSCFLAGS=""
+dnl APXSLDFLAGS=""
+dnl APXSCFLAGS=""
if ${TEST} -n "${CFLAGS}" ; then
- APXSCFLAGS="${CFLAGS}"
+ APXSCFLAGS="${APXSCFLAGS} ${CFLAGS}"
fi
dnl the APXSLDFLAGS is normaly empty but APXSCFLAGS is not.
if ${TEST} -n "${LDFLAGS}" ; then
APXSLDFLAGS="-Wl,${LDFLAGS}"
fi
AC_SUBST(APXSCFLAGS)
+AC_SUBST(APXSCPPFLAGS)
AC_SUBST(APXSLDFLAGS)
if ${TEST} -n "${JK_JNI_WORKER}" ; then
1.13 +3 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 2 Nov 2001 18:42:25 -0000 1.12
+++ Makefile.in 27 Jun 2002 14:34:18 -0000 1.13
@@ -6,6 +6,8 @@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
+APXSCFLAGS=@APXSCFLAGS@
+APXSCPPFLAGS=@APXSCPPFLAGS@
# Defaults
libexecdir=${APACHE_DIR}/modules
@@ -23,7 +25,7 @@
JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
-CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} -D_REENTRANT -Wall
${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
+CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} -Wall ${APXSCPPFLAGS}
${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
# Implicit rules
1.9 +4 -1 jakarta-tomcat-connectors/jk/native/common/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 22 May 2002 15:16:21 -0000 1.8
+++ Makefile.in 27 Jun 2002 14:34:18 -0000 1.9
@@ -4,6 +4,9 @@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+APXSLDFLAGS=@APXSLDFLAGS@
+APXSCFLAGS=@APXSCFLAGS@
+APXSCPPFLAGS=@APXSCPPFLAGS@
top_builddir = ..
@@ -14,7 +17,7 @@
include list.mk
JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
-CFLAGS=@apache_include@ @CFLAGS@ ${JAVA_INCL}
+CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
include ../scripts/build/rules.mk
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
