[svn-r9812] Purpose: Bug fix

Description: Confiure generated libhdf5.settings files in fortran/src
             and c++/src directories. File in the fortran/src directory
             was not installed; file in the c++/src directory was intalled
             As a result, libhdf5.settings from the src directory with the
             C settings and configuration summary was blown away.
             Also some temporary files were not cleaned in c++ directories.

Solution: Modifed configure.in files to create
          fortran/src/libhdf5_fortran.settings and
          c++/src/libhdf5_cpp.settings files
          Ran autoconf on eirene to generate new configure files.
          Modified Makefile.in files to install *setting files.

          Note: I don't like the solution since *setting files are messy
          and libhdf5_cpp.settings lacks some information (there is no
          corresponding *.in file in the c++/src directory). Since we
          are moving to 1.8 anyway, I don't want to spend too much time
          on it, but we definitely should look carefully at those files
          and check that they are ok in 1.8.



Platforms tested: eirene, cobalt, arabica

Misc. update:

8 files changed, 21 insertions, 20 deletions

diff --git a/c++/config/conclude.in b/c++/config/conclude.in
index 1b62ea9..e5a50c7 100644
--- a/c++/config/conclude.in
+++ b/c++/config/conclude.in
@@ -72,8 +72,8 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir)
 	      ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1);		      \
 	   fi;								      \
 	done
-	@if test -f libhdf5.settings; then				      \
-	   (set -x; $(INSTALL_DATA) libhdf5.settings $(libdir)/. || exit 1);  \
+	@if test -f libhdf5_cpp.settings; then				      \
+	   (set -x; $(INSTALL_DATA) libhdf5_cpp.settings $(libdir)/. || exit 1);  \
 	fi
 	@for f in X $(PUB_HDR); do					      \
 	   if test $$f != X; then					      \
@@ -105,7 +105,7 @@ uninstall-examples:
 
 ## Removes those things that `make install' (would have) installed.
 uninstall:
-	@for f in libhdf5.settings $(LIB); do				      \
+	@for f in libhdf5_cpp.settings $(LIB); do				      \
             $(LT_UNINSTALL) $(libdir)/$$f;				      \
 	done
 	@if test -n "$(PUB_HDR)"; then   				      \
diff --git a/c++/configure b/c++/configure
index 355241c..75021d4 100755
--- a/c++/configure
+++ b/c++/configure
@@ -10546,17 +10546,17 @@ fi
 
 PRINT_PLAIN() {
   echo $ECHO_N "$1$ECHO_C"
-  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5_cpp.settings
 }
 
 PRINT_N() {
   echo $ECHO_N "$1:  $ECHO_C"
-  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5_cpp.settings
 }
 
 PRINT() {
   echo "$1"
-  echo "$1" 1>>src/libhdf5.settings
+  echo "$1" 1>>src/libhdf5_cpp.settings
 }
 
 IF_YES_NO() {
diff --git a/c++/configure.in b/c++/configure.in
index 05e0585..ca04f10 100644
--- a/c++/configure.in
+++ b/c++/configure.in
@@ -832,17 +832,17 @@ fi
 
 PRINT_PLAIN() {
   echo $ECHO_N "$1$ECHO_C"
-  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5_cpp.settings
 }
 
 PRINT_N() {
   echo $ECHO_N "$1:  $ECHO_C"
-  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5_cpp.settings
 }
 
 PRINT() {
   echo "$1"
-  echo "$1" 1>>src/libhdf5.settings
+  echo "$1" 1>>src/libhdf5_cpp.settings
 }
 
 dnl ----------------------------------------------------------------------
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 58d8500..c36196b 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -55,7 +55,8 @@ PUB_PROGS=h5c++
 ARFLAGS=rs
 
 ## h5c++ is generated during configure time.  Remove it only when distclean.
-## libhdf5.settings is generated during configure. Remove it when distclean.
-DISTCLEAN=h5c++ libhdf5.settings
+## libhdf5_cpp.settings is generated during configure. Remove it when distclean.
+MOSTLYCLEAN= *.ii *.ti
+DISTCLEAN=h5c++ libhdf5_cpp.settings
 
 @CONCLUDE@
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index e9e1b86..5c485d2 100755
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -92,10 +92,10 @@ usage() {
 }
 
 # Show the configuration summary of the library recorded in the
-# libhdf5.settings file reside in the lib directory.
+# libhdf5_cpp.settings file reside in the lib directory.
 showconfigure()
 {
-  cat ${libdir}/libhdf5.settings
+  cat ${libdir}/libhdf5_cpp.settings
   status=$?
 }
 
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 7a90f7d..d41a4b6 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -48,7 +48,7 @@ TEST_PROGS=dsets testhdf5
 
 
 TEST_SCRIPTS=
-
+MOSTLYCLEAN= *.ii *.ti
 DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o)
 
 $(TEST_PROGS): $(LIB) $(LIBHDF5) $(LIBH5TEST)
diff --git a/fortran/configure b/fortran/configure
index 26d4d7a..4d425ca 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -11952,17 +11952,17 @@ fi
 
 PRINT_PLAIN() {
   echo $ECHO_N "$1$ECHO_C"
-  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5_fortran.settings
 }
 
 PRINT_N() {
   echo $ECHO_N "$1:  $ECHO_C"
-  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5_fortran.settings
 }
 
 PRINT() {
   echo "$1"
-  echo "$1" 1>>src/libhdf5.settings
+  echo "$1" 1>>src/libhdf5_fortran.settings
 }
 
 IF_YES_NO() {
diff --git a/fortran/configure.in b/fortran/configure.in
index a27a3f8..b321b99 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -1266,17 +1266,17 @@ fi
 
 PRINT_PLAIN() {
   echo $ECHO_N "$1$ECHO_C"
-  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5_fortran.settings
 }
 
 PRINT_N() {
   echo $ECHO_N "$1:  $ECHO_C"
-  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5.settings
+  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5_fortran.settings
 }
 
 PRINT() {
   echo "$1"
-  echo "$1" 1>>src/libhdf5.settings
+  echo "$1" 1>>src/libhdf5_fortran.settings
 }
 
 dnl ----------------------------------------------------------------------