[mapguide-commits] r7463 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 24 10:47:28 PDT 2013
Author: jng
Date: 2013-04-24 10:47:27 -0700 (Wed, 24 Apr 2013)
New Revision: 7463
Modified:
trunk/MgDev/build_oem.sh
Log:
Merge revisions from 2.5 branch: r7379, r7380, r7381, r7384
Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh 2013-04-24 00:47:55 UTC (rev 7462)
+++ trunk/MgDev/build_oem.sh 2013-04-24 17:47:27 UTC (rev 7463)
@@ -110,6 +110,7 @@
build_dwfcore()
{
pushd DWFTK7.1/develop/global/src/dwfcore
+ libtoolize --copy --force
sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
make
check_build
@@ -140,6 +141,7 @@
build_dwftk()
{
pushd DWFTK7.1/develop/global/src/dwf
+ libtoolize --copy --force
sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
make
check_build
@@ -170,6 +172,7 @@
build_dwfemap()
{
pushd DWFTK7.1/develop/global/src/dwfemap
+ libtoolize --copy --force
sh ./configure --enable-optimized --prefix="${INSTALLDIR}"
make
check_build
@@ -279,6 +282,14 @@
build_bdbxml()
{
+ # Need to force regen of the correct xerces config header before building dbxml proper
+ pushd dbxml/xerces-c-src
+ sh ./configure
+ popd
+ # Also need to check and set executable flag for s_paths
+ pushd dbxml/dbxml/dist
+ chmod +x s_paths
+ popd
pushd dbxml
sh ./buildall.sh
check_build
@@ -306,7 +317,13 @@
build_cppunit()
{
pushd CppUnit-1.9.14
- sh ./configure --prefix="${INSTALLDIR}"
+ # Force regen of configure to cover our bases
+ aclocal -I config
+ libtoolize --copy --force
+ autoconf
+ automake --add-missing --copy --force-missing
+ # -ldl is to prevent undefined reference to dlsym/dlopen/dlclose
+ sh ./configure --prefix="${INSTALLDIR}" LDFLAGS="-ldl"
make
check_build
popd
@@ -523,7 +540,8 @@
build_json()
{
pushd jsoncpp
- python scons.py platform=linux-gcc
+ # Use system scons
+ scons platform=linux-gcc
popd
}
More information about the mapguide-commits
mailing list