Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
Dear Customer,
Thank you for writing LTD Commodities.
We value your business. If you have any questions in the future, please
let us know.
Sincerely,
Bonnie Cawley
Internet Customer Service Department
www.ltdcommodities.com
**Did you know that you can now request an account statement or a copy
of your prepaid order online? Visit our web site at
www.ltdcommodities.com and click on account information request, which
is located on the left side of our homepage**
Original Message Follows:
-
truk2004/02/13 13:38:26
Modified:jk/native2 Makefile.in
jk/native2/server/apache13 Makefile.apxs.in
jk/support jk_apr.m4
Log:
add apxs meta targets and jk2-install-apxs from Guenter Knauf
For apache13:
Change apr and apr-util to install into build dirs
Fixup apxs build and add install target
apxs build is the only way to build on OpenBSD right now
due to libtool issues.
Tested on FreeBSD and OpenBSD so far.
Revision ChangesPath
1.5 +16 -1 jakarta-tomcat-connectors/jk/native2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 10 Nov 2003 11:05:33 - 1.4
+++ Makefile.in 13 Feb 2004 21:38:26 - 1.5
@@ -4,6 +4,12 @@
clean: @APR_CLEAN@ jk2-clean
+build-apxs: @APR_BUILD@ jk2-build-apxs
+
+clean-apxs: @APR_CLEAN@ jk2-clean-apxs
+
+install-apxs: jk2-install-apxs
+
jk2-build:
list='@WEBSERVERS@';for i in $$list; do @@ -22,6 +28,15 @@
fi; done;
+jk2-install-apxs:
+ list='@WEBSERVERS@'; +for i in $$list; do + echo Making
$$target in $$i; + if test $$i != .; then + (cd $$i
$(MAKE) -f Makefile.apxs install) || exit 1; +fi; + done;
+
jk2-clean:
list='@WEBSERVERS@';for i in $$list; do @@ -41,7 +56,7 @@
done;
apr-build:
- ( cd @APR_DIR@ make cd @APR_UTIL_DIR@ make )
+ ( cd @APR_DIR@ make install cd @APR_UTIL_DIR@ make install
)
apr-clean:
( cd @APR_DIR@ make clean cd @APR_UTIL_DIR@ make clean )
1.10 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.
apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.9
+++ Makefile.apxs.in 13 Feb 2004 21:38:26 - 1.10
@@ -3,28 +3,28 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
-
-JK=../../common/
-JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
[EMAIL PROTECTED]@/bin/apr-config --link-ld`
[EMAIL PROTECTED]@/bin/apu-config --link-ld`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
@HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L
${JAVA_HOME}/lib/${ARCH}/native_threads
endif
+JK_CFLAGS=-I ${JK_DIR}/include -DCHUNK_SIZE=4096 -DUSE_APACHE_MD5
${APR_CFLAGS} -DHAVE_MMAP
+
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}
${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} ${APR_LIBS}
+ $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES}
${COMMON_C_FILES} + ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+
+install: mod_jk2.so
+ $(APXS) -i mod_jk2.so
clean:
rm -f *.o *.so
1.12 +5 -5 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_apr.m4 11 Feb 2004 15:08:14 - 1.11
+++ jk_apr.m4 13 Feb 2004 21:38:26 - 1.12
@@ -129,7 +129,7 @@
tempret=0
JK_EXEC(
[tempret],
- [${SHELL} ./configure --enable-static --disable-shared
${APR_CONFIGURE_ARGS}],
+ [${SHELL} ./configure --prefix=${APR_DIR}
--with-installbuilddir=${APR_DIR}/instbuild --disable-shared
${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} ${tempret} = 0; then
@@
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
truk2004/02/13 13:38:26
Modified:jk/native2 Makefile.in
jk/native2/server/apache13 Makefile.apxs.in
jk/support jk_apr.m4
Log:
add apxs meta targets and jk2-install-apxs from Guenter Knauf
For apache13:
Change apr and apr-util to install into build dirs
Fixup apxs build and add install target
apxs build is the only way to build on OpenBSD right now
due to libtool issues.
Tested on FreeBSD and OpenBSD so far.
Revision ChangesPath
1.5 +16 -1 jakarta-tomcat-connectors/jk/native2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 10 Nov 2003 11:05:33 - 1.4
+++ Makefile.in 13 Feb 2004 21:38:26 - 1.5
@@ -4,6 +4,12 @@
clean: @APR_CLEAN@ jk2-clean
+build-apxs: @APR_BUILD@ jk2-build-apxs
+
+clean-apxs: @APR_CLEAN@ jk2-clean-apxs
+
+install-apxs: jk2-install-apxs
+
jk2-build:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -22,6 +28,15 @@
fi; \
done;
+jk2-install-apxs:
+ list='@WEBSERVERS@'; \
+ for i in $$list; do \
+ echo Making $$target in $$i; \
+ if test $$i != .; then \
+ (cd $$i $(MAKE) -f Makefile.apxs install) || exit 1; \
+ fi; \
+ done;
+
jk2-clean:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -41,7 +56,7 @@
done;
apr-build:
- ( cd @APR_DIR@ make cd @APR_UTIL_DIR@ make )
+ ( cd @APR_DIR@ make install cd @APR_UTIL_DIR@ make install )
apr-clean:
( cd @APR_DIR@ make clean cd @APR_UTIL_DIR@ make clean )
1.10 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.9
+++ Makefile.apxs.in 13 Feb 2004 21:38:26 - 1.10
@@ -3,28 +3,28 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
-
-JK=../../common/
-JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
[EMAIL PROTECTED]@/bin/apr-config --link-ld`
[EMAIL PROTECTED]@/bin/apu-config --link-ld`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
+JK_CFLAGS=-I ${JK_DIR}/include -DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS}
-DHAVE_MMAP
+
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
${C_FILES} ${COMMON_C_FILES} ${APR_LIBS}
+ $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} \
+ ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+
+install: mod_jk2.so
+ $(APXS) -i mod_jk2.so
clean:
rm -f *.o *.so
1.12 +5 -5 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_apr.m4 11 Feb 2004 15:08:14 - 1.11
+++ jk_apr.m4 13 Feb 2004 21:38:26 - 1.12
@@ -129,7 +129,7 @@
tempret=0
JK_EXEC(
[tempret],
- [${SHELL} ./configure --enable-static --disable-shared
${APR_CONFIGURE_ARGS}],
+ [${SHELL} ./configure --prefix=${APR_DIR}
--with-installbuilddir=${APR_DIR}/instbuild --disable-shared ${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} ${tempret} = 0; then
@@ -138,7 +138,7 @@
AC_MSG_ERROR(apr configure failed with ${tempret})
fi
JK_APR_LIBNAME(apr_libname,${APR_DIR})
-APR_LDFLAGS=${APR_DIR}/${apr_libname}
+APR_LDFLAGS=${APR_DIR}/lib/${apr_libname}
APR_LIBDIR=
use_apr=true
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
@@ -195,7 +195,7 @@
tempret=0
JK_EXEC(
[tempret],
-
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
jfclere 2004/02/11 06:24:20
Modified:jk/support jk_apr.m4
Log:
Add SHELL otherwise I get on ReliantUnix:
./configure[9038]: ./configure: not found
Revision ChangesPath
1.10 +2 -2 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_apr.m4 6 Feb 2004 12:14:53 - 1.9
+++ jk_apr.m4 11 Feb 2004 14:24:20 - 1.10
@@ -129,7 +129,7 @@
tempret=0
JK_EXEC(
[tempret],
- [./configure --enable-static --disable-shared ${APR_CONFIGURE_ARGS}],
+ [${SHELL} ./configure --enable-static --disable-shared
${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} ${tempret} = 0; then
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
jfclere 2004/02/11 07:08:14
Modified:jk/support jk_apr.m4
Log:
Oops I missed this one.
Revision ChangesPath
1.11 +2 -2 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_apr.m4 11 Feb 2004 14:24:20 - 1.10
+++ jk_apr.m4 11 Feb 2004 15:08:14 - 1.11
@@ -195,7 +195,7 @@
tempret=0
JK_EXEC(
[tempret],
- [./configure --with-apr=${APR_DIR}],
+ [${SHELL} ./configure --with-apr=${APR_DIR}],
[apr-util],
[${APR_UTIL_DIR}])
if ${TEST} ${tempret} = 0; then
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
jfclere 2004/02/06 04:14:53
Modified:jk/native2/server/apache13 Makefile.in
jk/support jk_apr.m4
Log:
Arrange the libtool name. Use *.la instead guessed names.
Revision ChangesPath
1.10 +6 -4 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 5 Feb 2004 17:40:22 - 1.9
+++ Makefile.in 6 Feb 2004 12:14:53 - 1.10
@@ -9,7 +9,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
ifdef JAVA_HOME
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
@@ -79,10 +78,13 @@
# -- Targets
-all: prepare ${BUILD_DIR}/mod_jk2.so
+all: prepare ${BUILD_DIR}/mod_jk2.so
-${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
- ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@ ${APR_LIBS}
+${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
+
+${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
+ ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
1.9 +5 -5 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_apr.m4 10 Nov 2003 11:05:33 - 1.8
+++ jk_apr.m4 6 Feb 2004 12:14:53 - 1.9
@@ -138,7 +138,7 @@
AC_MSG_ERROR(apr configure failed with ${tempret})
fi
JK_APR_LIBNAME(apr_libname,${APR_DIR})
-APR_LDFLAGS=${APR_DIR}/.libs/${apr_libname}
+APR_LDFLAGS=${APR_DIR}/${apr_libname}
APR_LIBDIR=
use_apr=true
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
@@ -204,7 +204,7 @@
AC_MSG_ERROR(apr-util configure failed with ${tempret})
fi
JK_APR_UTIL_LIBNAME(apr_util_libname,${APR_UTIL_DIR})
-APR_LDFLAGS=${APR_LDFLAGS} ${APR_UTIL_DIR}/.libs/${apr_util_libname}
+APR_LDFLAGS=${APR_LDFLAGS} ${APR_UTIL_DIR}/${apr_util_libname}
APR_UTIL_LIBDIR=
use_apr=true
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
@@ -326,7 +326,7 @@
if ${TEST} -z ${jk_apr_get_tempval} ; then
AC_MSG_ERROR([$2/apr-config --link-libtool failed])
fi
-jk_apr_get_tempval=`basename ${jk_apr_get_tempval} | sed 's/\.la/\.a/g'`
+jk_apr_get_tempval=`basename ${jk_apr_get_tempval}`
$1=${jk_apr_get_tempval}
AC_MSG_RESULT([${jk_apr_get_tempval}])
unset jk_apr_get_tempval
@@ -350,7 +350,7 @@
if ${TEST} -z ${jk_apu_get_tempval} ; then
AC_MSG_ERROR([$2/apu-config --link-libtool failed])
fi
-jk_apu_get_tempval=`basename ${jk_apu_get_tempval} | sed 's/\.la/\.a/g'`
+jk_apu_get_tempval=`basename ${jk_apu_get_tempval}`
$1=${jk_apu_get_tempval}
AC_MSG_RESULT([${jk_apu_get_tempval}])
unset jk_apu_get_tempval
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4 jk_apxs.m4
[EMAIL PROTECTED] a écrit : Oups, Eclipse didn't understand the patch files (/dev/null) and sus garbage jk_apxs.m4, correct file to be commited right now... hgomez 2003/11/04 04:48:05 1.7 +131 -1jakarta-tomcat-connectors/jk/support/jk_apxs.m4 Index: jk_apxs.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_apxs.m4 25 Sep 2003 15:23:56 - 1.6 +++ jk_apxs.m4 4 Nov 2003 12:48:05 - 1.7 @@ -1,4 +1,132 @@ dnl = +dnl = +dnl +dnl The Apache Software License, Version 1.1 +dnl +dnl Copyright (c) 1999-2003 The Apache Software Foundation. +dnlAll rights reserved. +dnl +dnl = +dnl +dnl Redistribution and use in source and binary forms, with or without modi- +dnl fication, are permitted provided that the following conditions are met: +dnl +dnl 1. Redistributions of source code must retain the above copyright notice +dnl notice, this list of conditions and the following disclaimer. +dnl +dnl 2. Redistributions in binary form must reproduce the above copyright +dnl notice, this list of conditions and the following disclaimer in the +dnl documentation and/or other materials provided with the distribution. +dnl +dnl 3. The end-user documentation included with the redistribution, if any, +dnl must include the following acknowlegement: +dnl +dnlThis product includes software developed by the Apache Software +dnl Foundation http://www.apache.org/. +dnl +dnl Alternately, this acknowlegement may appear in the software itself, if +dnl and wherever such third-party acknowlegements normally appear. +dnl +dnl 4. The names The Jakarta Project, Apache WebApp Module, and Apache +dnl Software Foundation must not be used to endorse or promote products +dnl derived from this software without prior written permission. For +dnl written permission, please contact [EMAIL PROTECTED]. +dnl +dnl 5. Products derived from this software may not be called Apache nor may +dnl Apache appear in their names without prior written permission of the +dnl Apache Software Foundation. +dnl +dnl THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES +dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY +dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +dnl POSSIBILITY OF SUCH DAMAGE. +dnl +dnl = +dnl +dnl This software consists of voluntary contributions made by many indivi- +dnl duals on behalf of the Apache Software Foundation. For more information +dnl on the Apache Software Foundation, please see http://www.apache.org/. +dnl +dnl = + +dnl -- +dnl Author Pier Fumagalli [EMAIL PROTECTED] +dnl Version $Id$ +dnl -- + +dnl -- +dnl JK_EXEC +dnl Execute a program filtering its output (pretty printing). +dnl +dnl Parameters: +dnl $1 = name of the variable containing the return value (error code). +dnl $2 = name of the binary/script to invoke +dnl $3 = message used for pretty printing output +dnl $4 = the directory where the command must be executed +dnl -- +AC_DEFUN( + [JK_EXEC], + [ +jk_exec_curdir=`pwd` +if test -d $4 ; then + cd $4 +else + AC_MSG_ERROR([can't switch to directory $4]) +fi + +echo invoking \$2\ +echo in directory \$4\ +echo -1 retvalue.tmp + +set $2 +jk_exec_file=[$]1 +
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4 jk_apxs.m4
hgomez 2003/11/04 04:48:05
Modified:jk/native2 configure.in Makefile.in
jk/support jk_apr.m4 jk_apxs.m4
Log:
Latest apr / apr_utils patch.
Provided by Kurt Muller
Revision ChangesPath
1.12 +33 -9 jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure.in 3 Nov 2003 09:49:58 - 1.11
+++ configure.in 4 Nov 2003 12:48:04 - 1.12
@@ -64,6 +64,7 @@
dnl sinclude(../support/jk_apache_static.m4)
sinclude(../support/jk_apxs.m4)
sinclude(../support/jk_ws.m4)
+sinclude(../support/jk_exec.m4)
sinclude(../support/jk_apr.m4)
sinclude(../support/jk_tchome.m4)
sinclude(../support/jk_java.m4)
@@ -172,6 +173,7 @@
dnl APR settings
+JK_APR_THREADS()
JK_APR([include/apr.h.in])
JK_APR_INCDIR([apr.h])
JK_APR_LIBDIR()
@@ -203,16 +205,37 @@
AC_SUBST(WEBSERVERS)
-dnl check if apache 1.3 selected with jni support
+dnl apache 1.3 consistancy checks
if ! ${TEST} -z $APACHE_HOME ; then
-dnl check jni wanted
- if ${TEST} ${use_jni} = true; then
- if ! ${TEST} ${use_apr} = true; then
- AC_MSG_ERROR(Apache 1.3 need apr to use jni)
- fi
- fi
+dnl check if apache 1.3 was selected without apr sources
+if ${TEST} -z $APR_BUILD; then
+AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use
--with-apr])
+fi
+dnl make sure compiler matchs apxs
+if ${TEST} $APACHE_CC != $CC; then
+AC_MSG_RESULT([error])
+AC_MSG_RESULT([compiler discovered by configure: ${CC}])
+AC_MSG_RESULT([compiler used by apache: ${APACHE_CC}])
+AC_MSG_RESULT([delete config.cache and try CC=${APACHE_CC}
./configure])
+AC_MSG_ERROR([jk2 and apache compilers must be the same])
+fi
fi
+dnl apache 2 consistancy checks
+if ! ${TEST} -z $APACHE2_HOME ; then
+dnl check if apache 2 was selected with apr sources
+if ${TEST} -z $APR_BUILD; then
+AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
+fi
+dnl make sure compiler matchs apxs
+if ${TEST} $APACHE2_CC != $CC; then
+AC_MSG_RESULT([error])
+AC_MSG_RESULT([compiler discovered by configure: ${CC}])
+AC_MSG_RESULT([compiler used by apache: ${APACHE2_CC}])
+AC_MSG_RESULT([delete config.cache and try CC=${APACHE2_CC}
./configure])
+AC_MSG_ERROR([jk2 and apache compilers must be the same])
+fi
+fi
AC_SUBST(APACHE20_OEXT)
AC_SUBST(LIB_JK_TYPE)
AC_SUBST(INSTALL_TYPE)
@@ -225,6 +248,7 @@
AC_SUBST(APR_HOME)
AC_SUBST(APR_INCDIR)
AC_SUBST(APR_LIBDIR)
+AC_SUBST(APR_CONFIGURE_ARGS)
AC_SUBST(APR_LDFLAGS)
AC_SUBST(COMMON_APR_OBJECTS)
1.3 +1 -1 jakarta-tomcat-connectors/jk/native2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 24 May 2002 07:14:08 - 1.2
+++ Makefile.in 4 Nov 2003 12:48:05 - 1.3
@@ -41,7 +41,7 @@
done;
apr-build:
- ( cd @APR_DIR@ ./configure make )
+ ( cd @APR_DIR@ make )
apr-clean:
( cd @APR_DIR@ make clean )
1.6 +66 -2 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_apr.m4 3 Nov 2003 09:59:45 - 1.5
+++ jk_apr.m4 4 Nov 2003 12:48:05 - 1.6
@@ -64,6 +64,31 @@
dnl --
dnl --
+dnl JK_APR_THREADS
+dnl Configure APR threading for use with --with-apr.
+dnl Result goes into APR_CONFIGURE_ARGS
+dnl --
+AC_DEFUN(
+ [JK_APR_THREADS],
+ [
+AC_ARG_ENABLE(
+ [apr-threads],
+ [ --enable-apr-threadsConfigure APR threading for use with
--with-apr ],
+ [
+case ${enableval} in
+ |yes|YES|true|TRUE)
+APR_CONFIGURE_ARGS=--enable-threads ${APR_CONFIGURE_ARGS}
+ ;;
+
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
hgomez 2003/11/03 01:54:02
Modified:jk/support jk_apr.m4
Log:
apr shared lib is libapr-0.so and libapr-0.a, at least on recent distros.
Provided by Kurt Muller
Revision ChangesPath
1.4 +3 -3 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_apr.m4 25 Sep 2003 15:23:56 - 1.3
+++ jk_apr.m4 3 Nov 2003 09:54:02 - 1.4
@@ -99,7 +99,7 @@
APR_CLEAN=apr-clean
APR_DIR=${tempval}
APR_INCDIR=${tempval}/include
-APR_LDFLAGS=${tempval}/.libs/libapr.a
+APR_LDFLAGS=${tempval}/.libs/libapr-0.a
APR_LIBDIR=
use_apr=true
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
@@ -189,7 +189,7 @@
APR_CLEAN=
APR_DIR=
APR_LIBDIR=${tempval}
- APR_LDFLAGS=-lapr -L${tempval}
+ APR_LDFLAGS=-lapr-0 -L${tempval}
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
use_apr=true
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
hgomez 2003/11/03 01:59:45
Modified:jk/support jk_apr.m4
Log:
Oups didn't track all thread :
use of apr-config to get lib name
Revision ChangesPath
1.5 +2 -2 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apr.m4 3 Nov 2003 09:54:02 - 1.4
+++ jk_apr.m4 3 Nov 2003 09:59:45 - 1.5
@@ -189,7 +189,7 @@
APR_CLEAN=
APR_DIR=
APR_LIBDIR=${tempval}
- APR_LDFLAGS=-lapr-0 -L${tempval}
+ APR_LDFLAGS=`apr-config --link-ld` -L${tempval}
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
use_apr=true
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
hgomez 2002/06/05 02:38:28
Modified:jk/native2 configure.in
jk/support jk_apr.m4
Log:
Check that APR is present when JNI support is asked for Apache 1.3
Revision ChangesPath
1.6 +10 -13jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in 4 Jun 2002 10:29:41 - 1.5
+++ configure.in 5 Jun 2002 09:38:28 - 1.6
@@ -58,7 +58,7 @@
dnl --
dnl Author Henri Gomez [EMAIL PROTECTED]
dnl
-dnl Version $Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $
+dnl Version $Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $
dnl --
dnl sinclude(../support/jk_apache_static.m4)
@@ -71,7 +71,7 @@
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_config.c)
@@ -198,17 +198,14 @@
AC_SUBST(WEBSERVERS)
-AM_CONDITIONAL(MAKE_DYNAMIC_APACHE, ${TEST} ${apache_dir_is_src} = false)
-
-if ${TEST} ${apache_dir_is_src} = false ; then
-dnl
- APACHE20_OEXT=.c
- LIB_JK_TYPE=mod_jk.so
- INSTALL_TYPE=install_dynamic
-else
- APACHE20_OEXT=.lo
- LIB_JK_TYPE=lib_jk.la
- INSTALL_TYPE=install_static
+dnl check if apache 1.3 selected with jni support
+if ! ${TEST} -z $APACHE_HOME ; then
+dnl check jni wanted
+ if ${TEST} ${use_jni} = true; then
+ if ! ${TEST} ${use_apr} = true; then
+ AC_MSG_ERROR(Apache 1.3 need apr to use jni)
+ fi
+ fi
fi
AC_SUBST(APACHE20_OEXT)
1.2 +4 -4 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_apr.m4 24 May 2002 07:05:07 - 1.1
+++ jk_apr.m4 5 Jun 2002 09:38:28 - 1.2
@@ -60,7 +60,7 @@
dnl
dnl Inspired by Pier works on webapp m4 macros :)
dnl
-dnl Version $Id: jk_apr.m4,v 1.1 2002/05/24 07:05:07 hgomez Exp $
+dnl Version $Id: jk_apr.m4,v 1.2 2002/06/05 09:38:28 hgomez Exp $
dnl --
dnl --
@@ -101,8 +101,8 @@
APR_INCDIR=${tempval}/include
APR_LDFLAGS=${tempval}/.libs/libapr.a
APR_LIBDIR=
+ use_apr=true
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
-AC_MSG_RESULT(${APR_DIR})
fi
;;
esac
@@ -148,7 +148,7 @@
APR_DIR=
APR_INCDIR=${tempval}
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
-AC_MSG_RESULT(${APR_INCDIR})
+ use_apr=true
fi
;;
@@ -191,7 +191,7 @@
APR_LIBDIR=${tempval}
APR_LDFLAGS=-lapr -L${tempval}
COMMON_APR_OBJECTS=\${COMMON_APR_OBJECTS}
- AC_MSG_RESULT(${APR_LIBDIR})
+ use_apr=true
fi
;;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
