diff options
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | hl/test/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -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 diff --git a/configure.in b/configure.in index 75e1cc8..26caaa6 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/hl/test/Makefile.am b/hl/test/Makefile.am index 40ae35e..e4256a1 100644 --- a/hl/test/Makefile.am +++ b/hl/test/Makefile.am @@ -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 diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index d3aef8e..cd8aa48 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -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 |