Update from July 12, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@277 18c085ea-50e0-402c-830e-de6fd14e8384

Update from July 12, 2004
git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@277 18c085ea-50e0-402c-830e-de6fd14e8384
3173cc43 · hrchilds · 5494d0bf · 3173cc43 · 3173cc43 · 3173cc43
Commit 3173cc43 authored Apr 01, 2007 by hrchilds
45 changed files
--- a/BUILD_NOTES
+++ b/BUILD_NOTES
@@ -110,6 +110,10 @@ cd Mesa-5.0
 #  make solaris-x86-gcc      for PCs with Solaris using GCC
 #  make sunos5-sl            for Suns with SunOS 5.x, make shared libs
 #  make sunos5-gcc-sl        for Suns with SunOS 5.x, GCC, make shared libs
+#
+# To change the compiler modify CC and CXX in the file Make-config under
+# the appropriate target from the above list.
+#

 #
 # Install it in the visit directory under the mesa directory.
@@ -177,14 +181,14 @@ cd VTK
 # (/usr/shlib/libGL.so on tru64 systems.)
 #
 # On AIX, you may experience problems with X11 headers. Check the following
-# and modify as necessary: CMAKE_X_FLAGS, X11_X11_INCLUDE_PATH, 
+# and modify as necessary: CMAKE_X_CFLAGS, X11_X11_INCLUDE_PATH, 
 # X11_Xlib_INCLUDE_PATH, X11_Xutil_INCLUDE_PATH
 #
 ../cmake-1.8.1/bin/cmake .
 #
 # Edit CMakeCache.txt, setting MANGLED_MESA_INCLUDE_DIR, MANGLED_MESA_LIBRARY,
-# MANGLED_OSMESA_INCLUDE_DIR, MANGLED_OSMESA_LIBRARY, to point to the appropriate 
-# files and directories in the mesa directory.
+# MANGLED_OSMESA_INCLUDE_DIR, MANGLED_OSMESA_LIBRARY, to point to the
+# appropriate files and directories in the mesa directory.
 # For example:
 #
 # MANGLED_MESA_INCLUDE_DIR:PATH=/home/visit/mesa/include
@@ -338,6 +342,36 @@ setenv QTDIR `pwd`
 #
 make

+#
+# Build Qt 3.3.2
+#
+gunzip qt-x11-free-3.3.2.tar.gz
+tar xf qt-x11-free-3.3.2.tar
+cd qt-x11-free-3.3.2
+setenv QTDIR `pwd`
+set path=($QTDIR/bin $path)
+setenv LD_LIBRARY_PATH $QTDIR/lib:$LD_LIBRARY_PATH
+setenv LD_LIBRARYN32_PATH $QTDIR/lib:$LD_LIBRARYN32_PATH     # SGI
+setenv LD_LIBRARY64_PATH $QTDIR/lib:$LD_LIBRARY64_PATH       # SGI
+# Use the appropriate configure command based on the operating system on
+# which you are building Qt.
+./configure -platform aix-g++ -shared -no-largefile -qt-libpng
+./configure -platform irix-cc-64 -shared -qt-libpng
+./configure -platform linux-g++ -shared -qt-libpng
+./configure -platform solaris-g++ -shared -qt-libpng
+./configure -platform tru64-g++ -shared -qt-libpng
+#
+# On tru64 systems you will need to make the following changes to
+# the file mkspecs/tru64-g++/qmake.conf:
+# set QMAKE_LIBDIR_OPENGL to "/usr/shlib"
+#
+# On aix systems you will need to make the following changes to
+# the file mkspecs/aix-g++/qmake.conf:
+# remove "/usr/X11R6/include" from QMAKE_INCDIR_X11
+# remove "/usr/X11R6/include" from QMAKE_INCDIR_OPENGL
+#
+make
+
 #
 # Install it in the visit directory under the qt directory.
 #
@@ -355,7 +389,7 @@ cd ../..
 # On AIX systems you will need to add an additional link to the lib
 # directory so that the loader can find the library.
 #
-# ln -s libqt.so.2.3.0 visit/qt/lib/libqt.so
+# ln -s libqt.so.3.3.2 visit/qt/lib/libqt.so
 #

 Silo
@@ -456,9 +490,9 @@ env command for configure.
 #
 # Build and install it in the visit directory.
 #
-gunzip visit040628.tar.gz
-tar xf visit040628.tar
-cd visit040628/config-site
+gunzip visit040719.tar.gz
+tar xf visit040719.tar
+cd visit040719/config-site
 echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
 cat Template.conf >> `hostname`.conf
 cd ..
@@ -467,11 +501,11 @@ make
 clearcase_bin/visit-bin-dist
 # Use the appropriate install command based on the operating system on
 # which you built VisIt.
-clearcase_bin/visit-install 1.3.2 aix `cat ../visitpath`
-clearcase_bin/visit-install 1.3.2 irix6 `cat ../visitpath`
-clearcase_bin/visit-install 1.3.2 linux `cat ../visitpath`
-clearcase_bin/visit-install 1.3.2 osf1 `cat ../visitpath`
-clearcase_bin/visit-install 1.3.2 sunos5 `cat ../visitpath`
+clearcase_bin/visit-install 1.3.3 aix `cat ../visitpath`
+clearcase_bin/visit-install 1.3.3 irix6 `cat ../visitpath`
+clearcase_bin/visit-install 1.3.3 linux `cat ../visitpath`
+clearcase_bin/visit-install 1.3.3 osf1 `cat ../visitpath`
+clearcase_bin/visit-install 1.3.3 sunos5 `cat ../visitpath`

 When running the configure script you can enable or disable certain dependent
 packages.  All the configure options are listed at the beginning of the

--- a/INSTALL_NOTES
+++ b/INSTALL_NOTES
@@ -17,7 +17,7 @@ Unix and Mac OS X:

    where

-        "version" will be 1.3.2 for the current distribution.
+        "version" will be 1.3.3 for the current distribution.

        "platform" will be one of the following:  aix, darwin, irix6, linux,
        osf1, or sunos5 depending on the machine.  The one you use should
@@ -28,17 +28,17 @@ Unix and Mac OS X:

    For example

-        visit-install 1.3.2 irix6 /usr/local/visit
+        visit-install 1.3.3 irix6 /usr/local/visit

-    will install the irix6, 1.3.2 version of visit in the directory
+    will install the irix6, 1.3.3 version of visit in the directory
    "/usr/local/visit".  Note that you will need to have the file
-    "visit1_3_2.irix6.tar.gz" present in the current directory for this
+    "visit1_3_3.irix6.tar.gz" present in the current directory for this
    to function properly.  You can install multiple binaries into the
    same directory.  For example, you could then execute

-        visit-install 1.3.2 linux /usr/local/visit
+        visit-install 1.3.3 linux /usr/local/visit

-    to add a linux, 1.3.2 version of visit to the same directory.
+    to add a linux, 1.3.3 version of visit to the same directory.

 2.  Add the bin directory below the installation directory
    (/usr/local/visit/bin in our example) to each user's search path.
@@ -76,8 +76,8 @@ Unix and Mac OS X:

 Windows:

-1.  Copy the file visit1.3.2.exe to your desktop.
+1.  Copy the file visit1.3.3.exe to your desktop.

-2.  Double click on the visit1.3.2.exe icon to run the installer.
+2.  Double click on the visit1.3.3.exe icon to run the installer.

 3.  Follow the directions provided by the installer.
--- a/VERSION
+++ b/VERSION
-1.3.2
+1.3.4
--- a/bin/visit.c
+++ b/bin/visit.c
@@ -268,11 +268,47 @@ main(int argc, char *argv[])
 *            should be freed by the caller.
 *
 * Modifications:
+ *   Brad Whitlock, Mon Jul 12 16:34:18 PST 2004
+ *   I made it use ReadKeyFromRoot so we can check for VisIt information
+ *   in a couple places. This is to avoid the situation where VisIt won't
+ *   run when installed without Administrator access.
 *
 *****************************************************************************/

 int
 ReadKey(const char *key, char **keyval)
+{
+    int retval = 0;
+
+    if((retval = ReadKeyFromRoot(HKEY_LOCAL_MACHINE, key, keyval)) == 0)
+        retval = ReadKeyFromRoot(HKEY_CURRENT_USER, key, keyval);
+    
+    return retval;     
+}
+
+/******************************************************************************
+ *
+ * Purpose: Reads a string value from the Windows registry entry for the
+ *          current version of VisIt.
+ *
+ * Programmer: Brad Whitlock
+ * Date:       Mon Aug 26 13:08:21 PST 2002
+ *
+ * Input Arguments:
+ *   which_root : The root key to open.
+ *   key        : The key that we're looking for.
+ *
+ * Output Arguments:
+ *   keyval : A string containing the value for the key. This memory is
+ *            allocated regardless of whether or not the key is found and it
+ *            should be freed by the caller.
+ *
+ * Modifications:
+ *
+ *****************************************************************************/
+
+int
+ReadKeyFromRoot(HKEY which_root, const char *key, char **keyval)
 {
    int  readSuccess = 0;
    char regkey[100];
@@ -281,7 +317,7 @@ ReadKey(const char *key, char **keyval)
    /* Try and read the key from the system registry. */
    sprintf(regkey, "VISIT%s", VERSION);
    *keyval = (char *)malloc(500);
-    if(RegOpenKeyEx(HKEY_CLASSES_ROOT, regkey, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
+    if(RegOpenKeyEx(which_root, regkey, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
    {
        DWORD keyType, strSize = 500;
        if(RegQueryValueEx(hkey, key, NULL, &keyType, *keyval, &strSize) == ERROR_SUCCESS)

--- a/clearcase_bin/visit-config-open
+++ b/clearcase_bin/visit-config-open
@@ -12,7 +12,7 @@
            <Field name="id" type="stringVector">Streamline_1.0 InverseGhostZone_1.0 </Field>
            <Field name="enabled" type="intVector">0 0 </Field>
        </Object>
-        <Object name="HostProfileList" childObjects="21">
+        <Object name="HostProfileList" childObjects="23">
            <Object name="HostProfile" childObjects="0">
                <Field name="profileName" type="string">serial</Field>
                <Field name="host" type="string">blue.llnl.gov</Field>
@@ -475,6 +475,50 @@
                <Field name="arguments" type="stringVector">-dir /usr/gapps/visit</Field>
                <Field name="parallel" type="bool">true</Field>
            </Object>
+            <Object name="HostProfile" childObjects="0">
+                <Field name="profileName" type="string">serial</Field>
+                <Field name="host" type="string">uv.asci.llnl.gov</Field>
+                <Field name="hostAliases" type="string">uv#.asci.llnl.gov uv##.asci.llnl.gov uv###.asci.llnl.gov uv# uv## uv###</Field>
+                <Field name="timeout" type="int">480</Field>
+                <Field name="numProcessors" type="int">1</Field>
+                <Field name="numNodesSet" type="bool">false</Field>
+                <Field name="numNodes" type="int">0</Field>
+                <Field name="partitionSet" type="bool">false</Field>
+                <Field name="partition" type="string"></Field>
+                <Field name="bankSet" type="bool">false</Field>
+                <Field name="bank" type="string"></Field>
+                <Field name="timeLimitSet" type="bool">false</Field>
+                <Field name="timeLimit" type="string"></Field>
+                <Field name="launchMethodSet" type="bool">false</Field>
+                <Field name="launchMethod" type="string"></Field>
+                <Field name="forceStatic" type="bool">true</Field>
+                <Field name="forceDynamic" type="bool">false</Field>
+                <Field name="active" type="bool">true</Field>
+                <Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
+                <Field name="parallel" type="bool">false</Field>
+            </Object>
+            <Object name="HostProfile" childObjects="0">
+                <Field name="profileName" type="string">parallel pbatch</Field>
+                <Field name="host" type="string">uv.asci.llnl.gov</Field>
+                <Field name="hostAliases" type="string">>uv#.asci.llnl.gov uv##.asci.llnl.gov uv###.asci.llnl.gov uv# uv## uv###</Field>
+                <Field name="timeout" type="int">480</Field>
+                <Field name="numProcessors" type="int">16</Field>
+                <Field name="numNodesSet" type="bool">true</Field>
+                <Field name="numNodes" type="int">2</Field>
+                <Field name="partitionSet" type="bool">true</Field>
+                <Field name="partition" type="string">uv</Field>
+                <Field name="bankSet" type="bool">true</Field>
+                <Field name="bank" type="string">bdivp</Field>
+                <Field name="timeLimitSet" type="bool">true</Field>
+                <Field name="timeLimit" type="string">30m</Field>
+                <Field name="launchMethodSet" type="bool">true</Field>
+                <Field name="launchMethod" type="string">psub</Field>
+                <Field name="forceStatic" type="bool">true</Field>
+                <Field name="forceDynamic" type="bool">false</Field>
+                <Field name="active" type="bool">false</Field>
+                <Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
+                <Field name="parallel" type="bool">true</Field>
+            </Object>
            <Field name="activeProfile" type="int">1</Field>
        </Object>
    </Object>

--- a/common/icons/VisIt1.3.xcf
+++ b/common/icons/VisIt1.3.xcf
--- a/common/icons/VisIt1.xpm
+++ b/common/icons/VisIt1.xpm
--- a/common/icons/VisIt2.xpm
+++ b/common/icons/VisIt2.xpm
--- a/common/icons/VisIt3.xpm
+++ b/common/icons/VisIt3.xpm
--- a/common/icons/VisIt4.xpm
+++ b/common/icons/VisIt4.xpm
--- a/components/Queries/Misc/avtQueryOverTimeFilter.C
+++ b/components/Queries/Misc/avtQueryOverTimeFilter.C
@@ -5,7 +5,6 @@
 #include <float.h>
 #include <snprintf.h>
 #include <string.h>
-#include <strstream.h>

 #include <avtQueryOverTimeFilter.h>
 #include <avtQueryFactory.h>

--- a/config-site/elysium.llnl.gov.conf
+++ b/config-site/elysium.llnl.gov.conf
@@ -3,25 +3,6 @@
 ##
 VISITHOME=/usr/gapps/visit

-##
-## Use mpich for parallel builds
-##
-LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
-CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
-MPI_LIBS="-lmpich"
-
-##
-## Use the newest versions of the exodus include files and library files
-##
-DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
-DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
-
-##
-## Use the newest versions of the silo include files and library files
-##
-DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
-DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
-
 ##
 ## If MESA is not set, use VisIt's mesa.
 ##
@@ -39,7 +20,7 @@ fi
 ##
 ## Use VisIt's Qt.
 ##
-QTDIR=$VISITHOME/qt/current/redhat_6
+QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_g++_2.96

 ##
 ## Use VisIt's Python.
@@ -47,6 +28,30 @@ QTDIR=$VISITHOME/qt/current/redhat_6
 PYDIR=$VISITHOME/python/redhat_6
 PYVERSION=python2.1

+##
+## Use mpich for parallel builds
+##
+LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
+CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
+MPI_LIBS="-lmpich"
+
+##
+## Database reader plugin support libraries
+##
+###############################################################################
+
+##
+## Use the newest versions of the silo include files and library files
+##
+DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
+DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
+
+##
+## Use the newest versions of the exodus include files and library files
+##
+DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
+DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
+
 ##
 ## HDF4
 ##
@@ -71,4 +76,3 @@ DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
 DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
 DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
 DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
-
--- a/config-site/gentoo.llnl.gov.conf
+++ b/config-site/gentoo.llnl.gov.conf
@@ -3,25 +3,6 @@
 ##
 VISITHOME=/usr/gapps/visit

-##
-## Use mpich for parallel builds
-##
-LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
-CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
-MPI_LIBS="-lmpich"
-
-##
-## Use the newest versions of the exodus include files and library files
-##
-DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
-DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
-
-##
-## Use the newest versions of the silo include files and library files
-##
-DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
-DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
-
 ##
 ## If MESA is not set, use VisIt's mesa.
 ##
@@ -39,7 +20,7 @@ fi
 ##
 ## Use VisIt's Qt.
 ##
-QTDIR=$VISITHOME/qt/current/redhat_6
+QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_g++_2.96

 ##
 ## Use VisIt's Python.
@@ -47,6 +28,30 @@ QTDIR=$VISITHOME/qt/current/redhat_6
 PYDIR=$VISITHOME/python/redhat_6
 PYVERSION=python2.1

+##
+## Use mpich for parallel builds
+##
+LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
+CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
+MPI_LIBS="-lmpich"
+
+##
+## Database reader plugin support libraries
+##
+###############################################################################
+
+##
+## Use the newest versions of the silo include files and library files
+##
+DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
+DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
+
+##
+## Use the newest versions of the exodus include files and library files
+##
+DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
+DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
+
 ##
 ## HDF4
 ##
@@ -71,4 +76,3 @@ DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
 DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
 DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
 DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
-
--- a/config-site/kickit.llnl.gov.conf
+++ b/config-site/kickit.llnl.gov.conf
@@ -3,25 +3,6 @@
 ##
 VISITHOME=/usr/gapps/visit

-##
-## Use mpich for parallel builds
-##
-LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
-CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
-MPI_LIBS="-lmpich"
-
-##
-## Use the newest versions of the exodus include files and library files
-##
-DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
-DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
-
-##
-## Use the newest versions of the silo include files and library files
-##
-DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
-DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
-
 ##
 ## If MESA is not set, use VisIt's mesa.
 ##
@@ -39,7 +20,7 @@ fi
 ##
 ## Use VisIt's Qt.
 ##
-QTDIR=$VISITHOME/qt/current/redhat_6
+QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_g++_2.96

 ##
 ## Use VisIt's Python.
@@ -47,6 +28,30 @@ QTDIR=$VISITHOME/qt/current/redhat_6
 PYDIR=$VISITHOME/python/redhat_6
 PYVERSION=python2.1

+##
+## Use mpich for parallel builds
+##
+LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
+CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
+MPI_LIBS="-lmpich"
+
+##
+## Database reader plugin support libraries
+##
+###############################################################################
+
+##
+## Use the newest versions of the silo include files and library files
+##
+DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
+DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
+
+##
+## Use the newest versions of the exodus include files and library files
+##
+DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
+DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
+
 ##
 ## HDF4
 ##
@@ -71,4 +76,3 @@ DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
 DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
 DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
 DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
-
--- a/config-site/ozma.conf
+++ b/config-site/ozma.conf
@@ -35,3 +35,9 @@ QTDIR=$VISITHOME/qt
 ##
 PYDIR=$VISITHOME/python
 PYVERSION=python2.1
+
+#
+# HDF5
+#
+DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/include
+DEFAULT_HDF5_LIB=$VISITHOME/hdf5/lib
--- a/config-site/pengra0.conf
+++ b/config-site/pengra0.conf
@@ -35,11 +35,16 @@ fi
 PYDIR=$VISITHOME/python/linux_chaos_g++_3.3.3
 PYVERSION=python2.1

+##
+## Turn off warnings for deprecated features.
+##
+CXXFLAGS="-Wno-deprecated $CXXFLAGS"
+
 ##
 ## Add parallel arguments
 ##
-CXXFLAGS="-Wno-deprecated -I/usr/lib/mpi/include $CXXFLAGS"
-MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
+CXXFLAGS="-I/usr/lib/mpi/mpi_gnu/include $CXXFLAGS"
+MPI_LIBS="-L/usr/lib/mpi/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lelan -lelan3 -lrmscall"

 ##
 ## Database reader plugin support libraries
@@ -67,8 +72,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_chaos_g++_3.3.3/lib
 ##
 ## HDF5
 ##
-DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial/include
-DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial/lib
+DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/include
+DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/lib

 ##
 ## Mili

--- a/config-site/skywalker.llnl.gov.conf
+++ b/config-site/skywalker.llnl.gov.conf
@@ -3,25 +3,6 @@
 ##
 VISITHOME=/usr/gapps/visit

-##
-## Use mpich for parallel builds
-##
-LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
-CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
-MPI_LIBS="-lmpich"
-
-##
-## Use the newest versions of the exodus include files and library files
-##
-DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
-DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
-
-##
-## Use the newest versions of the silo include files and library files
-##
-DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
-DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
-
 ##
 ## If MESA is not set, use VisIt's mesa.
 ##
@@ -39,7 +20,7 @@ fi
 ##
 ## Use VisIt's Qt.
 ##
-QTDIR=$VISITHOME/qt/current/redhat_6
+QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_g++_2.96

 ##
 ## Use VisIt's Python.
@@ -47,6 +28,30 @@ QTDIR=$VISITHOME/qt/current/redhat_6
 PYDIR=$VISITHOME/python/redhat_6
 PYVERSION=python2.1

+##
+## Use mpich for parallel builds
+##
+LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
+CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
+MPI_LIBS="-lmpich"
+
+##
+## Database reader plugin support libraries
+##
+###############################################################################
+
+##
+## Use the newest versions of the silo include files and library files
+##
+DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7_ia32/include
+DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7_ia32/lib
+
+##
+## Use the newest versions of the exodus include files and library files
+##
+DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
+DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
+
 ##
 ## HDF4
 ##
@@ -71,4 +76,3 @@ DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
 DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
 DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
 DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
-
--- a/config-site/staples.llnl.gov.conf
+++ b/config-site/staples.llnl.gov.conf
@@ -3,25 +3,6 @@
 ##
 VISITHOME=/usr/gapps/visit

-##
-## Use mpich for parallel builds
-##
-LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
-CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
-MPI_LIBS="-lmpich"
-
-##
-## Use the newest versions of the exodus include files and library files
-##
-DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
-DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
-
-##
-## Use the newest versions of the silo include files and library files
-##