Author: jfrederic.clere(a)jboss.com
Date: 2014-08-23 06:10:16 -0400 (Sat, 23 Aug 2014)
New Revision: 3348
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
httpd 2.4.x doesn't have apr/apr-util/apr-iconv.
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-23 09:19:52 UTC (rev 3347)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-23 10:10:16 UTC (rev 3348)
@@ -137,14 +137,19 @@
fi
fi
done
- # Apply patches for iconv
- if [ "${BUILD_SYS}" = "windows" ]; then
- (cd ${dirsources}/srclib/apr-iconv
- ${patch} -p0 < apr-iconv.patch
- )
- else
- rm -rf ${dirsources}/srclib/apr-iconv
- fi
+ # Apply patches for iconv (well not on httpd-2.4.x)
+ case ${httpd_version} in
+ 2.2*)
+ if [ "${BUILD_SYS}" = "windows" ]; then
+ (cd ${dirsources}/srclib/apr-iconv
+ ${patch} -p0 < apr-iconv.patch
+ )
+ else
+ rm -rf ${dirsources}/srclib/apr-iconv
+ fi
+ ;;
+ esac
+
# Apply other patches.
$build_top/util/applypatch.sh $build_top ${dirsources} false
else
Show replies by date