cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
jfclere 2005/01/31 00:14:03
Modified:jk/support jk_apxs.m4
Log:
Add HP/UX support, thanks to William A. Rowe, Jr.
Revision ChangesPath
1.17 +10 -4 jakarta-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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_apxs.m41 Apr 2004 07:08:20 - 1.16
+++ jk_apxs.m431 Jan 2005 08:14:03 - 1.17
@@ -101,11 +101,17 @@
APR_UTIL_INCDIR=-I`${APXS$1} -q APU_INCLUDEDIR`
APACHE2_LIBDIR=`${APXS$1} -q LIBDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
- if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f
${APACHE2_LIBDIR}/libapr-1.dylib; then
+ if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so \
+ -o -f ${APACHE2_LIBDIR}/libapr-1.sl \
+ -o -f ${APACHE2_LIBDIR}/libapr-1.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr-1
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f
${APACHE2_LIBDIR}/libapr-0.dylib; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so \
+-o -f ${APACHE2_LIBDIR}/libapr-0.sl \
+-o -f ${APACHE2_LIBDIR}/libapr-0.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr-0
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f
${APACHE2_LIBDIR}/libapr.dylib; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so \
+-o -f ${APACHE2_LIBDIR}/libapr.sl \
+-o -f ${APACHE2_LIBDIR}/libapr.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr
else
AC_MSG_ERROR(can't locate libapr)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
hgomez 2004/03/31 23:08:20
Modified:jk/support jk_apxs.m4
Log:
Fix configure apr lookup for Tomcat Connectors 2.0.4 on MacOS/X
Revision ChangesPath
1.16 +4 -4 jakarta-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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_apxs.m422 Mar 2004 16:28:21 - 1.15
+++ jk_apxs.m41 Apr 2004 07:08:20 - 1.16
@@ -101,11 +101,11 @@
APR_UTIL_INCDIR=-I`${APXS$1} -q APU_INCLUDEDIR`
APACHE2_LIBDIR=`${APXS$1} -q LIBDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
- if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so; then
+ if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f
${APACHE2_LIBDIR}/libapr-1.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr-1
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f
${APACHE2_LIBDIR}/libapr-0.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr-0
- elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so; then
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f
${APACHE2_LIBDIR}/libapr.dylib; then
APR_LIBS=-L${APACHE2_LIBDIR} -lapr
else
AC_MSG_ERROR(can't locate libapr)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
truk2004/03/22 08:28:21
Modified:jk/native2/server/apache2 Makefile.in
jk/support jk_apxs.m4
Log:
Eliminate hardcoded apr-0 lib and determine while configuring.
Helps older apache2 versions.
Revision ChangesPath
1.25 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 19 Mar 2004 02:52:22 - 1.24
+++ Makefile.in 22 Mar 2004 16:28:21 - 1.25
@@ -12,6 +12,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -43,7 +44,7 @@
ifdef APR_LIBDIR_LA
JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-lcrypt ${APR_LIBS} @PCRE_LIBS@
endif
## Based on rules.mk ##
1.15 +11 -2 jakarta-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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_apxs.m424 Feb 2004 08:41:40 - 1.14
+++ jk_apxs.m422 Mar 2004 16:28:21 - 1.15
@@ -95,13 +95,21 @@
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
JK_CHANNEL_APR_SOCKET=\${JK}jk_channel_apr_socket\${OEXT}
JK_POOL_APR=\${JK}jk_pool_apr\${OEXT}
- HAS_APR=-DHAS_APR
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
APR_INCDIR=-I`${APXS$1} -q APR_INCLUDEDIR`
APR_UTIL_INCDIR=-I`${APXS$1} -q APU_INCLUDEDIR`
APACHE2_LIBDIR=`${APXS$1} -q LIBDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
+ if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so; then
+APR_LIBS=-L${APACHE2_LIBDIR} -lapr-1
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so; then
+APR_LIBS=-L${APACHE2_LIBDIR} -lapr-0
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so; then
+APR_LIBS=-L${APACHE2_LIBDIR} -lapr
+ else
+AC_MSG_ERROR(can't locate libapr)
+ fi
fi
AC_MSG_RESULT([building connector for \$RWEBSERVER\])
@@ -127,6 +135,7 @@
AC_SUBST(APACHE$1_LIBDIR)
AC_SUBST(APACHE$1_CC)
AC_SUBST(APXS$1_LDFLAGS)
+ AC_SUBST(APR_LIBS)
])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
truk2004/02/23 20:00:30
Modified:jk/native2/server/apache2 Makefile.in
jk/support jk_apxs.m4
Log:
Need to use apxs to get APACHE2_LIBDIR
Revision ChangesPath
1.19 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 10 Feb 2004 04:24:13 - 1.18
+++ Makefile.in 24 Feb 2004 04:00:30 - 1.19
@@ -8,7 +8,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
1.13 +3 -1 jakarta-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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_apxs.m46 Feb 2004 08:53:52 - 1.12
+++ jk_apxs.m424 Feb 2004 04:00:30 - 1.13
@@ -141,6 +141,7 @@
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
APR_INCDIR=-I`${APXS$1} -q APR_INCLUDEDIR`
APR_UTIL_INCDIR=-I`${APXS$1} -q APU_INCLUDEDIR`
+ APACHE2_LIBDIR=`${APXS$1} -q LIBDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
@@ -164,6 +165,7 @@
AC_SUBST(APACHE$1_INCDIR)
AC_SUBST(APACHE$1_INCL)
AC_SUBST(APACHE$1_LIBEXEC)
+ AC_SUBST(APACHE$1_LIBDIR)
AC_SUBST(APACHE$1_CC)
AC_SUBST(APXS$1_LDFLAGS)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
hgomez 2004/02/06 00:37:08
Modified:jk/support jk_apxs.m4
Log:
Get APR/APR_UTILS include path
Revision ChangesPath
1.11 +3 -2 jakarta-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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_apxs.m45 Feb 2004 17:13:54 - 1.10
+++ jk_apxs.m46 Feb 2004 08:37:08 - 1.11
@@ -139,7 +139,8 @@
HAS_APR=-DHAS_APR
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
- APR_INCDIR=`${APXS$1} -q APR_INCLUDE`
+ APR_INCDIR=`${APXS$1} -q APR_INCLUDEDIR`
+ APR_UTIL_INCDIR=`${APXS$1} -q APU_INCLUDEDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
hgomez 2004/02/06 00:53:52
Modified:jk/support jk_apxs.m4
Log:
Fix build for include in APR/APR_UTILS
Revision ChangesPath
1.12 +3 -3 jakarta-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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_apxs.m46 Feb 2004 08:37:08 - 1.11
+++ jk_apxs.m46 Feb 2004 08:53:52 - 1.12
@@ -139,8 +139,8 @@
HAS_APR=-DHAS_APR
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
- APR_INCDIR=`${APXS$1} -q APR_INCLUDEDIR`
- APR_UTIL_INCDIR=`${APXS$1} -q APU_INCLUDEDIR`
+ APR_INCDIR=-I`${APXS$1} -q APR_INCLUDEDIR`
+ APR_UTIL_INCDIR=-I`${APXS$1} -q APU_INCLUDEDIR`
LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
hgomez 2004/02/05 09:03:49
Modified:jk/support jk_apxs.m4
Log:
Grab LIBTOOL from APXS
Revision ChangesPath
1.9 +2 -1 jakarta-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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_apxs.m45 Nov 2003 09:14:28 - 1.8
+++ jk_apxs.m45 Feb 2004 17:03:49 - 1.9
@@ -139,6 +139,7 @@
HAS_APR=-DHAS_APR
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
+ LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
AC_MSG_RESULT([building connector for \$RWEBSERVER\])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
hgomez 2004/02/05 09:13:54
Modified:jk/support jk_apxs.m4
Log:
Get APR INCDIR
Revision ChangesPath
1.10 +2 -1 jakarta-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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_apxs.m45 Feb 2004 17:03:49 - 1.9
+++ jk_apxs.m45 Feb 2004 17:13:54 - 1.10
@@ -139,6 +139,7 @@
HAS_APR=-DHAS_APR
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
+ APR_INCDIR=`${APXS$1} -q APR_INCLUDE`
LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
jfclere 2002/09/12 03:33:45
Modified:jk/support jk_apxs.m4
Log:
Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
Revision ChangesPath
1.5 +7 -1 jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apxs.m416 Jun 2002 20:41:33 - 1.4
+++ jk_apxs.m412 Sep 2002 10:33:45 - 1.5
@@ -119,11 +119,17 @@
dnl check if we have an apxs for Apache 1.3 or 2.0
if ${TEST} -z $APA ; then
+ if ${TEST} ! -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs$1 but --with-apxs)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
+ if ${TEST} -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs but --with-apxs2)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache2
RWEBSERVER=apache-2.0
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
[EMAIL PROTECTED] wrote:
jfclere 2002/09/12 03:33:45
Modified:jk/support jk_apxs.m4
Log:
Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
Revision ChangesPath
1.5 +7 -1 jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apxs.m4 16 Jun 2002 20:41:33 - 1.4
+++ jk_apxs.m4 12 Sep 2002 10:33:45 - 1.5
@@ -119,11 +119,17 @@
dnl check if we have an apxs for Apache 1.3 or 2.0
if ${TEST} -z $APA ; then
+ if ${TEST} ! -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs$1 but --with-apxs)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
+ if ${TEST} -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs but --with-apxs2)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache2
RWEBSERVER=apache-2.0
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
Are you sure ?
The goal was to set configure to be able to generate stuff for APXS
and APXS2 the same time, to help build apache and apache2 on a single pass
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
jfclere 2002/09/12 03:33:45
Modified:jk/support jk_apxs.m4
Log:
Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
Revision ChangesPath
1.5 +7 -1 jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apxs.m416 Jun 2002 20:41:33 -1.4
+++ jk_apxs.m412 Sep 2002 10:33:45 -1.5
@@ -119,11 +119,17 @@
dnl check if we have an apxs for Apache 1.3 or 2.0
if ${TEST} -z $APA ; then
+ if ${TEST} ! -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs$1 but --with-apxs)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
+ if ${TEST} -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs but --with-apxs2)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache2
RWEBSERVER=apache-2.0
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
Are you sure ?
The goal was to set configure to be able to generate stuff for APXS
and APXS2 the same time, to help build apache and apache2 on a single pass
Yes, but we should not allow to configure using --with-apxs when Apache is 2.0
or we should do like in native: --with-apxs works for both 1.3 and 2.0.
The fastest work-around is to make sure the --with-apxs and with-apxs2 are use
only with their respective Apache version. And that what I am doing.
--
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]
Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
jean-frederic clere wrote:
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
jfclere 2002/09/12 03:33:45
Modified:jk/support jk_apxs.m4
Log:
Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
Revision ChangesPath
1.5 +7 -1 jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apxs.m416 Jun 2002 20:41:33 -1.4
+++ jk_apxs.m412 Sep 2002 10:33:45 -1.5
@@ -119,11 +119,17 @@
dnl check if we have an apxs for Apache 1.3 or 2.0
if ${TEST} -z $APA ; then
+ if ${TEST} ! -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs$1 but
--with-apxs)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
+ if ${TEST} -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs but --with-apxs2)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache2
RWEBSERVER=apache-2.0
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
Are you sure ?
The goal was to set configure to be able to generate stuff for APXS
and APXS2 the same time, to help build apache and apache2 on a single
pass
Yes, but we should not allow to configure using --with-apxs when Apache
is 2.0 or we should do like in native: --with-apxs works for both 1.3
and 2.0.
The fastest work-around is to make sure the --with-apxs and with-apxs2
are use only with their respective Apache version. And that what I am
doing.
So we could still use --with-apxs and --with-apxs2 on the same command
line ?
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
Henri Gomez wrote:
jean-frederic clere wrote:
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
jfclere 2002/09/12 03:33:45
Modified:jk/support jk_apxs.m4
Log:
Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
Revision ChangesPath
1.5 +7 -1 jakarta-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apxs.m416 Jun 2002 20:41:33 -1.4
+++ jk_apxs.m412 Sep 2002 10:33:45 -1.5
@@ -119,11 +119,17 @@
dnl check if we have an apxs for Apache 1.3 or 2.0
if ${TEST} -z $APA ; then
+ if ${TEST} ! -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs$1 but
--with-apxs)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
+ if ${TEST} -z $1 ; then
+AC_MSG_ERROR(Do not use --with-apxs but
--with-apxs2)
+ fi
WEBSERVERS=${WEBSERVERS} server/apache2
RWEBSERVER=apache-2.0
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
Are you sure ?
The goal was to set configure to be able to generate stuff for APXS
and APXS2 the same time, to help build apache and apache2 on a single
pass
Yes, but we should not allow to configure using --with-apxs when
Apache is 2.0 or we should do like in native: --with-apxs works for
both 1.3 and 2.0.
The fastest work-around is to make sure the --with-apxs and
with-apxs2 are use only with their respective Apache version. And
that what I am doing.
So we could still use --with-apxs and --with-apxs2 on the same command
line ?
Of course ;-)
--
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/support jk_apxs.m4
jfclere 2002/06/16 11:13:52
Modified:jk/support jk_apxs.m4
Log:
libexec is the place where modules are, not the libraries.
Revision ChangesPath
1.3 +2 -2 jakarta-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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_apxs.m46 Jun 2002 16:43:16 - 1.2
+++ jk_apxs.m416 Jun 2002 18:13:52 - 1.3
@@ -112,7 +112,7 @@
APACHE$1_HOME=`${APXS$1} -q PREFIX`
APACHE$1_INCL=-I`${APXS$1} -q INCLUDEDIR`
APACHE$1_INCDIR=`${APXS$1} -q INCLUDEDIR`
-APACHE$1_LIBDIR=`${APXS$1} -q LIBEXECDIR`
+APACHE$1_LIBEXEC=`${APXS$1} -q LIBEXECDIR`
dnl test apache version
APA=`${GREP} STANDARD20 ${APXS$1}`
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
jfclere 2002/06/06 09:43:17
Modified:jk/support jk_apxs.m4
Log:
Apache-2.0 needs both CFLAGS and EXTRA_CFLAGS.
Revision ChangesPath
1.2 +4 -4 jakarta-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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_apxs.m424 May 2002 07:05:07 - 1.1
+++ jk_apxs.m46 Jun 2002 16:43:16 - 1.2
@@ -60,7 +60,7 @@
dnl
dnl Inspired by Pier works on webapp m4 macros :)
dnl
-dnl Version $Id: jk_apxs.m4,v 1.1 2002/05/24 07:05:07 hgomez Exp $
+dnl Version $Id: jk_apxs.m4,v 1.2 2002/06/06 16:43:16 jfclere Exp $
dnl --
dnl --
@@ -121,7 +121,7 @@
if ${TEST} -z $APA ; then
WEBSERVERS=${WEBSERVERS} server/apache13
RWEBSERVER=apache-1.3
- APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
+ APXS$1_CFLAGS=`${APXS$1} -q CFLAGS`
APXS$1_CPPFLAGS=
else
WEBSERVERS=${WEBSERVERS} server/apache2
@@ -130,8 +130,8 @@
JK_CHANNEL_APR_SOCKET=\${JK}jk_channel_apr_socket\${OEXT}
JK_POOL_APR=\${JK}jk_pool_apr\${OEXT}
HAS_APR=-DHAS_APR
- APXS$1_CFLAGS=`${APXS$1} -q EXTRA_CFLAGS`
- APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
+ APXS$1_CFLAGS=`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`
+ APXS$1_CPPFLAGS=`${APXS$1} -q EXTRA_CPPFLAGS`
fi
AC_MSG_RESULT([building connector for \$RWEBSERVER\])
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
