[mapguide-commits] r8337 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-08-18 06:22:43 -0700 (Mon, 18 Aug 2014)
New Revision: 8337

Modified:
   trunk/MgDev/
   trunk/MgDev/build_oem.sh
Log:
Merged revision(s) 8335 from branches/2.6/MgDev:
Fix the cause of non-functional iconv APIs in MapGuide on CentOS. It was r8106 that introduced 2 aclocal/libtoolize/automake/autoconf quartets to build_oem.sh, one or both of these has rendered the use of any iconv APIs within MapGuide non-functional as a result. Non functional iconv APIs caused:

 * "Could not load a transcoding service" error in xerces that we worked around by building xerces with a different transcoder. We can probably revert this change.
 * "Memory allocation failed" errors from the SHP provider. SHP provider uses iconv APIs to do char <-> wchar_t conversion.
........



Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163

Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh	2014-08-18 08:11:15 UTC (rev 8336)
+++ trunk/MgDev/build_oem.sh	2014-08-18 13:22:43 UTC (rev 8337)
@@ -232,10 +232,6 @@
 build_geos()
 {
     pushd geos-2.2.0
-    aclocal
-    libtoolize --copy --force
-    automake --add-missing --copy
-    autoconf
     if [ $BUILD_CPU -eq 64 ]; then
         sh ./configure --with-pic --prefix="${INSTALLDIR}"
     else
@@ -524,10 +520,6 @@
 build_gd()
 {
     pushd gd/gd
-    aclocal
-    libtoolize --copy --force
-    automake --add-missing --copy
-    autoconf
     if [ $BUILD_CPU -eq 64 ]; then
         sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-pic
     else