Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 04:03:17 -0500 (Thu, 23 Jan 2014) New Revision: 3170 Modified: trunk/build/unix/buildsrc.cluster.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: Arrange config.m4 patches (2.4 != 2.2). Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2014-01-23 07:53:06 UTC (rev 3169) +++ trunk/build/unix/buildsrc.cluster.sh 2014-01-23 09:03:17 UTC (rev 3170) @@ -28,6 +28,7 @@ echo "Tag : $1" echo "Target : $2" echo "Destdir : $3" +echo "HttpVer : $4" echo "" # parameters @@ -37,6 +38,7 @@ tag=$1 dist=$2 destdir=$3 +httpd_version=$4 # we need something like: # http://anonsvn.jboss.org/repos/mod_cluster/trunk/ @@ -112,6 +114,15 @@ cp -p $package_src_dir/srclib/mod_cluster/native/mod_proxy_cluster/*.patch ${destdir}/modules/proxy # Fix the config.m4 to build mod_cluster +case ${httpd_version} in + 2.2*) + configm4patch=config.m4.patch + ;; + 2.4*) + configm4patch=config.m4.patch.2.4 + ;; +esac +if (cd ${destdir}/modules/proxy - $patch -p0 < config.m4.patch + $patch -p0 < ${configm4patch} ) Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 07:53:06 UTC (rev 3169) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 09:03:17 UTC (rev 3170) @@ -63,7 +63,7 @@ # Add mod_jk sources. if $has_jk; then - ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir} ${dirsources} + ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir} ${dirsources} ${httpd_version} if [ $? -ne 0 ]; then echo "buildsrc.asf-jk.sh failed" exit 1 @@ -74,7 +74,7 @@ # # Add mod_cluster sources. if $has_cluster; then - ${build_top}/util/override.sh ${build_top}/buildsrc.cluster.sh ${cluster_version} ${package_src_dir} ${dirsources} + ${build_top}/util/override.sh ${build_top}/buildsrc.cluster.sh ${cluster_version} ${package_src_dir} ${dirsources} ${httpd_version} if [ $? -ne 0 ]; then echo "buildsrc.cluster.sh failed" exit 1