Author: markt
Date: Wed Nov 22 12:06:41 2017
New Revision: 1816043
URL: http://svn.apache.org/viewvc?rev=1816043&view=rev
Log:
Remove apache-1.3 references
Modified:
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/native/configure.ac
Modified: tomcat/jk/trunk/native/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1816043&r1=1816042&r2=1816043&view=diff
==============================================================================
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Wed Nov 22 12:06:41 2017
@@ -44,7 +44,7 @@
The resulting module file mod_jk.so of mod_jk will be
located in the directory apache-2.0 (for any version
- of Apache 2.x) respectively apache-1.3 (for Apache 1.3).
+ of Apache 2.x).
Simply copy the file to your web server modules or libexec
directory.
Modified: tomcat/jk/trunk/native/configure.ac
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1816043&r1=1816042&r2=1816043&view=diff
==============================================================================
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Nov 22 12:06:41 2017
@@ -110,27 +110,19 @@ AC_ARG_WITH(apxs,
dnl test apache version
APA=`${GREP} STANDARD20 ${APXS}`
- if ${TEST} -z "$APA" ; then
- WEBSERVER="apache-1.3"
- APXSCC="`$APXS -q CC`"
- APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
- APXSCPPFLAGS=""
- APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB`"
- else
- WEBSERVER="apache-2.0"
- APRINCLUDEDIR=""
- INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
- for INC in ${INCTEMP}; do
- APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
- done
- AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
- APXSCC="`$APXS -q CC`"
- APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`
-DHAVE_APR ${APRINCLUDEDIR}"
- APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
- APXSLDFLAGS="`$APXS -q LDFLAGS`"
- APACHE_CONFIG_VARS="`${APXS} -q
exp_installbuilddir`/config_vars.mk"
- LIBTOOL=`$APXS -q LIBTOOL`
- fi
+ WEBSERVER="apache-2.0"
+ APRINCLUDEDIR=""
+ INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
+ for INC in ${INCTEMP}; do
+ APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
+ done
+ AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
+ APXSCC="`$APXS -q CC`"
+ APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`
-DHAVE_APR ${APRINCLUDEDIR}"
+ APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
+ APXSLDFLAGS="`$APXS -q LDFLAGS`"
+ APACHE_CONFIG_VARS="`${APXS} -q
exp_installbuilddir`/config_vars.mk"
+ LIBTOOL=`$APXS -q LIBTOOL`
AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
if ${TEST} -z "${CC}" ; then
CC="${APXSCC}"
@@ -705,8 +697,6 @@ dnl automake needs the path it does not
dnl that why useless Makefiles are build.
AC_OUTPUT([
Makefile
- apache-1.3/Makefile
- apache-1.3/Makefile.apxs
apache-2.0/Makefile
apache-2.0/Makefile.apxs
common/Makefile
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
