Commit bcba43e5 authored by whitlocb's avatar whitlocb

I merged the RC to the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7549 18c085ea-50e0-402c-830e-de6fd14e8384
parent b1f6a2fd
This diff is collapsed.
......@@ -137,4 +137,3 @@ DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/i386-apple-darwin8/lib
##
DEFAULT_SILO_LIBLOC=$VISITHOME/silo/4.7/i386-apple-darwin8_gcc-4.0.1
DEFAULT_SILO_LIBDEP=-L$DEFAULT_HDF5_LIBLOC/lib,-lhdf5,$DEFAULT_HDF5_LIBDEP
This diff is collapsed.
......@@ -3614,7 +3614,7 @@ AC_TYPE_UID_T
#
AC_ARG_ENABLE(nospin-bcast,
[ --disable-nospin-bcast Use straight MPI_BCast instead of VisIt's no-spin BCast for getting commands from rank 0],
UseSelect="$enable_nospin_bcast",UseNoSpinBCast=yes)
UseNoSpinBCast="$enable_nospin_bcast",UseNoSpinBCast=yes)
if test "$UseNoSpinBCast" == "yes" ; then
AC_DEFINE(VISIT_USE_NOSPIN_BCAST, [1], [Define if we want to use VisIt's no-spin BCast.])
fi
......@@ -3627,7 +3627,8 @@ AC_ARG_ENABLE(select,
[ --disable-select build without using the select function],
UseSelect="$enable_select",UseSelect=yes)
if test "$UseSelect" == "yes" ; then
SELECT_FUNCTION="select"
SELECT_FUNCTION="select"
AC_DEFINE(HAVE_SELECT, [1], [Define if we want to use select function.])
fi
#
......
......@@ -81,6 +81,9 @@
/* Define if you have pyparsing. */
#undef HAVE_PYPARSING
/* Define if we want to use select function. */
#undef HAVE_SELECT
/* Define to 1 if you have the `setenv' function. */
#undef HAVE_SETENV
......@@ -208,9 +211,6 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Define to enable Tuvok-based code */
#undef USE_TUVOK
/* Shared library extension */
#undef VISIT_PLUGIN_EXTENSION
......@@ -226,18 +226,18 @@
/* Subversion revision */
#undef VISIT_SVN_REVISION
/* Define VISIT_USE_PTY if we want to use PTYs. */
#undef VISIT_USE_PTY
/* VisIt version */
#undef VISIT_VERSION
/* Enable use of mangled Mesa classes in VisIt. */
#undef VISIT_USE_MANGLED_MESA
/* Define if we want to use VisIt's no-spin BCast. */
#undef VISIT_USE_NOSPIN_BCAST
/* Define VISIT_USE_PTY if we want to use PTYs. */
#undef VISIT_USE_PTY
/* VisIt version */
#undef VISIT_VERSION
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
......
......@@ -40,6 +40,9 @@
# Jeremy Meredith, Fri Sep 7 13:18:56 EDT 2007
# Don't remove the boost header files in make clean, just distclean.
#
# Mark C. Miller, Mon Jun 15 22:22:46 PDT 2009
# Removed @LIBTARGETS@ line. It was not needed anyway and caused problems
# for SUSE make-3.8x.
##############################################################################
##
## Programs and options...
......@@ -77,4 +80,3 @@ message:
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment