cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 2005/07/06 06:36:55 Modified:jk/native configure.in Log: Update version. Revision ChangesPath 1.49 +2 -2 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.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- configure.in 6 Jul 2005 06:58:49 - 1.48 +++ configure.in 6 Jul 2005 13:36:55 - 1.49 @@ -11,7 +11,7 @@ dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk -VERSION=1.2.9 +VERSION=1.2.14 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/04/27 02:24:51 Modified:jk/native configure.in Log: Skip presuming that the libsocket is present. Revision ChangesPath 1.44 +4 -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.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- configure.in 18 Mar 2005 08:17:59 - 1.43 +++ configure.in 27 Apr 2005 09:24:51 - 1.44 @@ -55,11 +55,12 @@ AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()])) dnl check for flock function. AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()])) +dnl check for -lsocket library +AC_CHECK_LIB(socket, socket) +AC_CHECK_LIB(setsockopt, socket) AC_DEFUN([JK_CHECK_SETSOCKOPT], [ AC_MSG_CHECKING(whether to use $1 with setsockopt()) -saved_LIBS=$LIBS -LIBS=$saved_LIBS -lsocket AC_TRY_RUN([ #include sys/types.h #include sys/socket.h @@ -90,7 +91,6 @@ , [ AC_MSG_RESULT([yes]) AC_DEFINE(USE_$1, 1, [Define to use $1 with setsockopt()]) ] , [ AC_MSG_RESULT([no]) ] ) -LIBS=$saved_LIBS ])dnl dnl check for SO_RCVTIMEO and SO_SNDTIMEO - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/04/27 08:06:45 Modified:jk/native configure.in Log: Add -lsocket to the $LIBS if setsockoption is inside libsocket. Revision ChangesPath 1.45 +2 -3 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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- configure.in 27 Apr 2005 09:24:51 - 1.44 +++ configure.in 27 Apr 2005 15:06:45 - 1.45 @@ -56,8 +56,7 @@ dnl check for flock function. AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()])) dnl check for -lsocket library -AC_CHECK_LIB(socket, socket) -AC_CHECK_LIB(setsockopt, socket) +AC_CHECK_LIB(socket, setsockopt, [LIBS=$LIBS -lsocket]) AC_DEFUN([JK_CHECK_SETSOCKOPT], [ AC_MSG_CHECKING(whether to use $1 with setsockopt()) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/03/17 03:35:11 Modified:jk/native configure.in Log: Add --enable-prefork configure flag so that threading code can be excluded when compiling for apache1 or apache2/prefork. Revision ChangesPath 1.40 +17 -1 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.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- configure.in 25 Feb 2005 08:26:03 - 1.39 +++ configure.in 17 Mar 2005 11:35:11 - 1.40 @@ -286,6 +286,22 @@ ]) AC_SUBST(CFLAGS) +dnl CFLAGS for preforks mode +dnl it also allows the CFLAGS environment variable. +CFLAGS=${CFLAGS} +AC_ARG_ENABLE( +prefork, +[ --enable-prefork Turn on prefork web server mode], +[ +case ${enableval} in +y | Y | YES | yes | TRUE | true ) +CFLAGS=${CFLAGS} -DJK_PREFORK +AC_MSG_RESULT([...Enabling Prefork mode...]) +;; +esac +]) +AC_SUBST(CFLAGS) + dnl the APXSCFLAGS is given by apxs to the C compiler dnl the APXSLDFLAGS is given to the linker (for APRVARS). dnl APXSLDFLAGS= - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/03/17 04:31:13 Modified:jk/native configure.in Log: Allow multiple APR include dirs. Fixes #33248 Revision ChangesPath 1.41 +6 -2 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.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- configure.in 17 Mar 2005 11:35:11 - 1.40 +++ configure.in 17 Mar 2005 12:31:13 - 1.41 @@ -145,7 +145,11 @@ APXS_CPPFLAGS= else WEBSERVER=apache-2.0 - APRINCLUDEDIR=-I`$APXS -q APR_INCLUDEDIR` + APRINCLUDEDIR= + INCTEMP=-I`$APXS -q APR_INCLUDEDIR` + for INC in ${INCTEMP}; do + APRINCLUDEDIR=${APRINCLUDEDIR} -I${INC} + done APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR} APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` APACHE_CONFIG_VARS=`${APXS} -q exp_installbuilddir`/config_vars.mk - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/03/17 04:48:40 Modified:jk/native configure.in Log: No need to add -I when calling apxs Revision ChangesPath 1.42 +2 -2 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.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- configure.in 17 Mar 2005 12:31:13 - 1.41 +++ configure.in 17 Mar 2005 12:48:40 - 1.42 @@ -146,7 +146,7 @@ else WEBSERVER=apache-2.0 APRINCLUDEDIR= - INCTEMP=-I`$APXS -q APR_INCLUDEDIR` + INCTEMP=`$APXS -q APR_INCLUDEDIR` for INC in ${INCTEMP}; do APRINCLUDEDIR=${APRINCLUDEDIR} -I${INC} done - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/02/13 04:57:08 Modified:jk/native configure.in Log: Check if flock is available. Revision ChangesPath 1.37 +3 -1 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.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- configure.in 20 Dec 2004 09:33:18 - 1.36 +++ configure.in 13 Feb 2005 12:57:08 - 1.37 @@ -55,6 +55,8 @@ AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()])) +AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()])) + APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk WEBSERVER= apache_dir= - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2005/02/13 05:05:15 Modified:jk/native configure.in Log: Increment version number. Revision ChangesPath 1.38 +2 -2 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.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- configure.in 13 Feb 2005 12:57:08 - 1.37 +++ configure.in 13 Feb 2005 13:05:15 - 1.38 @@ -11,7 +11,7 @@ dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk -VERSION=1.2.7 +VERSION=1.2.9 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2004/12/20 01:33:18 Modified:jk/native configure.in Log: Use AC_CONFIG_HEADER instead AM_CONFIG_HEADER. Hope it will fix gump build failrues. If not I'll revert that. Revision ChangesPath 1.36 +2 -2 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.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configure.in 11 Nov 2004 12:30:47 - 1.35 +++ configure.in 20 Dec 2004 09:33:18 - 1.36 @@ -5,7 +5,7 @@ AC_PREREQ(2.13) AC_INIT(common/jk_worker.h) -AM_CONFIG_HEADER(common/portable.h) +AC_CONFIG_HEADER(common/portable.h) AC_CONFIG_AUX_DIR(scripts/build/unix) AC_CANONICAL_SYSTEM - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native configure.in
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, December 20, 2004 1:33 AM Subject: cvs commit: jakarta-tomcat-connectors/jk/native configure.in mturk 2004/12/20 01:33:18 Modified:jk/native configure.in Log: Use AC_CONFIG_HEADER instead AM_CONFIG_HEADER. Hope it will fix gump build failrues. If not I'll revert that. With Gump back to configuring with --with-apsx, the problem currently is a bug in HTTPD. It seems that `${prefix}/bin/apxs -q LIBTOOL` gives the wrong location for libtool, and that breaks the mod_jk build. For Gump to use --with-apache, it also needs --with-apr and --with-apr-util. It could probably be ported from Jk2, but I'm not sure how useful they are for Jk. This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2004/11/11 04:30:47 Modified:jk/native configure.in Log: Add --enable-maintainer-mode for compiling in full trace messages (like on httpd) Revision ChangesPath 1.35 +19 -3 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.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- configure.in 23 Jul 2004 09:23:38 - 1.34 +++ configure.in 11 Nov 2004 12:30:47 - 1.35 @@ -5,7 +5,7 @@ AC_PREREQ(2.13) AC_INIT(common/jk_worker.h) -AC_CONFIG_HEADER(common/portable.h) +AM_CONFIG_HEADER(common/portable.h) AC_CONFIG_AUX_DIR(scripts/build/unix) AC_CANONICAL_SYSTEM @@ -220,12 +220,28 @@ CFLAGS=${CFLAGS} AC_ARG_ENABLE( EAPI, -[ --enable-EAPI Enable EAPI support (mod_ssl, Apache 1.3)], +[ --enable-EAPI Enable EAPI support (mod_ssl, Apache 1.3)], [ case ${enableval} in y | Y | YES | yes | TRUE | true ) CFLAGS=${CFLAGS} -DEAPI AC_MSG_RESULT([...Enabling EAPI Support...]) +;; +esac +]) +AC_SUBST(CFLAGS) + +dnl CFLAGS for maintainer mode +dnl it also allows the CFLAGS environment variable. +CFLAGS=${CFLAGS} +AC_ARG_ENABLE( +maintainer-mode, +[ --enable-maintainer-mode Turn on debugging and compile time warnings], +[ +case ${enableval} in +y | Y | YES | yes | TRUE | true ) +CFLAGS=${CFLAGS} -DDEBUG -Wall +AC_MSG_RESULT([...Enabling Maintainer mode...]) ;; esac ]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2004/07/23 02:10:44 Modified:jk/native configure.in Log: Fix version Revision ChangesPath 1.33 +2 -2 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.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- configure.in 13 Jul 2004 13:31:19 - 1.32 +++ configure.in 23 Jul 2004 09:10:44 - 1.33 @@ -11,7 +11,7 @@ dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk -VERSION=1.2.4 +VERSION=1.2.6 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in STATUS.txt
hgomez 2004/07/23 02:23:38 Modified:jk/native/common jk_version.h jk/native configure.in STATUS.txt Log: jk 1.2.6 tagged as JK_1_2_6_rel, we're now in jk 1.2.7-dev Revision ChangesPath 1.23 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_version.h Index: jk_version.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_version.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_version.h 23 Jul 2004 09:20:09 - 1.22 +++ jk_version.h 23 Jul 2004 09:23:37 - 1.23 @@ -25,14 +25,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 -#define JK_VERFIX 6 -#define JK_VERSTRING1.2.6 +#define JK_VERFIX 7 +#define JK_VERSTRING1.2.7 /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING 1 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 /** END OF AREA TO MODIFY BEFORE RELEASING */ #if !defined(PACKAGE) 1.34 +2 -2 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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- configure.in 23 Jul 2004 09:10:44 - 1.33 +++ configure.in 23 Jul 2004 09:23:38 - 1.34 @@ -11,7 +11,7 @@ dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk -VERSION=1.2.6 +VERSION=1.2.7 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) 1.3 +2 -1 jakarta-tomcat-connectors/jk/native/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/STATUS.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS.txt23 Jul 2004 09:17:02 - 1.2 +++ STATUS.txt23 Jul 2004 09:23:38 - 1.3 @@ -3,6 +3,7 @@ Release: +1.2.7 : in progress 1.2.6 : released July 23, 2004 1.2.5 : released September 30, 2003 1.2.4 : released May 27, 2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 2004/02/25 07:29:54 Modified:jk/native configure.in Log: PR 11008 and synchronize with native2 (AC_CANONICAL_SYSTEM!). Revision ChangesPath 1.30 +5 -5 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- configure.in 6 Feb 2004 14:12:59 - 1.29 +++ configure.in 25 Feb 2004 15:29:54 - 1.30 @@ -6,6 +6,7 @@ AC_PREREQ(2.13) AC_INIT(common/jk_worker.h) AC_CONFIG_AUX_DIR(scripts/build/unix) +AC_CANONICAL_SYSTEM dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk @@ -13,6 +14,9 @@ AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) +AC_PROG_CC +AC_PROG_LD + dnl Not sure what it does, but the libtool manual seems to require this dnl It should use the native platform dlopen ( if available ) AC_LIBTOOL_DLOPEN @@ -20,10 +24,6 @@ dnl AM_PROG_LIBTOOL often causes problems. dnl I have solved them once using aclocal --acdir=/usr/local/share/aclocal/ AM_PROG_LIBTOOL - -AC_PROG_CC - -AC_PROG_LD AC_PATH_PROG(TEST,test,$PATH)dnl AC_SUBST(TEST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2004/02/06 06:09:34 Modified:jk/native configure.in Log: apxs -q installbuildir allready provide the 'build' dir Revision ChangesPath 1.28 +2 -2 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.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- configure.in 21 Jan 2004 15:50:39 - 1.27 +++ configure.in 6 Feb 2004 14:09:34 - 1.28 @@ -103,7 +103,7 @@ APRINCLUDEDIR=-I`$APXS -q APR_INCLUDEDIR` APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR} APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` -APACHE_CONFIG_VARS=`${APXS} -q installbuilddir`/build/config_vars.mk +APACHE_CONFIG_VARS=`${APXS} -q installbuilddir`/config_vars.mk LIBTOOL=`$APXS -q LIBTOOL` fi AC_MSG_RESULT([building connector for \$WEBSERVER\]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2004/02/06 06:12:59 Modified:jk/native configure.in Log: The real install build dir which is where live the build datas Revision ChangesPath 1.29 +2 -2 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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure.in 6 Feb 2004 14:09:34 - 1.28 +++ configure.in 6 Feb 2004 14:12:59 - 1.29 @@ -103,7 +103,7 @@ APRINCLUDEDIR=-I`$APXS -q APR_INCLUDEDIR` APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR} APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` -APACHE_CONFIG_VARS=`${APXS} -q installbuilddir`/config_vars.mk +APACHE_CONFIG_VARS=`${APXS} -q exp_installbuilddir`/config_vars.mk LIBTOOL=`$APXS -q LIBTOOL` fi AC_MSG_RESULT([building connector for \$WEBSERVER\]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2004/01/21 07:50:39 Modified:jk/native configure.in Log: Make sure the config_vars.mk location is correct, even when installbuilddir is not the same that apxs -q PREFIX (ie: SUSE Apache2 rpm) Revision ChangesPath 1.27 +2 -2 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.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- configure.in 10 Oct 2003 07:35:22 - 1.26 +++ configure.in 21 Jan 2004 15:50:39 - 1.27 @@ -103,7 +103,7 @@ APRINCLUDEDIR=-I`$APXS -q APR_INCLUDEDIR` APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR} APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` -APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk +APACHE_CONFIG_VARS=`${APXS} -q installbuilddir`/build/config_vars.mk LIBTOOL=`$APXS -q LIBTOOL` fi AC_MSG_RESULT([building connector for \$WEBSERVER\]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2003/10/10 00:35:22 Modified:jk/native configure.in Log: APR includes could be in a differents location that Apache 2.0 includes. For instance Redhat use 2 locations in it's RawHide version of 2.0.47 Revision ChangesPath 1.26 +3 -2 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- configure.in 24 Jul 2003 08:15:22 - 1.25 +++ configure.in 10 Oct 2003 07:35:22 - 1.26 @@ -100,7 +100,8 @@ APXS_CPPFLAGS= else WEBSERVER=apache-2.0 - APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR + APRINCLUDEDIR=-I`$APXS -q APR_INCLUDEDIR` + APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR} APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk LIBTOOL=`$APXS -q LIBTOOL` - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2003/07/24 01:15:22 Modified:jk/native configure.in Log: When Apache 2.0 is found, add define HAVE_APR Revision ChangesPath 1.25 +2 -2 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- configure.in 5 Jun 2003 09:15:37 - 1.24 +++ configure.in 24 Jul 2003 08:15:22 - 1.25 @@ -100,7 +100,7 @@ APXS_CPPFLAGS= else WEBSERVER=apache-2.0 - APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` + APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk LIBTOOL=`$APXS -q LIBTOOL` - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 2003/06/05 02:15:37 Modified:jk/native configure.in Log: Fix the error when using apxs of Apache-2.0: Use apache libtool instead system. The error was: +++ libtool: link: `../common/jk_ajp12_worker.lo' is not a valid libtool object +++ Revision ChangesPath 1.24 +2 -1 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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- configure.in 27 May 2003 13:04:46 - 1.23 +++ configure.in 5 Jun 2003 09:15:37 - 1.24 @@ -103,6 +103,7 @@ APXSCFLAGS=`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` APXSCPPFLAGS=`${APXS} -q EXTRA_CPPFLAGS` APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk +LIBTOOL=`$APXS -q LIBTOOL` fi AC_MSG_RESULT([building connector for \$WEBSERVER\]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
hgomez 2002/11/26 08:08:48 Modified:jk/xdocs/common AJPv13-extensions-proposal.xml jk/xdocs/jk aphowto.xml workershowto.xml quickhowto.xml jk/native configure.in Log: Update to follow JK 1.2.1 release Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/jk/xdocs/common/AJPv13-extensions-proposal.xml Index: AJPv13-extensions-proposal.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/common/AJPv13-extensions-proposal.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AJPv13-extensions-proposal.xml7 Oct 2002 07:47:49 - 1.1 +++ AJPv13-extensions-proposal.xml26 Nov 2002 16:08:48 - 1.2 @@ -141,7 +141,7 @@ level supported (level1/level2/level3...) The Web server info will contain web server info and -connector name (ie Apache 1.3.26 + mod_ssl 2.8.8 + mod_jk 1.2.0 + mod_perl 1.25). +connector name (ie Apache 1.3.26 + mod_ssl 2.8.8 + mod_jk 1.2.1 + mod_perl 1.25). The servlet engine will mask the negociation mask with it's own mask (what it can do) and return it when loggin is accepted. 1.16 +11 -11jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml Index: aphowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/aphowto.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- aphowto.xml 6 Nov 2002 16:59:51 - 1.15 +++ aphowto.xml 26 Nov 2002 16:08:48 - 1.16 @@ -162,28 +162,28 @@ /p p -For example JK 1.2.0 can be found a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/; +For example JK 1.2.1 can be found a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/; here/a and contains the following: /p p table trthLocation/ththContents/th/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/aix/;aix/a/tdtdSAVF including mod_jk for Apache 2.0 for iSeries V5R1/V5R2/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/iseries/;iseries/a/tdtdSAVF including mod_jk for Apache 2.0 for iSeries V5R1/V5R2/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/linux/;linux/a/tdtdmod_jk.so (Apache 1.3 standard API and EAPI and Apache 2.0) for some Linux Archs/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/macosx/;macosx/a/tdtdContains the mod_jk.so for MacOS X/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/netware/;netware/a/tdtdmod_jk.nlm and nsapi.nlm for Netware/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/rpms/;rpms/a/tdtdContains the rpms (including sources and i386/ppc architectures)/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/solaris6/;solaris6/a/tdtdContains the mod_jk.so for Solaris 6/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/solaris8/;solaris8/a/tdtdContains the mod_jk.so for Solaris 8/td/tr - trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.0/bin/win32/;win32/a/tdtdContains the mod_jk.dll for Windows as well as other useful binaries./td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/aix/;aix/a/tdtdSAVF including mod_jk for Apache 2.0 for iSeries V5R1/V5R2/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/iseries/;iseries/a/tdtdSAVF including mod_jk for Apache 2.0 for iSeries V5R1/V5R2/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/linux/;linux/a/tdtdmod_jk.so (Apache 1.3 standard API and EAPI and Apache 2.0) for some Linux Archs/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/macosx/;macosx/a/tdtdContains the mod_jk.so for MacOS X/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/netware/;netware/a/tdtdmod_jk.nlm and nsapi.nlm for Netware/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/rpms/;rpms/a/tdtdContains the rpms (including sources and i386/ppc architectures)/td/tr + trtda href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/bin/solaris6/;solaris6/a/tdtdContains the mod_jk.so for Solaris 6/td/tr + trtda
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
costin 01/10/25 13:11:12 Modified:jk/native configure.in Log: Integrate the JNI library to the configure system. Revision ChangesPath 1.13 +6 -2 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.in 2001/09/06 08:49:39 1.12 +++ configure.in 2001/10/25 20:11:12 1.13 @@ -1,7 +1,7 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.12 2001/09/06 08:49:39 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.13 2001/10/25 20:11:12 costin Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) @@ -222,7 +222,9 @@ AC_SUBST(APXSLDFLAGS) if ${TEST} -n ${JK_JNI_WORKER} ; then - + +WEBSERVER=jni ${WEBSERVER} + dnl Find the JDK dnl Results go in JAVA_HOME dnl Also sets JAVA_PLATFORM to 1 for 1.1 and to 2 for 1.2 @@ -411,6 +413,7 @@ 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 @@ -433,4 +436,5 @@ apache-2.0/Makefile.apxs common/Makefile common/list.mk + jni/Makefile ])
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 01/09/06 01:49:39 Modified:jk/native configure.in Log: Improve the error message with the given apxs is no valid. Revision ChangesPath 1.12 +3 -3 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure.in 2001/08/31 12:16:56 1.11 +++ configure.in 2001/09/06 08:49:39 1.12 @@ -1,7 +1,7 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.11 2001/08/31 12:16:56 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.12 2001/09/06 08:49:39 jfclere Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) @@ -73,10 +73,10 @@ AC_MSG_ERROR(Invalid location for apxs: '${APXS}') fi -$APXS -q PREFIX /dev/null 2/dev/null || apxs_support=false +${APXS} -q PREFIX /dev/null 2/dev/null || apxs_support=false if ${TEST} ${apxs_support} = false ; then -AC_MSG_RESULT(could not find apxs) +AC_MSG_RESULT(could not find ${APXS}) AC_MSG_ERROR(You must specify a valid --with-apxs path) fi
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 01/08/31 03:37:42 Modified:jk/native configure.in Log: Improve the testing of the apache version (forgotten in previous commit!). Revision ChangesPath 1.10 +2 -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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.in 2001/07/06 16:39:16 1.9 +++ configure.in 2001/08/31 10:37:42 1.10 @@ -1,7 +1,7 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.9 2001/07/06 16:39:16 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.10 2001/08/31 10:37:42 jfclere Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) @@ -81,9 +81,7 @@ fi dnl test apache version -$RM -rf test -$APXS -n test -g -APA=`grep STANDARD20 test/mod_test.c` +APA=`${GREP} STANDARD20 ${APXS}` $RM -rf test if ${TEST} -z $APA ; then WEBSERVER=apache-1.3
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 01/08/31 05:16:57 Modified:jk/native configure.in Log: remove the last rm... Revision ChangesPath 1.11 +1 -2 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure.in 2001/08/31 10:37:42 1.10 +++ configure.in 2001/08/31 12:16:56 1.11 @@ -1,7 +1,7 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.10 2001/08/31 10:37:42 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.11 2001/08/31 12:16:56 jfclere Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) @@ -82,7 +82,6 @@ dnl test apache version APA=`${GREP} STANDARD20 ${APXS}` -$RM -rf test if ${TEST} -z $APA ; then WEBSERVER=apache-1.3 else
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 01/07/02 02:46:14 Modified:jk/native configure.in Log: Take out the logic that creates jk_version.h Revision ChangesPath 1.8 +3 -30 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.in 2001/06/22 16:25:11 1.7 +++ configure.in 2001/07/02 09:46:12 1.8 @@ -1,24 +1,16 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.7 2001/06/22 16:25:11 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.8 2001/07/02 09:46:12 jfclere Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) AC_CONFIG_AUX_DIR(scripts/build/unix) -AM_CONFIG_HEADER(common/jk_version.h) -dnl package and version. +dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk -VERMAJOR=1 -VERMINOR=2 -VERFIX=0 -VERBETA=1 -dnl set VERISRELEASE to 1 when release (do not forget to commit!) -VERISRELEASE=0 +VERSION=1.2.0 -VERSION=${VERMAJOR}.${VERMINOR}.${VERFIX} - AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) dnl AM_PROG_LIBTOOL often causes problems. @@ -49,25 +41,6 @@ AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl AC_SUBST(MKDIR) - -dnl prepare the string and value for mod_jk version logic -JK_EXPOSED_VERSION=${PACKAGE}/${VERSION} -if ${TEST} ${VERISRELEASE} -eq 0 ; then -JK_EXPOSED_VERSION=${JK_EXPOSED_VERSION}-beta-${VERBETA} -else -VERBETA=255 -fi - -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -# -# Adds in version.h -# -AC_DEFINE_UNQUOTED(JK_EXPOSED_VERSION,$JK_EXPOSED_VERSION, - [ Printable string for version ] ) -AC_DEFINE_UNQUOTED(JK_VERSION,((($VERMAJOR) 24) + (($VERMINOR) 16) + (($VERFIX) 8) + ($VERBETA)), - [ Version in hex :like 010200ff for release 01020001 for beta 1. ] ) WEBSERVER= apache_dir=
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
jfclere 01/06/22 09:25:12 Modified:jk/native configure.in Log: Add jk_version.h (Damned 3 commits for that, I am bad!). Revision ChangesPath 1.7 +2 -2 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure.in 2001/06/21 14:47:59 1.6 +++ configure.in 2001/06/22 16:25:11 1.7 @@ -1,12 +1,12 @@ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.6 2001/06/21 14:47:59 jfclere Exp $)dnl +AC_REVISION($Id: configure.in,v 1.7 2001/06/22 16:25:11 jfclere Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_ajp13.h) AC_CONFIG_AUX_DIR(scripts/build/unix) -AM_CONFIG_HEADER(common/version.h) +AM_CONFIG_HEADER(common/jk_version.h) dnl package and version. PACKAGE=mod_jk