[svn-r135] ./config/linux

./config/freebsd2.2.1
        Rewritten to be more flexible.

./src/H5AC.c
./src/H5ACprivate.h
./src/H5F.c
./src/H5H.c
./src/H5Gpkg.h
./src/H5Gshad.c
./src/H5O.c
./test/istore.c
./test/tstab.c
        Accumulates cache statistics and displays the results on
        stderr when the file is closed if it was opened with
        H5F_ACC_DEBUG passed into H5F_open()

./src/H5B.c
./src/H5Bprivate.h
./src/H5Fistore.c
./src/H5Gnode.c
        Added more debugging which is turned on if H5B_DEBUG is
        defined on the compile command (see config/linux).

        Fixed a couple of bugs with left insertions which are used by
        the indexed storage stuff.

./src/H5Flow.c
        Fixed a memory leak.

./src/H5Fprivate.h
        Fixed warnings about shifting more than size of object.

./src/H5Fstdio.c
        Fixed seek optimizations back to the way Quincey originally
        had them.

./src/H5V.c
        Removed unused variables.

2 files changed, 92 insertions, 12 deletions

diff --git a/config/freebsd2.2.1 b/config/freebsd2.2.1
index 4d83367..35286f0 100644
--- a/config/freebsd2.2.1
+++ b/config/freebsd2.2.1
@@ -1,5 +1,51 @@
+#!/bin/sh
 # Site configuration -- do not distribute this file.
 
-if test "x$CFLAGS" = "x"; then
-   CFLAGS="-g -DH5AC_DEBUG_PROTECT -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
+
+# Based on the setting of environment variable `HDF5_MODE' we set the
+# compiler flags unless they're already set.  Its value can be one or
+# more of the following words:
+#
+#	$warn	    -- Generates compiler warnings.  You should always
+#	               include this since it has no effect on the speed of
+#	               the code produced.
+#
+#	$debug      -- Compiles in code to check for invariant conditions
+#	               and turns on the `-g' flag for interactive
+#	               debugging.  It also turns off seek optimizations in
+#                      the low-level file driver.  This version of the
+#                      library can be significantly slower than a production
+#                      version.
+#
+#       $production -- Compiles an optimized version of the library
+#       	       and disables code that checks for invariant
+#       	       conditions.  It also turns on various optimizations
+#                      such as seek optimizations in the low level file
+#                      driver.
+#
+#       $profile    -- Compiles code with the `-pg' flag which
+#       	       produces a `gmon.out' file when the library
+#       	       runs. The gprof(1) command can read that file
+#       	       and produce detailed run-time statistics.
+#
+# If HDF5_MODE is undefined then we use the value 
+#
+#	$debug $warn -DH5F_LOW_DFLT=H5F_LOW_SEC2
+#
+
+
+warn="-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
+
+profile="-pg"
+
+debug="-g -DH5AC_DEBUG -DH5B_DEBUG -DH5F_OPT_SEEK=0 -fverbose-asm"
+
+production="-O3 -DNDEBUG -DH5F_OPT_SEEK=1 -finline-functions -funroll-loops -malign-double -fomit-frame-pointer"
+
+default_mode='$debug $warn -DH5F_LOW_DFLT=H5F_LOW_SEC2'
+
+# Don't set CFLAGS if the user already did.
+if test -z "$CFLAGS"; then
+   CFLAGS="`eval echo ${HDF5_MODE:-$default_mode}`"
+   export CFLAGS
 fi
diff --git a/config/linux b/config/linux
index 642829a..35286f0 100644
--- a/config/linux
+++ b/config/linux
@@ -1,17 +1,51 @@
+#!/bin/sh
 # Site configuration -- do not distribute this file.
 
-CFLAGS_WARN="-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
 
-CFLAGS_DEBUG="-g -DH5AC_DEBUG_PROTECT -DH5F_LOW_DFLT=H5F_LOW_STDIO -DH5F_OPT_SEEK=1 -fverbose-asm"
-CFLAGS_PROFILE="-pg"
-CFLAGS_PRODUCTION="-O3 -UH5AC_DEBUG_PROTECT -DNDEBUG -DH5F_LOW_DFLT=H5F_LOW_STDIO -DH5F_OPT_SEEK=1 -finline-functions -funroll-loops -malign-double -fomit-frame-pointer"
+# Based on the setting of environment variable `HDF5_MODE' we set the
+# compiler flags unless they're already set.  Its value can be one or
+# more of the following words:
+#
+#	$warn	    -- Generates compiler warnings.  You should always
+#	               include this since it has no effect on the speed of
+#	               the code produced.
+#
+#	$debug      -- Compiles in code to check for invariant conditions
+#	               and turns on the `-g' flag for interactive
+#	               debugging.  It also turns off seek optimizations in
+#                      the low-level file driver.  This version of the
+#                      library can be significantly slower than a production
+#                      version.
+#
+#       $production -- Compiles an optimized version of the library
+#       	       and disables code that checks for invariant
+#       	       conditions.  It also turns on various optimizations
+#                      such as seek optimizations in the low level file
+#                      driver.
+#
+#       $profile    -- Compiles code with the `-pg' flag which
+#       	       produces a `gmon.out' file when the library
+#       	       runs. The gprof(1) command can read that file
+#       	       and produce detailed run-time statistics.
+#
+# If HDF5_MODE is undefined then we use the value 
+#
+#	$debug $warn -DH5F_LOW_DFLT=H5F_LOW_SEC2
+#
 
-if test "x$CFLAGS" = "x"; then
 
-   # Uncomment the following line for a production version of the library.
-   #CFLAGS="-pipe $CFLAGS_PRODUCTION $CFLAGS_WARN"
+warn="-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
 
-   # Uncomment the following line for normal development
-   CFLAGS="-pipe $CFLAGS_DEBUG $CFLAGS_WARN"
-fi
+profile="-pg"
+
+debug="-g -DH5AC_DEBUG -DH5B_DEBUG -DH5F_OPT_SEEK=0 -fverbose-asm"
+
+production="-O3 -DNDEBUG -DH5F_OPT_SEEK=1 -finline-functions -funroll-loops -malign-double -fomit-frame-pointer"
 
+default_mode='$debug $warn -DH5F_LOW_DFLT=H5F_LOW_SEC2'
+
+# Don't set CFLAGS if the user already did.
+if test -z "$CFLAGS"; then
+   CFLAGS="`eval echo ${HDF5_MODE:-$default_mode}`"
+   export CFLAGS
+fi