[mapguide-commits] r8258 - in sandbox/jng/geos34x: . Oem/geos

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-06-23 04:04:07 -0700 (Mon, 23 Jun 2014)
New Revision: 8258

Modified:
   sandbox/jng/geos34x/Oem/geos/configure.in
   sandbox/jng/geos34x/build_oem.sh
Log:
Update build_oem.sh for geos. Also add silent rules support for geos

Modified: sandbox/jng/geos34x/Oem/geos/configure.in
===================================================================
--- sandbox/jng/geos34x/Oem/geos/configure.in	2014-06-23 02:10:12 UTC (rev 8257)
+++ sandbox/jng/geos34x/Oem/geos/configure.in	2014-06-23 11:04:07 UTC (rev 8258)
@@ -35,6 +35,8 @@
 CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
 
 AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
+# Enable silent rules if supported. Allows for less verbose output while still displaying any compiler/linker warnings/errors
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h])
 AC_PROG_CC

Modified: sandbox/jng/geos34x/build_oem.sh
===================================================================
--- sandbox/jng/geos34x/build_oem.sh	2014-06-23 02:10:12 UTC (rev 8257)
+++ sandbox/jng/geos34x/build_oem.sh	2014-06-23 11:04:07 UTC (rev 8258)
@@ -239,18 +239,17 @@
 build_geos()
 {
     pushd geos
-    aclocal
-    libtoolize --copy --force
-    automake --add-missing --copy
-    autoconf
+    # For this version of GEOS, don't run the aclocal/libtoolize/automake/autoconf quartet as we normally do, as it
+    # may produce an unusable configure script. Just run autoreconf to regenerate the configure script from configure.in
+    autoreconf
     if [ $BUILD_CPU -eq 64 ]; then
-        sh ./configure --with-pic --prefix="${INSTALLDIR}"
+        sh ./configure --with-pic --enable-silent-rules --prefix="${INSTALLDIR}"
     else
-        sh ./configure --prefix="${INSTALLDIR}"
+        sh ./configure --enable-silent-rules --prefix="${INSTALLDIR}"
     fi
     make
     # The check build is disabled as the build will fail with automake version < 2.59
-    # check_build
+    check_build
     popd
 }