mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r10062] Purpose:

Browse Source 
Bug fix

Description:
Discovered two small bugs.
When MAKE is defined as the empty string, a test in configure incorrectly
identifies it as pmake.  Skipped this test if $MAKE is the empty string.
Two .h5 files produced by a test in the hl directory were not cleaned.
Updated the Makefile.am.


Platforms tested:
heping, modi4 (very minor changes)
This commit is contained in:
James Laird 2005-02-21 16:30:49 -05:00
parent f712d13301
commit 643e9a38bd
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -9732,7 +9732,9 @@ rm maketest
AM_MAKEFLAGS=""
echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5
if test ${MAKE}; then
echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5
echo $ECHO_N "checking whether make will build with undefined variables... $ECHO_C" >&6
cat >maketest <<EOF
@ -9749,7 +9751,8 @@ echo "${ECHO_T}no, setting -V flag" >&6
AM_MAKEFLAGS="\-V"
fi
rm maketest
rm maketest
fi
echo "$as_me:$LINENO: checking for production mode" >&5
echo $ECHO_N "checking for production mode... $ECHO_C" >&6

8
configure.in
View File

@ -565,7 +565,10 @@ dnl These errors can be changed to warnings using the -V flag.
dnl
AC_SUBST(AM_MAKEFLAGS) AM_MAKEFLAGS=""
AC_MSG_CHECKING([whether make will build with undefined variables])
dnl Don't run test if MAKE is defined but is the empty string
if test ${MAKE}; then
AC_MSG_CHECKING([whether make will build with undefined variables])
cat >maketest <<EOF
foo: \$(UNDEFINED) \$(UNDEFINED2)
@ -579,7 +582,8 @@ EOF
AM_MAKEFLAGS="\-V"
fi
rm maketest
rm maketest
fi
dnl ----------------------------------------------------------------------
dnl Production flags? Save the value in $CONFIG_MODE so we have it for

2
hl/test/Makefile.am
View File

@ -22,7 +22,7 @@ TEST_PROG=test_lite test_image test_table test_ds
check_PROGRAMS=$(TEST_PROG)
# Temporary files. These files are the ones created by running `make test'.
MOSTLYCLEANFILES=combine_tables[1-2].h5 test_ds.h5 test_image.h5 \
MOSTLYCLEANFILES=combine_tables[1-2].h5 test_ds[1-2].h5 test_image.h5 \
test_lite[1-2].h5 test_table.h5
include $(top_srcdir)/config/conclude.am

2
hl/test/Makefile.in
View File

@ -193,7 +193,7 @@ TEST_PROG = test_lite test_image test_table test_ds
check_PROGRAMS = $(TEST_PROG)
# Temporary files. These files are the ones created by running `make test'.
MOSTLYCLEANFILES = combine_tables[1-2].h5 test_ds.h5 test_image.h5 \
MOSTLYCLEANFILES = combine_tables[1-2].h5 test_ds[1-2].h5 test_image.h5 \
test_lite[1-2].h5 test_table.h5