Author: jfrederic.clere(a)jboss.com
Date: 2009-11-26 08:05:50 -0500 (Thu, 26 Nov 2009)
New Revision: 2597
Modified:
trunk/build/unix/build.sh
Log:
apr-util depends on apr-iconv for xlate.c (1.3.x).
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-11-26 08:38:35 UTC (rev 2596)
+++ trunk/build/unix/build.sh 2009-11-26 13:05:50 UTC (rev 2597)
@@ -1157,15 +1157,19 @@
if $has_apr; then
checkdownload apr ${apr_version} $APRURL $APRURLBACK
fi
-if $has_apu; then
- checkdownload apr-util ${apu_version} $APUURL $APUURLBACK
-fi
if $has_api; then
checkdownload apr-iconv ${api_version} $APIURL $APIURLBACK
fi
if $has_iconv; then
checkdownload libiconv ${iconv_version} $ICONVURL "NONE"
fi
+# apr-util depends on apr-iconv for xlate.c (1.3.x).
+if $has_apu; then
+ checkdownload apr-util ${apu_version} $APUURL $APUURLBACK
+ if [ -f $package_src_dir/srclib/apr-iconv-${iconv_version}/include/apr_iconv.h ]; then
+ cp $package_src_dir/srclib/apr-iconv-${iconv_version}/include/*
$package_src_dir/srclib/apr-util-${apu_version}/include
+ fi
+fi
if $has_expat; then
checkdownload expat ${expat_version} $EXPATURL "NONE"
fi
Show replies by date