Commit in SimDist/build on MAIN
ogl.m4+2-21.4 -> 1.5
packages.m4+3-11.39 -> 1.40
util.m4+2-31.17 -> 1.18
+7-6
3 modified files


SimDist/build
ogl.m4 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- ogl.m4	17 Aug 2007 18:16:32 -0000	1.4
+++ ogl.m4	26 Jul 2010 21:12:15 -0000	1.5
@@ -6,10 +6,10 @@
 if test -z $OGLHOME
 then
   case "$host_os" in
-    linux*           )
+    cygwin*|linux* )
       OGLHOME=/usr
       ;;
-    cygwin*|darwin*  )
+    darwin*        )
       OGLHOME=/usr/X11R6
       ;;
   esac

SimDist/build
packages.m4 1.39 -> 1.40
diff -u -r1.39 -r1.40
--- packages.m4	21 Jul 2010 21:55:40 -0000	1.39
+++ packages.m4	26 Jul 2010 21:12:15 -0000	1.40
@@ -288,7 +288,9 @@
 XERCES_BUILDDIR=${package_base_dir}
 XERCES_CONFIG=./configure
 
-XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes --prefix=${XERCES_BASEDIR}"
+dnl XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes --prefix=${XERCES_BASEDIR}"
+
+XERCES_CONFIG_OPTS="--enable-shared=yes --enable-static=yes --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no"
 
 xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
 xerces_version_dot=$(VERSION_DOT(xerces_version_dot, ${XERCES_VERSION}))

SimDist/build
util.m4 1.17 -> 1.18
diff -u -r1.17 -r1.18
--- util.m4	12 Jul 2010 22:43:46 -0000	1.17
+++ util.m4	26 Jul 2010 21:12:15 -0000	1.18
@@ -93,10 +93,9 @@
 dnl cmake
 AC_CHECK_PROG(have_cmake, cmake, yes, no)
 
-if test $have_cmake == "no"
+dnl Optional component so no error message here.
+if test $have_cmake == "yes"
 then 
-  AC_MSG_ERROR(cmake was not found on this system)
-else
   CMAKE=cmake
   AC_SUBST(CMAKE)
 fi
CVSspam 0.2.8