Author: jfrederic.clere(a)jboss.com Date: 2014-01-23 06:02:15 -0500 (Thu, 23 Jan 2014) New Revision: 3172 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: download apr and apr-util for httpd-2.4.x Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-01-23 09:46:28 UTC (rev 3171) +++ trunk/build/unix/build.sh 2014-01-23 11:02:15 UTC (rev 3172) @@ -248,6 +248,8 @@ esac fi done +export has_apr +export has_apu # Get plaform information so_extension=so @@ -1244,6 +1246,10 @@ APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta... fi +export APRURL +export APRURL +export APRURLBACK +export APRURLBACK SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz SSLURLBACK=ftp://mirror.switch.ch/mirror/openssl/source/openssl-${ssl_version}.tar.gz ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 09:46:28 UTC (rev 3171) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-23 11:02:15 UTC (rev 3172) @@ -53,6 +53,16 @@ dirsources=`ls ${native_dist}/srclib/ | grep httpd-` dirsources=${native_dist}/srclib/${dirsources} +# Add apr and apr-util +if [ $has_apr ]; then + util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-${apr_version} $APRURL $APRURLBACK false + mv $dirsources/srclib/apr-${apr-version} $dirsources/srclib/apr +fi +if [ $has_apu ]; then + util/ckeckdownload.sh $build_cache_dir $dirsources/srclib $build_top apr-util-${apu_version} $APIURL $APIURLBACK false + mv $dirsources/srclib/apr-util-${apr-version} $dirsources/srclib/apr-util +fi + # On windows add zlib if [ "${BUILD_SYS}" = "windows" ]; then rm -rf ${dirsources}/srclib/zlib