diff options
Diffstat (limited to 'rubbos/app/tomcat-connectors-1.2.32-src/support')
12 files changed, 1674 insertions, 0 deletions
diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/apache.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/apache.m4 new file mode 100644 index 00000000..fceef24f --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/apache.m4 @@ -0,0 +1,213 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 apache.m4: autoconf macro for Apache/apxs +dnl + +dnl +dnl check for apxs. +dnl + +AC_DEFUN(JTC_CHECK_APXS,[ +WEBSERVER="" +apache_dir="" +apache_include="" +APXS="apxs" +AC_ARG_WITH(apxs, +[ --with-apxs[=FILE] Build shared Apache module. FILE is the optional + pathname to the apxs tool; defaults to finding + apxs in your PATH.], +[ + case "${withval}" in + y | yes | true) find_apxs=true ;; + n | no | false) find_apxs=false ;; + *) find_apxs=false ;; + esac + + if ${TEST} ${find_apxs} ; then + AC_MSG_RESULT([need to check for Perl first, apxs depends on it...]) + AC_PATH_PROG(PERL,perl,$PATH)dnl + + if ${TEST} ${find_apxs} ; then + APXS=${withval} + else + AC_PATH_PROG(APXS,apxs,$PATH)dnl + fi + + if ${TEST} -n "${APXS}" ; then + dnl Seems that we have it, but have to check if it is OK first + if ${TEST} ! -x "${APXS}" ; then + AC_MSG_ERROR(Invalid location for apxs: '${APXS}') + fi + + $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_ERROR(You must specify a valid --with-apxs path) + fi + + dnl test apache version + $RM -rf test + $APXS -n test -g + APA=`grep STANDARD20 test/mod_test.c` + $RM -rf test + if ${TEST} -z "$APA" ; then + WEBSERVER="apache-1.3" + else + WEBSERVER="apache-2.0" + fi + AC_MSG_RESULT([building connector for \"$WEBSERVER\"]) + + AC_SUBST(APXS) + + dnl apache_dir and apache_include are also needed. + apache_dir=`$APXS -q PREFIX` + apache_include="-I`$APXS -q INCLUDEDIR`" + fi + fi +], +[ + AC_MSG_RESULT(no apxs given) +]) +])dnl + +dnl +dnl check for apache (static link). +dnl + +AC_DEFUN(JTC_CHECK_APACHE,[ + +dnl it is copied from the configure of JServ ;=) +dnl and adapted. + +apache_dir_is_src="false" +AC_ARG_WITH(apache, +[ --with-apache=DIR Build static Apache module. DIR is the pathname + to the Apache source directory.], +[ + if ${TEST} ! -z "$WEBSERVER" ; then + AC_MSG_ERROR([Sorry cannot use --with-apxs=${APXS} and --with-apache=${withval} togother, please choose one of both]) + fi + + AC_MSG_CHECKING([for Apache source directory (assume static build)]) + + if ${TEST} -n "${withval}" && ${TEST} -d "${withval}" ; then + if ${TEST} -d "${withval}/src" ; then + # handle the case where people use relative paths to + # the apache source directory by pre-pending the current + # build directory to the path. there are probably + # errors with this if configure is run while in a + # different directory than what you are in at the time + if ${TEST} -n "`${ECHO} ${withval}|${GREP} \"^\.\.\"`" ; then + withval=`pwd`/${withval} + fi + + apache_dir=${withval} + apache_dir_is_src="true" + AC_MSG_RESULT(${apache_dir}) + + AC_MSG_CHECKING(for Apache include directory) + + if ${TEST} -d "${withval}/src/include" ; then + # read osdir from the existing apache. + osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e 's:^OSDIR=.*/os:os:'` + if ${TEST} -z "${osdir}" ; then + osdir=os/unix + fi + apache_include="-I${withval}/src/include \ + -I${withval}/src/${osdir}" + WEBSERVER="apache-1.3" + AC_MSG_RESULT([${apache_include}, version 1.3]) + else + AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.]) + fi + else + if ${TEST} -d "${withval}/include" ; then + # osdir for Apache20. + WEBSERVER="apache-2.0" + apache_dir=${withval} + apache_dir_is_src="true" + AC_MSG_RESULT(${apache_dir}) + fi + fi + fi + + dnl Make sure we have a result. + if ${TEST} -z "$WEBSERVER" ; then + AC_MSG_ERROR([Directory $apache_dir is not a valid Apache source distribution]) + fi + +# VT: Now, which one I'm supposed to use? Let's figure it out later + + configure_apache=true + configure_src=true + + AC_MSG_RESULT([building connector for \"$WEBSERVER\"]) +], +[ + AC_MSG_RESULT(no apache given) +]) +AC_SUBST(apache_include) +APACHE_DIR=${apache_dir} +AC_SUBST(APACHE_DIR) +]) + +dnl +dnl check for EAPI (static link only). +dnl + +AC_DEFUN(JTC_CHECK_EAPI,[ + +dnl CFLAGS for EAPI mod_ssl (Apache 1.3) +dnl it also allows the CFLAGS environment variable. +CFLAGS="${CFLAGS}" +AC_ARG_ENABLE( +EAPI, +[ --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 +dnl set flags for apxs. +dnl + +AC_DEFUN(JTC_SET_APXS_FLAGS,[ +dnl the APXSCFLAGS is given by apxs to the C compiler +dnl the APXSLDFLAGS is given to the linker (for APRVARS). +APXSLDFLAGS="" +APXSCFLAGS="" +if ${TEST} -n "${CFLAGS}" ; then + APXSCFLAGS="${CFLAGS}" +fi +dnl the APXSLDFLAGS is normaly empty but APXSCFLAGS is not. +if ${TEST} -n "${LDFLAGS}" ; then + APXSLDFLAGS="-Wl,${LDFLAGS}" +fi +AC_SUBST(APXSCFLAGS) +AC_SUBST(APXSLDFLAGS) +]) diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/get_ver.awk b/rubbos/app/tomcat-connectors-1.2.32-src/support/get_ver.awk new file mode 100644 index 00000000..8d732d86 --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/get_ver.awk @@ -0,0 +1,83 @@ +BEGIN { + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + + # fetch mod_jk version numbers from input file and writes them to STDOUT + + while ((getline < ARGV[1]) > 0) { + if (match ($0, /^#define JK_VERMAJOR [^"]+/)) { + jk_ver_major = substr($3, 1, length($3)); + } + else if (match ($0, /^#define JK_VERMINOR [^"]+/)) { + jk_ver_minor = substr($3, 1, length($3)); + } + else if (match ($0, /^#define JK_VERFIX [^"]+/)) { + jk_ver_fix = substr($3, 1, length($3)); + } + else if (match ($0, /^#define JK_VERISRELEASE [^"]+/)) { + jk_ver_isrelease = substr($3, 1, length($3)); + } + else if (match ($0, /^#define JK_VERBETA [^"]+/)) { + jk_ver_isbeta = substr($3, 1, length($3)); + } + else if (match ($0, /^#define JK_BETASTRING [^"]+/)) { + jk_ver_betastr = substr($3, 2, length($3) - 2); + } + } + jk_ver = jk_ver_major "," jk_ver_minor "," jk_ver_fix; + jk_ver_str = jk_ver_major "." jk_ver_minor "." jk_ver_fix; + if (jk_ver_isrelease != 1) { + jk_ver_str = jk_ver_str "-dev"; + } + if (jk_ver_isbeta == 1) { + jk_ver_str = jk_ver_str "-beta-" jk_ver_betastr; + } + + # fetch Apache version numbers from input file and writes them to STDOUT + + if (ARGV[2]) { + if (match (ARGV[2], /ap_release.h/)) { + while ((getline < ARGV[2]) > 0) { + if (match ($0, /^#define AP_SERVER_MAJORVERSION "[^"]+"/)) { + ap_ver_major = substr($3, 2, length($3) - 2); + } + else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) { + ap_ver_minor = substr($3, 2, length($3) - 2); + } + else if (match ($0, /^#define AP_SERVER_PATCHLEVEL/)) { + ap_ver_str_patch = substr($3, 2, length($3) - 2); + if (match (ap_ver_str_patch, /[0-9][0-9]*/)) { + ap_ver_patch = substr(ap_ver_str_patch, RSTART, RLENGTH); + } + } + } + ap_ver_str = ap_ver_major "." ap_ver_minor "." ap_ver_str_patch; + } + if (match (ARGV[2], /httpd.h/)) { + while ((getline < ARGV[2]) > 0) { + if (match ($0, /^#define SERVER_BASEREVISION "[^"]+"/)) { + ap_ver_str = substr($3, 2, length($3) - 2); + } + } + } + print "AP_VERSION_STR = " ap_ver_str ""; + } + + print "JK_VERSION = " jk_ver ""; + print "JK_VERSION_STR = " jk_ver_str ""; + +} diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apache_static.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apache_static.m4 new file mode 100644 index 00000000..c4da1044 --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apache_static.m4 @@ -0,0 +1,133 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_apache_static.m4 466585 2006-10-21 22:16:34Z markt $ +dnl -------------------------------------------------------------------------- + +dnl Apache-2.0 needs the os subdirectory to include os.h +dnl this include is copy from os/config.m4 +sinclude(os_apache.m4) + +dnl -------------------------------------------------------------------------- +dnl JK_APACHE_STATIC +dnl Set the APACHE 1.3/2.0 source dir. +dnl $1 => apache source dir to detect ("", 2) +dnl $2 => apache 1.3 build dir +dnl $3 => apache 2.0 build dir +dnl +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APACHE_STATIC], + [ + tempval="" + + AC_ARG_WITH( + [apache$1], + [ --with-apache$1=DIR Location of Apache$2 source dir], + [ + if ${TEST} ${use_apxs$1} ; then + AC_MSG_ERROR([Sorry cannot use --with-apxs= and --with-apache= together, please choose one]) + fi + + AC_MSG_CHECKING([for Apache source directory (assume static build)]) + + if ${TEST} -n "${withval}" && ${TEST} -d "${withval}" ; then + + if ${TEST} -d "${withval}/src" ; then + # handle the case where people use relative paths to + # the apache source directory by pre-pending the current + # build directory to the path. there are probably + # errors with this if configure is run while in a + # different directory than what you are in at the time + if ${TEST} -n "`${ECHO} ${withval}|${GREP} \"^\.\.\"`" ; then + withval=`pwd`/${withval} + fi + + APACHE$1_DIR=${withval} + use_static="true" + AC_MSG_RESULT(${APACHE$1_DIR}) + + AC_MSG_CHECKING(for Apache include directory) + + if ${TEST} -d "${withval}/src/include" ; then + # read osdir from the existing apache. + osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e 's:^OSDIR=.*/os:os:'` + + if ${TEST} -z "${osdir}" ; then + osdir=os/unix + fi + + APACHE$1_DIR=${withval} + APACHE$1_HOME=${withval} + APACHE$1_INCL="-I${withval}/src/include -I${withval}/src/${osdir}" + EXTRA_CFLAGS="" + EXTRA_CPPFLAGS="" + REPORTED_SERVER="apache-1.3" + SERVER_DIR="$3" + use_static="true" + use_apache13="true" + AC_MSG_RESULT([${APACHE$1_INCL}, version 1.3]) + else + AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.]) + fi + + else + + if ${TEST} -d "${withval}/include" ; then + # osdir for Apache20. + APACHE$1_DIR=${withval} + APACHE$1_HOME=${withval} + APACHE$1_INCL="-I${withval}/include -I${withval}/srclib/apr/include -I${withval}/os/${OS_APACHE_DIR} -I${withval}/srclib/apr-util/include" + EXTRA_CFLAGS="" + EXTRA_CPPFLAGS="" + REPORTED_SERVER="apache-2.0" + SERVER_DIR="$3" + use_static="true" + use_apache2="true" + APACHE$1_INCL="-I${withval}/include -I${withval}/srclib/apr/include -I${withval}/os/${OS_APACHE_DIR} -I${withval}/srclib/apr-util/include" + AC_MSG_RESULT(${APACHE$1_DIR}) + + + JK_CHANNEL_APR_SOCKET="\${JK}jk_channel_apr_socket\${OEXT}" + JK_POOL_APR="\${JK}jk_pool_apr\${OEXT}" + HAS_APR="-DHAS_APR" + fi + fi + fi + + dnl Make sure we have a result. + if ${TEST} -z "$WEBSERVER" ; then + AC_MSG_ERROR([Directory $apache_dir is not a valid Apache source distribution]) + fi + +# VT: Now, which one I'm supposed to use? Let's figure it out later + + configure_apache=true + configure_src=true + + AC_MSG_RESULT([building connector for \"$WEBSERVER\"]) +], +[ + AC_MSG_RESULT(no apache$1 dir given) +]) + +dnl vi:set sts=2 sw=2 autoindent: diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apr.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apr.m4 new file mode 100644 index 00000000..884502f5 --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apr.m4 @@ -0,0 +1,320 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_apr.m4 466585 2006-10-21 22:16:34Z markt $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_APR_THREADS +dnl Configure APR threading for use with --with-apr. +dnl Result goes into APR_CONFIGURE_ARGS +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_THREADS], + [ + AC_ARG_ENABLE( + [apr-threads], + [ --enable-apr-threads Configure APR threading for use with --with-apr ], + [ + case "${enableval}" in + ""|"yes"|"YES"|"true"|"TRUE") + APR_CONFIGURE_ARGS="--enable-threads ${APR_CONFIGURE_ARGS}" + ;; + "no"|"NO"|"false"|"FALSE") + APR_CONFIGURE_ARGS="--disable-threads ${APR_CONFIGURE_ARGS}" + ;; + *) + APR_CONFIGURE_ARGS="--enable-threads=${enableval} ${APR_CONFIGURE_ARGS}" + esac + ]) + ]) + +dnl -------------------------------------------------------------------------- +dnl JK_APR +dnl Set the APR source dir. +dnl $1 => File which should be present +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR], + [ + tempval="" + AC_ARG_WITH( + [apr], + [ --with-apr=DIR Location of APR source dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + AC_MSG_ERROR(valid apr source dir location required) + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid apr source dir location required) + ;; + *) + tempval="${withval}" + + if ${TEST} ! -d ${tempval} ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + if ${TEST} ! -f ${tempval}/$1; then + AC_MSG_ERROR(can't locate ${tempval}/$1) + fi + + if ${TEST} ! -z "$tempval" ; then + APR_BUILD="apr-build" + APR_CFLAGS="-I ${tempval}/include" + APR_CLEAN="apr-clean" + APR_DIR=${tempval} + APR_INCDIR="${tempval}/include" + AC_MSG_RESULT(configuring apr...) + tempret="0" + JK_EXEC( + [tempret], + [${SHELL} ./configure --prefix=${APR_DIR} --with-installbuilddir=${APR_DIR}/instbuild --disable-shared ${APR_CONFIGURE_ARGS}], + [apr], + [${APR_DIR}]) + if ${TEST} "${tempret}" = "0"; then + AC_MSG_RESULT(apr configure ok) + else + AC_MSG_ERROR(apr configure failed with ${tempret}) + fi + JK_APR_LIBNAME(apr_libname,${APR_DIR}) + APR_LDFLAGS="${APR_DIR}/lib/${apr_libname}" + APR_LIBDIR="" + use_apr=true + COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}" + fi + ;; + esac + ]) + + unset tempret + unset tempval + unset apr_libname + ]) + +dnl -------------------------------------------------------------------------- +dnl JK_APR_UTIL +dnl Set the APR-UTIL source dir. +dnl $1 => File which should be present +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_UTIL], + [ + tempval="" + AC_ARG_WITH( + [apr-util], + [ --with-apr-util=DIR Location of APR-UTIL source dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + AC_MSG_ERROR(valid apr-util source dir location required) + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid apr-util source dir location required) + ;; + *) + tempval="${withval}" + + if ${TEST} ! -d ${tempval} ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + if ${TEST} ! -f ${tempval}/$1; then + AC_MSG_ERROR(can't locate ${tempval}/$1) + fi + + if ${TEST} -z "${APR_BUILD}"; then + AC_MSG_ERROR([--with-apr and --with-apr-util must be used together]) + fi + + if ${TEST} ! -z "$tempval" ; then + APR_UTIL_DIR=${tempval} + APR_CFLAGS="${APR_CFLAGS} -I ${APR_UTIL_DIR}/include" + APR_UTIL_INCDIR="${APR_UTIL_DIR}/include" + AC_MSG_RESULT(configuring apr-util...) + tempret="0" + JK_EXEC( + [tempret], + [${SHELL} ./configure --prefix=${APR_UTIL_DIR} --with-apr=${APR_DIR}], + [apr-util], + [${APR_UTIL_DIR}]) + if ${TEST} "${tempret}" = "0"; then + AC_MSG_RESULT(apr-util configure ok) + else + 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}/lib/${apr_util_libname}" + APR_UTIL_LIBDIR="" + use_apr=true + COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}" + fi + ;; + esac + ]) + + unset tempret + unset tempval + unset apr_util_libname + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_APR_INCDIR +dnl Set the APR include dir. +dnl $1 => File which should be present +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_INCDIR], + [ + tempval="" + AC_ARG_WITH( + [apr-include], + [ --with-apr-include=DIR Location of APR include dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid apr include dir location required) + ;; + *) + tempval="${withval}" + if ${TEST} ! -d ${tempval} ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + if ${TEST} ! -f ${tempval}/$1; then + AC_MSG_ERROR(can't locate ${tempval}/$1) + fi + + if ${TEST} ! -z "$tempval" ; then + APR_BUILD="" + APR_CFLAGS="-I${tempval}" + APR_CLEAN="" + APR_DIR="" + APR_INCDIR=${tempval} + COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}" + use_apr=true + fi + ;; + + esac + ]) + + unset tempval + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_APR_LIBDIR +dnl Set the APR library dir. +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_LIBDIR], + [ + tempval="" + AC_ARG_WITH( + [apr-lib], + [ --with-apr-lib=DIR Location of APR lib dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid apr lib dir location required) + ;; + *) + tempval="${withval}" + + if ${TEST} ! -d ${tempval} ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + if ${TEST} ! -z "$tempval" ; then + APR_BUILD="" + APR_CLEAN="" + APR_DIR="" + APR_LIBDIR=${tempval} + APR_LDFLAGS="`apr-config --link-ld` -L${tempval}" + COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}" + use_apr=true + fi + + ;; + esac + ]) + + unset tempval + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_APR_LIBNAME +dnl Retrieve the complete name of the library. +dnl $1 => Environment variable name for the returned value +dnl $2 => APR sources directory +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_LIBNAME], + [ + AC_MSG_CHECKING([for apr APR_LIBNAME]) + if ${TEST} ! -f "$2/apr-config" ; then + AC_MSG_ERROR([cannot find apr-config file in $2]) + fi + jk_apr_get_tempval=`$2/apr-config --link-libtool 2> /dev/null` + if ${TEST} -z "${jk_apr_get_tempval}" ; then + AC_MSG_ERROR([$2/apr-config --link-libtool failed]) + fi + jk_apr_get_tempval=`basename ${jk_apr_get_tempval}` + $1="${jk_apr_get_tempval}" + AC_MSG_RESULT([${jk_apr_get_tempval}]) + unset jk_apr_get_tempval + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_APR_UTIL_LIBNAME +dnl Retrieve the complete name of the library. +dnl $1 => Environment variable name for the returned value +dnl $2 => APR_UTIL sources directory +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APR_UTIL_LIBNAME], + [ + AC_MSG_CHECKING([for apr-util APR_UTIL_LIBNAME]) + if ${TEST} ! -f "$2/apu-config" ; then + AC_MSG_ERROR([cannot find apu-config file in $2]) + fi + jk_apu_get_tempval=`$2/apu-config --link-libtool 2> /dev/null` + if ${TEST} -z "${jk_apu_get_tempval}" ; then + AC_MSG_ERROR([$2/apu-config --link-libtool failed]) + fi + jk_apu_get_tempval=`basename ${jk_apu_get_tempval}` + $1="${jk_apu_get_tempval}" + AC_MSG_RESULT([${jk_apu_get_tempval}]) + unset jk_apu_get_tempval + ]) + +dnl vi:set sts=2 sw=2 autoindent: + diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apxs.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apxs.m4 new file mode 100644 index 00000000..eecb664a --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_apxs.m4 @@ -0,0 +1,150 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_apxs.m4 466585 2006-10-21 22:16:34Z markt $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_APXS +dnl +dnl Get APXS to be used, determine if Apache 1.3 or 2.0 are target +dnl $1 => blank/2 if you want to detect Apache 1.3 & 2.0 +dnl $2 => comment for --with-apxs +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_APXS], + [ + tempval="" + AC_ARG_WITH(apxs$1, + [ --with-apxs$1[=FILE] $2], + [ + case "${withval}" in + y | yes | true) find_apxs=true ;; + n | no | false) find_apxs=false ;; + *) find_apxs=false ;; + esac + + if ${TEST} ${find_apxs} ; then + AC_MSG_RESULT([need to check for Perl first, apxs depends on it...]) + AC_PATH_PROG(PERL,perl,$PATH)dnl + + if ${TEST} ${find_apxs} ; then + APXS$1=${withval} + else + AC_PATH_PROG(APXS$1,apxs$1,$PATH)dnl + fi + + use_apxs$1=true; + + if ${TEST} -n "${APXS$1}" ; then + dnl Seems that we have it, but have to check if it is OK first + if ${TEST} ! -x "${APXS$1}" ; then + AC_MSG_ERROR(Invalid location for apxs: '${APXS$1}') + fi + + ${APXS$1} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false + + if ${TEST} "${apxs_support}" = "false" ; then + AC_MSG_RESULT(could not find ${APXS$1}) + AC_MSG_ERROR(You must specify a valid --with-apxs$1 path) + fi + + dnl apache_dir and apache_include are also needed. + APACHE$1_HOME=`${APXS$1} -q PREFIX` + APACHE$1_INCL="-I`${APXS$1} -q INCLUDEDIR`" + APACHE$1_INCDIR="`${APXS$1} -q INCLUDEDIR`" + APACHE$1_LIBEXEC="`${APXS$1} -q LIBEXECDIR`" + APACHE$1_CC="`${APXS$1} -q CC`" + + dnl test apache version + APA=`${GREP} STANDARD20 ${APXS$1}` + + 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 + JK_CHANNEL_APR_SOCKET="\${JK}jk_channel_apr_socket\${OEXT}" + JK_POOL_APR="\${JK}jk_pool_apr\${OEXT}" + 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 \ + -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.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.sl \ + -o -f ${APACHE2_LIBDIR}/libapr.dylib; then + APR_LIBS="-L${APACHE2_LIBDIR} -lapr" + else + AC_MSG_ERROR(can't locate libapr) + fi + fi + + AC_MSG_RESULT([building connector for \"$RWEBSERVER\"]) + fi + + fi + ], + [ + AC_MSG_RESULT(no apxs$1 given) + ]) + + unset tempval + + AC_SUBST(APXS$1) + AC_SUBST(APXS$1_CFLAGS) + AC_SUBST(APACHE$1_CONFIG_VARS) + AC_SUBST(APXS$1_CPPFLAGS) + AC_SUBST(APACHE$1_DIR) + AC_SUBST(APACHE$1_HOME) + 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) + AC_SUBST(APR_LIBS) + +]) + +dnl vi:set sts=2 sw=2 autoindent: + diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_dominohome.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_dominohome.m4 new file mode 100644 index 00000000..a6408e9f --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_dominohome.m4 @@ -0,0 +1,74 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 <andy@tagish.com> +dnl Shamelessly cribbed from Henri Gomez <hgomez@apache.org> +dnl +dnl He was inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_dominohome.m4 466585 2006-10-21 22:16:34Z markt $ +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: diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_exec.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_exec.m4 new file mode 100644 index 00000000..b2da284e --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_exec.m4 @@ -0,0 +1,91 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_exec.m4 802231 2009-08-07 21:43:52Z markt $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_EXEC +dnl Execute a program filtering its output (pretty printing). +dnl +dnl Parameters: +dnl $1 => name of the variable containing the return value (error code). +dnl $2 => name of the binary/script to invoke +dnl $3 => message used for pretty printing output +dnl $4 => the directory where the command must be executed +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_EXEC], + [ + jk_exec_curdir="`pwd`" + if test -d "$4" ; then + cd "$4" + else + AC_MSG_ERROR([can't switch to directory $4]) + fi + + echo " invoking \"$2\"" + echo " in directory \"$4\"" + echo "-1" > retvalue.tmp + + set $2 + jk_exec_file=[$]1 + if test ! -x "${jk_exec_file}" ; then + cd "${jk_exec_curdir}" + AC_MSG_ERROR([cannot find or execute \"${jk_exec_file}\" in \"$4\"]) + exit 1 + fi + unset jk_exec_file + + { + $2 + echo + echo "jk_exec_retvalue $?" + } | { + jk_exec_ret=0 + while true ; do + read jk_exec_first jk_exec_line + if test ! "$?" -eq "0" ; then + break + else + if test "${jk_exec_first}" = "jk_exec_retvalue" ; then + jk_exec_ret="${jk_exec_line}" + else + if test -n "${jk_exec_line}" ; then + echo " $3: ${jk_exec_first} ${jk_exec_line}" + fi + fi + fi + done + echo "${jk_exec_ret}" > retvalue.tmp + unset jk_exec_first + unset jk_exec_line + unset jk_exec_ret + } + + $1="`cat retvalue.tmp`" + rm -f retvalue.tmp + echo " execution of \"$2\"" + echo " returned with value \"${$1}\"" + + cd "${jk_exec_curdir}" + unset jk_exec_curdir + ]) diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_java.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_java.m4 new file mode 100644 index 00000000..dc7de12e --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_java.m4 @@ -0,0 +1,224 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_java.m4 714101 2008-11-14 18:53:19Z rjung $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_JDK +dnl +dnl Detection of JDK location and Java Platform (1.1, 1.2, 1.3, 1.4) +dnl result goes in JAVA_HOME / JAVA_PLATFORM (1 -> 1.1, 2 -> 1.2 and higher) +dnl +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_JNI], + [ + AC_ARG_WITH(jni, + [ --with-jni Build jni support], + [ + case "${withval}" in + y | yes | true) use_jni=true ;; + n | no | false) use_jni=false ;; + *) use_jni=true ;; + esac + + if ${TEST} "${use_jni}" = "true"; then + HAVE_JNI="-DHAVE_JNI" + JNI_BUILD="jni-build" + fi + ]) + ]) + +AC_DEFUN( + [JK_JDK], + [ + if ${TEST} "${use_jni}" = "true"; then + tempval="" + AC_MSG_CHECKING([for JDK location (please wait)]) + if ${TEST} -n "${JAVA_HOME}" ; then + JAVA_HOME_ENV="${JAVA_HOME}" + else + JAVA_HOME_ENV="" + fi + + JAVA_HOME="" + JAVA_PLATFORM="" + + AC_ARG_WITH( + [java-home], + [ --with-java-home=DIR Location of JDK directory.], + [ + + # This stuff works if the command line parameter --with-java-home was + # specified, so it takes priority rightfully. + + tempval=${withval} + + if ${TEST} ! -d "${tempval}" ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + JAVA_HOME=${tempval} + AC_MSG_RESULT(${JAVA_HOME}) + ], + [ + # This works if the parameter was NOT specified, so it's a good time + # to see what the enviroment says. + # Since Sun uses JAVA_HOME a lot, we check it first and ignore the + # JAVA_HOME, otherwise just use whatever JAVA_HOME was specified. + + if ${TEST} -n "${JAVA_HOME_ENV}" ; then + JAVA_HOME=${JAVA_HOME_ENV} + AC_MSG_RESULT(${JAVA_HOME_ENV} from environment) + fi + ]) + + if ${TEST} -z "${JAVA_HOME}" ; then + + # Oh well, nobody set neither JAVA_HOME nor JAVA_HOME, have to guess + # The following code is based on the code submitted by Henner Zeller + # for ${srcdir}/src/scripts/package/rpm/ApacheJServ.spec + # Two variables will be set as a result: + # + # JAVA_HOME + # JAVA_PLATFORM + AC_MSG_CHECKING([Try to guess JDK location]) + + for JAVA_PREFIX in /usr/local /usr/local/lib /usr /usr/lib /opt /usr/java ; do + + for JAVA_PLATFORM in 4 3 2 1 ; do + + for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 "" ; do + + for VARIANT in IBMJava2- java java- jdk jdk-; do + GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}" +dnl AC_MSG_CHECKING([${GUESS}]) + if ${TEST} -d "${GUESS}/bin" & ${TEST} -d "${GUESS}/include" ; then + JAVA_HOME="${GUESS}" + AC_MSG_RESULT([${GUESS}]) + break + fi + done + + if ${TEST} -n "${JAVA_HOME}" ; then + break; + fi + + done + + if ${TEST} -n "${JAVA_HOME}" ; then + break; + fi + + done + + if ${TEST} -n "${JAVA_HOME}" ; then + break; + fi + + done + + if ${TEST} ! -n "${JAVA_HOME}" ; then + AC_MSG_ERROR(can't locate a valid JDK location) + fi + + fi + + if ${TEST} -n "${JAVA_PLATFORM}"; then + AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM}) + else + AC_MSG_CHECKING(Java platform) + fi + + AC_ARG_WITH(java-platform, + [ --with-java-platform[=2] Force the Java platform + (value is 1 for 1.1.x or 2 for 1.2.x or greater)], + [ + case "${withval}" in + "1"|"2") + JAVA_PLATFORM=${withval} + ;; + *) + AC_MSG_ERROR(invalid java platform provided) + ;; + esac + ], + [ + if ${TEST} -n "${JAVA_PLATFORM}"; then + AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM}) + else + AC_MSG_CHECKING(Java platform) + fi + ]) + + AC_MSG_RESULT(${JAVA_PLATFORM}) + + unset tempval + else + # no jni, then make sure JAVA_HOME is not picked up from env + JAVA_HOME="" + JAVA_PLATFORM="" + fi + ]) + + +AC_DEFUN( + [JK_JDK_OS], + [ + if ${TEST} "${use_jni}" = "true"; then + tempval="" + OS="" + AC_ARG_WITH(os-type, + [ --with-os-type[=SUBDIR] Location of JDK os-type subdirectory.], + [ + tempval=${withval} + + if ${TEST} ! -d "${JAVA_HOME}/${tempval}" ; then + AC_MSG_ERROR(Not a directory: ${JAVA_HOME}/${tempval}) + fi + + OS = ${tempval} + ], + [ + AC_MSG_CHECKING(os_type directory) + if ${TEST} -f ${JAVA_HOME}/include/jni_md.h; then + OS="" + else + for f in ${JAVA_HOME}/include/*/jni_md.h; do + if ${TEST} -f $f; then + OS=`dirname ${f}` + OS=`basename ${OS}` + echo " ${OS}" + fi + done + if ${TEST} -z "${OS}"; then + AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS}) + AC_MSG_ERROR(You should retry --with-os-type=SUBDIR) + fi + fi + ]) + fi + ]) + +dnl vi:set sts=2 sw=2 autoindent: + diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_pcre.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_pcre.m4 new file mode 100644 index 00000000..8f0aab39 --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_pcre.m4 @@ -0,0 +1,40 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 + + + +AC_DEFUN( + [JK_PCRE], + [ + AC_ARG_WITH(pcre, + [ --with-pcre Build pcre support], + [ + case "${withval}" in + y | yes | true) use_pcre=true ;; + n | no | false) use_pcre=false ;; + *) use_pcre=true ;; + esac + + if ${TEST} ${use_pcre} ; then + HAS_PCRE="-I${includedir} -DHAS_PCRE" + PCRE_LIBS="-L${libdir} -lpcre -lpcreposix" + fi + ]) + ]) + +dnl vi:set sts=2 sw=2 autoindent: + diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_tchome.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_tchome.m4 new file mode 100644 index 00000000..2e657bbc --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_tchome.m4 @@ -0,0 +1,73 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_tchome.m4 466585 2006-10-21 22:16:34Z markt $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_TCHOME +dnl Set the Tomcat Home directory. +dnl $1 => Tomcat Name +dnl $2 => Tomcat VarName +dnl $3 => File which should be present +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_TCHOME], + [ + 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: diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_ws.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_ws.m4 new file mode 100644 index 00000000..de7a70fa --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/jk_ws.m4 @@ -0,0 +1,229 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 Henri Gomez <hgomez@apache.org> +dnl +dnl Inspired by Pier works on webapp m4 macros :) +dnl +dnl Version $Id: jk_ws.m4 466585 2006-10-21 22:16:34Z markt $ +dnl -------------------------------------------------------------------------- + +dnl -------------------------------------------------------------------------- +dnl JK_WS_DIR +dnl Set the WebServer source dir. +dnl $1 => Webserver name +dnl $2 => Webserver vars prefix name +dnl $3 => File which should be present +dnl $4 => Server specific source directory +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_WS_DIR], + [ + tempval="" + AC_ARG_WITH( + [$1], + [ --with-$1=DIR Location of $1 source dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + AC_MSG_ERROR(valid $1 source dir location required) + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(Don't use with/without $1 if you don't have $1) + ;; + *) + 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 + + if ${TEST} ! -z "$tempval" ; then + $2_BUILD="true" + $2_CFLAGS="-I ${tempval}/include" + $2_DIR=${tempval} + $2_HOME="${tempval}" + $2_LIBDIR="" + if ${TEST} -d ${withval}/include ; then + $2_INCL="-I${tempval}/include" + $2_INCDIR="${tempval}/include" + fi + if ${TEST} -d ${withval}/src/include ; then + # read osdir from the existing apache. + osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e 's:^OSDIR=.*/os:os:'` + if ${TEST} -z "${osdir}" ; then + osdir=os/unix + fi + $2_INCL="-I${tempval}/src/include -I${withval}/src/${osdir}" + $2_INCDIR="${tempval}/src/include" + fi + if ${TEST} -d ${tempval}/srclib/apr ; then + # Apache 2 contains apr. + if ${TEST} ! -f ${tempval}/srclib/apr/config.status ; then + AC_MSG_ERROR(configure Apache2 before mod_jk2) + fi + osdir=`${GREP} @OSDIR@ ${tempval}/srclib/apr/config.status | sed 's:s,@OSDIR@,::' | sed 's:,;t t::'` + $2_INCL="-I${tempval}/include -I${withval}/os/${osdir}" + $2_LIBEXEC=`${GREP} "^exp_libexecdir =" ${tempval}/build/config_vars.mk | sed 's:exp_libexecdir = ::'` + LIBTOOL=${tempval}/srclib/apr/libtool + APR_INCDIR=-I${tempval}/srclib/apr/include + APR_CFLAGS=`${tempval}/srclib/apr/apr-config --cflags` + APR_UTIL_INCDIR=-I${tempval}/srclib/apr-util/include + APR_LIBDIR_LA=`${tempval}/srclib/apr/apr-config --apr-la-file` + $2_LIBDIR=${tempval}/lib + + AC_SUBST(APR_INCDIR) + AC_SUBST(APR_CFLAGS) + AC_SUBST(APR_INCDIR) + AC_SUBST(APR_UTIL_INCDIR) + fi + $2_LDFLAGS="" + WEBSERVERS="${WEBSERVERS} $4" + + AC_SUBST($2_BUILD) + AC_SUBST($2_CFLAGS) + AC_SUBST($2_DIR) + AC_SUBST($2_HOME) + AC_SUBST($2_INCL) + AC_SUBST($2_INCDIR) + AC_SUBST($2_LDFLAGS) + AC_SUBST($2_LIBDIR) + + fi + ;; + esac + ]) + + if ${TEST} -z "$tempval" ; then + AC_MSG_RESULT(not provided) + else + AC_MSG_RESULT(${tempval}) + fi + + unset tempval + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_WS_INCDIR +dnl Set the WebServer include dir. +dnl $1 => Webserver name +dnl $2 => Webserver vars prefix name +dnl $3 => File which should be present +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_WS_INCDIR], + [ + tempval="" + AC_ARG_WITH( + [$1-include], + [ --with-$1-include=DIR Location of $1 include dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid $1 include dir 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 + + if ${TEST} ! -z "$tempval" ; then + $2_BUILD="" + $2_CFLAGS="-I${tempval}" + $2_CLEAN="" + $2_DIR="" + $2_INCDIR=${tempval} + AC_MSG_RESULT($2_INCDIR) + + AC_SUBST($2_BUILD) + AC_SUBST($2_CFLAGS) + AC_SUBST($2_CLEAN) + AC_SUBST($2_DIR) + AC_SUBST($2_INCDIR) + fi + ;; + esac + ]) + + unset tempval + ]) + + +dnl -------------------------------------------------------------------------- +dnl JK_WS_LIBDIR +dnl Set the WebServer library dir. +dnl $1 => Webserver name +dnl $2 => Webserver vars prefix name +dnl -------------------------------------------------------------------------- +AC_DEFUN( + [JK_WS_LIBDIR], + [ + tempval="" + AC_ARG_WITH( + [$1-lib], + [ --with-$1-lib=DIR Location of $1 lib dir ], + [ + case "${withval}" in + ""|"yes"|"YES"|"true"|"TRUE") + ;; + "no"|"NO"|"false"|"FALSE") + AC_MSG_ERROR(valid $1 lib directory location required) + ;; + *) + tempval="${withval}" + + if ${TEST} ! -d ${tempval} ; then + AC_MSG_ERROR(Not a directory: ${tempval}) + fi + + if ${TEST} ! -z "$tempval" ; then + $2_BUILD="" + $2_CLEAN="" + $2_DIR="" + $2_LIBDIR=${tempval} + $2_LDFLAGS="" + AC_MSG_RESULT($2_LIBDIR) + + AC_SUBST($2_BUILD) + AC_SUBST($2_CLEAN) + AC_SUBST($2_DIR) + AC_SUBST($2_LIBDIR) + AC_SUBST($2_LDFLAGS) + fi + + ;; + esac + ]) + + unset tempval + ]) + +dnl vi:set sts=2 sw=2 autoindent: + diff --git a/rubbos/app/tomcat-connectors-1.2.32-src/support/os_apache.m4 b/rubbos/app/tomcat-connectors-1.2.32-src/support/os_apache.m4 new file mode 100644 index 00000000..8b4e8ab7 --- /dev/null +++ b/rubbos/app/tomcat-connectors-1.2.32-src/support/os_apache.m4 @@ -0,0 +1,44 @@ +dnl +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. 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 copied from httpd-2.0/os/config.m4 +dnl OS changed to OS_APACHE and OS_DIR to OS_APACHE_DIR + +AC_MSG_CHECKING(for target platform) + +#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess` +PLATFORM=$host + +case "$PLATFORM" in +*beos*) + OS_APACHE="beos" + OS_APACHE_DIR=$OS_APACHE + ;; +*pc-os2_emx*) + OS_APACHE="os2" + OS_APACHE_DIR=$OS_APACHE + ;; +bs2000*) + OS_APACHE="unix" + OS_APACHE_DIR=bs2000 # only the OS_APACHE_DIR is platform specific. + ;; +*) + OS_APACHE="unix" + OS_APACHE_DIR=$OS_APACHE;; +esac + +AC_MSG_RESULT($OS_APACHE) |