From 4051fa31870cb61a757d5d3930f41b3bd2475657 Mon Sep 17 00:00:00 2001
From: Robb Matzke <matzke@llnl.gov>
Date: Wed, 3 Nov 1999 13:05:58 -0500
Subject: [svn-r1814] * 1999-11-03 ** config/depend1.in 	We don't regenerate
 the Dependencies files if we're compiling in the 	source tree because
 `gcc -MM' doesn't output enough information to 	make the result usable
 when compiling outside the source tree.

** src/H5config.h.in
	Regenerated to include HAVE_LIBMPI and HAVE_LIBMPIO because of recent
	changes to configure.in
---
 config/depend1.in | 26 ++++++++++++++++----------
 configure.in      |  6 +++---
 src/H5config.h.in |  6 ++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/config/depend1.in b/config/depend1.in
index ee51733..2988249 100644
--- a/config/depend1.in
+++ b/config/depend1.in
@@ -22,10 +22,14 @@
 ##
 .PRECIOUS: $(srcdir)/Dependencies
 $(srcdir)/Dependencies: .depend
-	-@echo '## This file is machine generated on GNU systems.' >$@
-	-@echo '## Only temporary changes may be made here.' >>@
-	-@echo >>@
-	-srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >>$@
+	@if test "$(srcdir)" != "."; then				      \
+	    echo '## This file is machine generated on GNU systems.'          \
+		>$@;							      \
+	    echo '## Only temporary changes may be made here.' 		      \
+		>>$@;							      \
+	    echo >>$(srcdir)/Dependencies;				      \
+	    perl -p $(top_srcdir)/bin/distdep .depend >>$@;		      \
+	fi
 
 .PRECIOUS: .depend
 .depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC)
@@ -43,12 +47,14 @@ $(srcdir)/Dependencies: .depend
 	          sed 's/\.o/.lo/' >>$@;	      			      \
 	   fi;								      \
 	done;
-	-@echo '## This file is machine generated on GNU systems.' \
-		>$(srcdir)/Dependencies
-	-@echo '## Only temporary changes may be made here.' \
-		>>$(srcdir)/Dependencies
-	-@echo >>$(srcdir)/Dependencies
-	-perl -p $(top_srcdir)/bin/distdep .depend >>$(srcdir)/Dependencies
+	@if test "$(srcdir)" != "."; then				      \
+	    echo '## This file is machine generated on GNU systems.'          \
+		>$(srcdir)/Dependencies;				      \
+	    echo '## Only temporary changes may be made here.' 		      \
+		>>$(srcdir)/Dependencies;				      \
+	    echo >>$(srcdir)/Dependencies;				      \
+	    perl -p $(top_srcdir)/bin/distdep .depend>>$(srcdir)/Dependencies;\
+	fi
 
 -include .depend
 
diff --git a/configure.in b/configure.in
index 1c1489e..3a48062 100644
--- a/configure.in
+++ b/configure.in
@@ -177,7 +177,7 @@ VPATH=$srcdir/config $srcdir/src $srcdir/bin
 	cp $< H5.o
 
 foo: H5.o
-	rm H5.o
+	/bin/rm -f H5.o
 	@echo works
 EOF
     if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
@@ -195,7 +195,7 @@ VPATH=$srcdir/config:$srcdir/src:$srcdir/bin
 	cp $< H5.o
 
 foo: H5.o
-	rm H5.o
+	/bin/rm -f H5.o
 	@echo works
 EOF
     if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
@@ -212,7 +212,7 @@ EOF
 	cp $< H5.o
 
 foo: H5.o
-	rm H5.o
+	/bin/rm -f H5.o
 	@echo works
 EOF
     if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
diff --git a/src/H5config.h.in b/src/H5config.h.in
index a50cfe2..a947969 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -332,9 +332,15 @@
 /* Define if you have the mfhdf library (-lmfhdf).  */
 #undef HAVE_LIBMFHDF
 
+/* Define if you have the mpi library (-lmpi).  */
+#undef HAVE_LIBMPI
+
 /* Define if you have the mpich library (-lmpich).  */
 #undef HAVE_LIBMPICH
 
+/* Define if you have the mpio library (-lmpio).  */
+#undef HAVE_LIBMPIO
+
 /* Define if you have the nsl library (-lnsl).  */
 #undef HAVE_LIBNSL
 
-- 
cgit v0.12