cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
andya 2004/04/29 10:03:31
Modified:jk/native2 configure.in
Added: jk/support jk_dominohome.m4
Log:
Added option to specify the location of the NotesAPI if building the Domino
connector.
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/support/jk_dominohome.m4
Index: jk_dominohome.m4
===
dnl
dnl Copyright 1999-2004 The Apache Software Foundation
dnl
dnl Licensed under the Apache License, Version 2.0 (the License);
dnl you may not use this file except in compliance with the License.
dnl You may obtain a copy of the License at
dnl
dnl http://www.apache.org/licenses/LICENSE-2.0
dnl
dnl Unless required by applicable law or agreed to in writing, software
dnl distributed under the License is distributed on an AS IS BASIS,
dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
dnl See the License for the specific language governing permissions and
dnl limitations under the License.
dnl
dnl --
dnl Author Andy Armstrong [EMAIL PROTECTED]
dnl Shamelessly cribbed from Henri Gomez [EMAIL PROTECTED]
dnl
dnl He was inspired by Pier works on webapp m4 macros :)
dnl
dnl Version $Id: jk_dominohome.m4,v 1.1 2004/04/29 17:03:31 andya Exp $
dnl --
dnl --
dnl JK_DOMHOME
dnl Set the Domino Home directory.
dnl $1 = Domino Name
dnl $2 = Domino VarName
dnl $3 = File which should be present
dnl --
AC_DEFUN(
[JK_DOMHOME],
[
tempval=
AC_MSG_CHECKING([for $1 location])
AC_ARG_WITH(
[$1],
[ --with-$1=DIR Location of $1 ],
[
case ${withval} in
|yes|YES|true|TRUE)
;;
no|NO|false|FALSE)
AC_MSG_ERROR(valid $1 location required)
;;
*)
tempval=${withval}
if ${TEST} ! -d ${tempval} ; then
AC_MSG_ERROR(Not a directory: ${tempval})
fi
if ${TEST} ! -f ${tempval}/$3; then
AC_MSG_ERROR(can't locate ${tempval}/$3)
fi
;;
esac
])
if ${TEST} -z $tempval ; then
AC_MSG_RESULT(not provided)
else
[$2]=${tempval}
AC_MSG_RESULT(${[$2]})
fi
unset tempval
])
dnl vi:set sts=2 sw=2 autoindent:
1.24 +6 -3 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in 26 Mar 2004 13:43:00 - 1.23
+++ configure.in 29 Apr 2004 17:03:31 - 1.24
@@ -26,6 +26,7 @@
sinclude(../support/jk_exec.m4)
sinclude(../support/jk_apr.m4)
sinclude(../support/jk_tchome.m4)
+sinclude(../support/jk_dominohome.m4)
sinclude(../support/jk_java.m4)
sinclude(../support/jk_pcre.m4)
@@ -126,9 +127,11 @@
AC_SUBST(TOMCAT41_HOME)
dnl Domino settings
-JK_TCHOME([domino], [DOMINO_HOME], [libnotes.so])
+JK_DOMHOME([domino], [DOMINO_HOME], [libnotes.so])
+JK_DOMHOME([notesapi], [NOTESAPI], [include/global.h])
AC_SUBST(DOMINO_HOME)
+AC_SUBST(NOTESAPI)
dnl APR settings
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
andya 2004/03/26 05:43:00 Modified:jk/native2 configure.in Log: Added settings for DSAPI filter Revision ChangesPath 1.23 +12 -4 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- configure.in 10 Mar 2004 19:07:40 - 1.22 +++ configure.in 26 Mar 2004 13:43:00 - 1.23 @@ -97,20 +97,23 @@ JK_WS_INCDIR([apache2], [APACHE2], [httpd.h]) JK_WS_LIBDIR([apache2], [APACHE2]) - dnl IIS settings AC_MSG_CHECKING([checking for iis...]) JK_WS_DIR([iis], [IIS], [.], [server/isapi]) JK_WS_INCDIR([iis], [IIS], [.]) JK_WS_LIBDIR([iis], [IIS]) - dnl iPlanet settings AC_MSG_CHECKING([checking for iPlanet...]) JK_WS_DIR([iplanet], [IPLANET], [.], [server/aolserver]) JK_WS_INCDIR([iplanet], [IPLANET], [.]) JK_WS_LIBDIR([iplanet], [IPLANET]) +dnl DSAPI settings +AC_MSG_CHECKING([checking for dsapi...]) +JK_WS_DIR([dsapi], [DOMINO], [server/dsapi/jk_dsapi_plugin.c], [server/dsapi]) +JK_WS_INCDIR([dsapi], [DOMINO], [.]) +JK_WS_LIBDIR([dsapi], [DOMINO]) dnl TOMCATs settings @@ -122,6 +125,10 @@ AC_SUBST(TOMCAT40_HOME) AC_SUBST(TOMCAT41_HOME) +dnl Domino settings +JK_TCHOME([domino], [DOMINO_HOME], [libnotes.so]) + +AC_SUBST(DOMINO_HOME) dnl APR settings @@ -217,6 +224,7 @@ server/apache13/Makefile.apxs server/apache2/Makefile server/apache2/Makefile.apxs + server/dsapi/Makefile ../build.properties:../build.properties.autoconf scripts/build/unix/dummy ]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
[EMAIL PROTECTED] wrote: andya 2004/03/26 05:43:00 Modified:jk/native2 configure.in Log: Added settings for DSAPI filter Revision ChangesPath 1.23 +12 -4 jakarta-tomcat-connectors/jk/native2/configure.in Hi Andy. Did you fix is mandatory for DSAPI ? The 2.0.4 is tagged and released, so your fix won't appears before 2.0.5. Comments welcome - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
jfclere 2004/02/12 01:15:11 Modified:jk/native2 configure.in Log: Otherwise FreeBDS and OpenBSD tells: ltconfig: you must specify a host type if you use `--no-verify' and the configure failed. Revision ChangesPath 1.20 +3 -2 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- configure.in 9 Feb 2004 09:20:28 - 1.19 +++ configure.in 12 Feb 2004 09:15:11 - 1.20 @@ -78,6 +78,7 @@ AC_PREREQ(2.13) AC_INIT(common/jk_config.c) AC_CONFIG_AUX_DIR(scripts/build/unix) +AC_CANONICAL_SYSTEM dnl package and version. (synchronization with common/jk_version.h ?) PACKAGE=mod_jk2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
jfclere 2004/02/06 14:37:17 Modified:jk/native2 configure.in Log: Add the missing parameter to JK_WS_DIR. Revision ChangesPath 1.16 +10 -6 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure.in 5 Feb 2004 17:04:33 - 1.15 +++ configure.in 6 Feb 2004 22:37:17 - 1.16 @@ -123,19 +123,22 @@ JK_APXS([2], [location of apxs for Apache 2.0]) dnl APACHE13 settings -JK_WS_DIR([apache13], [src/include/httpd.h]) +AC_MSG_RESULT([Checking for apache13...]) +JK_WS_DIR([apache13], [APACHE], [src/include/httpd.h]) JK_WS_INCDIR([apache13], [httpd.h]) JK_WS_LIBDIR([apache13]) dnl APACHE2 settings -JK_WS_DIR([apache2], [include/httpd.h]) +AC_MSG_RESULT([Checking for apache20...]) +JK_WS_DIR([apache2], [APACHE2], [include/httpd.h]) JK_WS_INCDIR([apache2], [httpd.h]) JK_WS_LIBDIR([apache2]) dnl IIS settings -JK_WS_DIR([iis], [.]) +AC_MSG_RESULT([Checking for iis...]) +JK_WS_DIR([iis], [IIS], [.]) JK_WS_INCDIR([iis], [.]) JK_WS_LIBDIR([iis]) @@ -148,7 +151,8 @@ dnl iPlanet settings -JK_WS_DIR([iplanet], [.]) +AC_MSG_RESULT([Checking for iPlanet...]) +JK_WS_DIR([iplanet], [IPLANET], [.]) JK_WS_INCDIR([iplanet], [.]) JK_WS_LIBDIR([iplanet]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
hgomez 2004/02/05 09:04:33 Modified:jk/native2 configure.in Log: Grab LIBTOOL from APXS Revision ChangesPath 1.15 +3 -2 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure.in 10 Nov 2003 11:05:33 - 1.14 +++ configure.in 5 Feb 2004 17:04:33 - 1.15 @@ -254,6 +254,7 @@ AC_SUBST(APR_CONFIGURE_ARGS) AC_SUBST(APR_LDFLAGS) AC_SUBST(COMMON_APR_OBJECTS) +AC_SUBST(LIBTOOL) dnl automake needs the path it does not work with $WEBSERVER dnl that why useless Makefiles are build. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
hgomez 2003/11/05 01:15:19 Modified:jk/native2 configure.in Log: Update copyright notice Revision ChangesPath 1.13 +3 -3 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.in 4 Nov 2003 12:48:04 - 1.12 +++ configure.in 5 Nov 2003 09:15:19 - 1.13 @@ -2,7 +2,7 @@ dnl dnl The Apache Software License, Version 1.1 dnl -dnl Copyright (c) 1 -2001 The Apache Software Foundation. +dnl Copyright (c) 1999-2003 The Apache Software Foundation. dnlAll rights reserved. dnl dnl = - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
hgomez 2003/09/25 08:23:24
Modified:jk/native2/common jk_uriEnv.c jk_md5.c jk_requtil.c
jk_registry.h jk_registry.c jk_workerEnv.c
jk_logger_file.c jk_worker_ajp13.c jk_env.c
jk_msg_ajp.c jk_handler_logon.c
jk/native2/include jk_service.h jk_env.h jk_endpoint.h
jk_objCache.h jk_requtil.h
jk/native2/server/apache2 jk_apache2.h mod_jk2.c
jk_service_apache2.c
jk/native2/server/apache13 mod_jk2.c
jk/native2/server/isapi jk_service_iis.c
jk/native2 configure.in
Log:
Update to use my correct email adress
Revision ChangesPath
1.50 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- jk_uriEnv.c 21 Apr 2003 08:20:35 - 1.49
+++ jk_uriEnv.c 25 Sep 2003 15:23:22 - 1.50
@@ -357,7 +357,7 @@
}
if( uriEnv-workerName == NULL ) {
/* The default worker */
-uriEnv-workerName=uriEnv-uriMap-workerEnv-defaultWorker-mbean-name;;
+uriEnv-workerName=uriEnv-uriMap-workerEnv-defaultWorker-mbean-name;
wname=uriEnv-workerName;
uriEnv-worker=uriEnv-uriMap-workerEnv-defaultWorker;
1.5 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_md5.c
Index: jk_md5.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_md5.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_md5.c 21 Feb 2002 11:11:15 - 1.4
+++ jk_md5.c 25 Sep 2003 15:23:22 - 1.5
@@ -102,7 +102,7 @@
/***
* Description: MD5 encoding wrapper *
- * Author: Henri Gomez [EMAIL PROTECTED] *
+ * Author: Henri Gomez [EMAIL PROTECTED]*
* Version: $Revision$ *
***/
1.29 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_requtil.c 4 Feb 2003 07:39:58 - 1.28
+++ jk_requtil.c 25 Sep 2003 15:23:22 - 1.29
@@ -59,7 +59,7 @@
* Utils for processing various request components
*
* Author: Gal Shachor [EMAIL PROTECTED]
- * Author: Henri Gomez [EMAIL PROTECTED]
+ * Author: Henri Gomez [EMAIL PROTECTED]
* Author: Costin Manolache
*/
1.20 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
Index: jk_registry.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_registry.h 4 Feb 2003 07:39:58 - 1.19
+++ jk_registry.h 25 Sep 2003 15:23:22 - 1.20
@@ -78,8 +78,8 @@
* static declarations for the factory methods and the registrerFactory() call.
*
* (based on jk_worker_list.h )
- * @author: Gal Shachor [EMAIL PROTECTED] *
- * @author: Henri Gomez [EMAIL PROTECTED] *
+ * @author: Gal Shachor [EMAIL PROTECTED]
+ * @author: Henri Gomez [EMAIL PROTECTED]
* @author: Costin Manolache
*
*/
1.30 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Index: jk_registry.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_registry.c 4 Feb 2003 07:39:58 - 1.29
+++ jk_registry.c 25 Sep 2003 15:23:22 - 1.30
@@ -83,8 +83,8 @@
* static declarations for the factory methods and the registrerFactory() call.
*
* (based on jk_worker_list.h )
- * @author: Gal Shachor [EMAIL PROTECTED] *
- * @author: Henri Gomez [EMAIL
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
mturk 2002/10/22 12:40:45
Modified:jk/native2 configure.in
Log:
Add conditional pcre compile
Revision ChangesPath
1.9 +7 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in 5 Jun 2002 13:42:31 - 1.8
+++ configure.in 22 Oct 2002 19:40:45 - 1.9
-67,6 +67,7
sinclude(../support/jk_apr.m4)
sinclude(../support/jk_tchome.m4)
sinclude(../support/jk_java.m4)
+sinclude(../support/jk_pcre.m4)
dnl
dnl Process this file with autoconf to produce a configure script
-79,7 +80,7
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk2
-VERSION=2.0.0
+VERSION=2.0.2
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
-186,12 +187,14
JK_JDK()
JK_JDK_OS()
JK_JNI()
+JK_PCRE()
AC_SUBST(JAVA_HOME)
AC_SUBST(JAVA_PLATFORM)
AC_SUBST(OS)
AC_SUBST(HAVE_JNI)
-
+AC_SUBST(HAS_PCRE)
+AC_SUBST(PCRE_LIBS)
dnl Check that at least one WEBSERVER has been given
if ${TEST} -z $WEBSERVERS ; then
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
jfclere 2002/06/05 03:16:27
Modified:jk/native2 configure.in
Log:
Add AM_INIT_AUTOMAKE otherwise buildconf.sh complains it is missing.
Revision ChangesPath
1.7 +4 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in 5 Jun 2002 09:38:28 - 1.6
+++ configure.in 5 Jun 2002 10:16:27 - 1.7
@@ -58,7 +58,7 @@
dnl --
dnl Author Henri Gomez [EMAIL PROTECTED]
dnl
-dnl Version $Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $
+dnl Version $Id: configure.in,v 1.7 2002/06/05 10:16:27 jfclere 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.6 2002/06/05 09:38:28 hgomez Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.7 2002/06/05 10:16:27 jfclere Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_config.c)
@@ -80,6 +80,8 @@
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk2
VERSION=2.0.0
+
+AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
AC_PROG_CC
AC_PROG_LD
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
But did we need automake support since we didn't use it ?
-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .)
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, June 05, 2002 12:16 PM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
jfclere 2002/06/05 03:16:27
Modified:jk/native2 configure.in
Log:
Add AM_INIT_AUTOMAKE otherwise buildconf.sh complains it is missing.
Revision ChangesPath
1.7 +4 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in 5 Jun 2002 09:38:28 - 1.6
+++ configure.in 5 Jun 2002 10:16:27 - 1.7
@@ -58,7 +58,7 @@
dnl
---
---
dnl Author Henri Gomez [EMAIL PROTECTED]
dnl
-dnl Version $Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $
+dnl Version $Id: configure.in,v 1.7 2002/06/05 10:16:27
jfclere 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.6 2002/06/05 09:38:28
hgomez Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.7 2002/06/05 10:16:27
jfclere Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_config.c)
@@ -80,6 +80,8 @@
dnl package and version. (synchronization with
common/jk_version.h ?)
PACKAGE=mod_jk2
VERSION=2.0.0
+
+AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
AC_PROG_CC
AC_PROG_LD
--
To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED]
For
additional commands, e-mail:
mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 configure.in
hgomez 02/05/24 00:09:10 Modified:jk/native2 configure.in Log: Complete rework of configure.in which now use m4 functions from ../support directory. NB: for now configure didn't handle static build, since I need some help/advice. Revision ChangesPath 1.3 +150 -459 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in 14 May 2002 11:15:47 - 1.2 +++ configure.in 24 May 2002 07:09:09 - 1.3 @@ -1,7 +1,77 @@ +dnl = +dnl +dnl The Apache Software License, Version 1.1 +dnl +dnl Copyright (c) 1 -2001 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 Henri Gomez [EMAIL PROTECTED] +dnl +dnl Version $Id: configure.in,v 1.3 2002/05/24 07:09:09 hgomez Exp $ +dnl -- + +dnl sinclude(../support/jk_apache_static.m4) +sinclude(../support/jk_apxs.m4) +sinclude(../support/jk_ws.m4) +sinclude(../support/jk_apr.m4) +sinclude(../support/jk_tchome.m4) +sinclude(../support/jk_java.m4) + dnl dnl Process this file with autoconf to produce a configure script dnl -AC_REVISION($Id: configure.in,v 1.2 2002/05/14 11:15:47 hgomez Exp $)dnl +AC_REVISION($Id: configure.in,v 1.3 2002/05/24 07:09:09 hgomez Exp $)dnl AC_PREREQ(2.13) AC_INIT(common/jk_config.c) @@ -44,474 +114,88 @@ AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl AC_SUBST(MKDIR) -JK_POOL_APR= -JK_CHANNEL_APR_SOCKET= -HAS_APR= - -APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk -WEBSERVER=
