[svn-r15017] Purpose:

bug fix.

Description:
Removed a few debug print statments that was left in by mistake.
Removed initialization for macro system INSTRUMENT to match how it
behaves before.

Tested platforms:
h5committested (kagiso, smirom and linew).  It failed in fortran
test in smirom but I believed that was not caused by my changes
in configure.in.

2 files changed, 4 insertions, 10 deletions

diff --git a/configure b/configure
index 02c80b4..93744e7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 15012 2008-05-15 21:08:23Z mcgreevy .
+# From configure.in Id: configure.in 15014 2008-05-15 21:35:13Z mcgreevy .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.9.6.
 #
@@ -2750,7 +2750,7 @@ echo "${ECHO_T}done" >&6; }
  HDF5_HL=yes
  GPFS=no
  LINUX_LFS=no
- INSTRUMENT=no
+
  CODESTACK=no
  HAVE_DMALLOC=no
  DIRECT_VFD=no
@@ -52577,12 +52577,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
     /bin/mv -f pubconf src/H5pubconf.h
   fi
   echo "Post process src/libhdf5.settings"
-cat src/libhdf5.settings
   sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
   cp libhdf5.settings.TMP src/libhdf5.settings
   rm -f libhdf5.settings.TMP
-echo result
-cat src/libhdf5.settings
  ;;
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
diff --git a/configure.in b/configure.in
index f8921e3..7998ee8 100644
--- a/configure.in
+++ b/configure.in
@@ -69,12 +69,9 @@ AC_OUTPUT_COMMANDS([
     /bin/mv -f pubconf src/H5pubconf.h
   fi
   echo "Post process src/libhdf5.settings"
-cat src/libhdf5.settings
   sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
   cp libhdf5.settings.TMP src/libhdf5.settings
   rm -f libhdf5.settings.TMP
-echo result
-cat src/libhdf5.settings
 ])
 
 dnl It's possible to configure for a host other than the one on which
@@ -138,7 +135,7 @@ dnl CXX: C++ compiler.
 dnl HDF5_HL: whether high-level library is enabled. Default is yes.
 dnl GPFS: whether gpfs is enabled. Default no.
 dnl LINUX_LFS: whether LINUX_LFS is enabled. Default no.
-dnl INSTRUMENT: whether INSTRUMENT is enabled. Default no.
+dnl INSTRUMENT: whether INSTRUMENT is enabled. No default set here.
 dnl CODESTACK: whether CODESTACK is enabled. Default no.
 dnl HAVE_DMALLOC: whether system has dmalloc support. Default no.
 dnl DIRECT_VFD: whether DIRECT_VFD is enabled. Default no.
@@ -158,7 +155,7 @@ AC_SUBST(CXX) HDF_CXX=no
 AC_SUBST(HDF5_HL) HDF5_HL=yes
 AC_SUBST(GPFS) GPFS=no
 AC_SUBST(LINUX_LFS) LINUX_LFS=no
-AC_SUBST(INSTRUMENT) INSTRUMENT=no
+AC_SUBST(INSTRUMENT)
 AC_SUBST(CODESTACK) CODESTACK=no
 AC_SUBST(HAVE_DMALLOC) HAVE_DMALLOC=no
 AC_SUBST(DIRECT_VFD) DIRECT_VFD=no