[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
This commit is contained in:
Robb Matzke 1999-11-03 13:05:58 -05:00
parent c13e76ffee
commit 4051fa3187
3 changed files with 25 additions and 13 deletions

View File

@ -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

View File

@ -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

View File

@ -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