You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Cynthia Trevino <ct...@srgflood.com> on 2004/02/17 16:47:16 UTC
REMOVE EMAIL
PLEASE REMOVE MY EMAIL ADDRESS FROM YOUR LIST!!!
----- Original Message -----
From: "CustServ1" <cu...@ltdcommodities.com>
To: "Tomcat Developers List" <to...@jakarta.apache.org>
Sent: Monday, February 16, 2004 2:53 PM
Subject: 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:
> -------------------------
>
> truk 2004/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 Changes Path
> 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 -0000 1.4
> +++ Makefile.in 13 Feb 2004 21:38:26 -0000 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 -0000 1.9
> +++ Makefile.apxs.in 13 Feb 2004 21:38:26 -0000 1.10
> @@ -3,28 +3,28 @@
> APXS=@APXS@
> OS=@OS@
> JK_DIR := ../..
> -APXS_LDFLAGS=@APXS_LDFLAGS@
> -APXS_CFLAGS=@APXS_CFLAGS@
> COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
> APR_CFLAGS=@APR_CFLAGS@
> -APR_LDFLAGS=@APR_LDFLAGS@
> C_FILES=jk_service_apache13.c mod_jk2.c
> JAVA_HOME=@JAVA_HOME@
> -APRLIBS=`@APR_DIR@/apr-config --libs`
> -
> -JK=../../common/
> -JKINC=../../include/
> -JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
> +APR_LIBS=`@APR_DIR@/bin/apr-config --link-ld`
> +APR_UTIL_LIBS=`@APR_UTIL_DIR@/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 -0000 1.11
> +++ jk_apr.m4 13 Feb 2004 21:38:26 -0000 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],
> - [${SHELL} ./configure --with-apr=${APR_DIR}],
> + [${SHELL} ./configure --prefix=${APR_UTIL_DIR}
> --with-apr=${APR_DIR}],
> [apr-util],
> [${APR_UTIL_DIR}])
> if ${TEST} "${tempret}" = "0"; then
> @@ -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}/${apr_util_libname}"
> + APR_LDFLAGS="${APR_LDFLAGS}
> ${APR_UTIL_DIR}/lib/${apr_util_libname}"
> APR_UTIL_LIBDIR=""
> use_apr=true
> COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org