[jbossnative-commits] JBoss Native SVN: r1332 - trunk/build/unix.

[jbossnative-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2008-02-01 08:50:48 -0500 (Fri, 01 Feb 2008)
New Revision: 1332

Modified:
   trunk/build/unix/build.sh
   trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Remove apr-iconv for non-windows platforms from the sources -- temporary hack

Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh	2008-02-01 12:57:48 UTC (rev 1331)
+++ trunk/build/unix/build.sh	2008-02-01 13:50:48 UTC (rev 1332)
@@ -293,7 +293,6 @@
     ;;
 esac
 
-#
 # Display what we are going to do.
 echo "Building ${PACKAGE} on ${BUILD_SYS} ${BUILD_CPU}"
 if $has_apr; then
@@ -321,11 +320,6 @@
 echo "using expat: ${expat_version}"
 fi
 
-# XXX: HACK JFCLERE
-if [ ${PACKAGE} == "rhel-httpd" ];then
-  build_api=false
-fi
-
 export has_jk
 export so_extension
 export NATIVEEOL

Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh	2008-02-01 12:57:48 UTC (rev 1331)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh	2008-02-01 13:50:48 UTC (rev 1332)
@@ -112,6 +112,11 @@
   exit 1
 fi
 
+# mturk Hack.
+if [ "${BUILD_SYS}" != "windows" ]; then
+  rm -rf ${dirsources}/srclib/apr-iconv
+fi
+
 # Replace libtool by our libtool
 case ${BUILD_SYS} in
   hpux*)