diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 14 | ||||
| -rw-r--r-- | test/Makefile.in | 10 |
6 files changed, 25 insertions, 28 deletions
@@ -1,4 +1,10 @@ -2012-12-27 Andrew J. Schorr <aschorr@telemetry-investments.com> +2013-01-31 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * configure.ac: Remove TEST_MPFR conditional added in last patch. + We will instead test for MPFR capability by looking at the output + from gawk --version. + +2013-01-27 Andrew J. Schorr <aschorr@telemetry-investments.com> * configure.ac: Add MPFR test for use in test/Makefile.am. @@ -630,8 +630,6 @@ am__EXEEXT_TRUE LTLIBOBJS subdirs GAWKLIBEXT -TEST_MPFR_FALSE -TEST_MPFR_TRUE LIBMPFR LIBREADLINE SOCKET_LIBS @@ -10489,14 +10487,6 @@ $as_echo "#define HAVE_MPFR 1" >>confdefs.h unset _found_mpfr fi - if test -n "$LIBMPFR"; then - TEST_MPFR_TRUE= - TEST_MPFR_FALSE='#' -else - TEST_MPFR_TRUE='#' - TEST_MPFR_FALSE= -fi - ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : @@ -11033,10 +11023,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TEST_MPFR_TRUE}" && test -z "${TEST_MPFR_FALSE}"; then - as_fn_error $? "conditional \"TEST_MPFR\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.ac b/configure.ac index 4beacd97..4ba5f6aa 100644 --- a/configure.ac +++ b/configure.ac @@ -351,7 +351,6 @@ GAWK_CHECK_READLINE dnl check for mpfr support GNUPG_CHECK_MPFR -AM_CONDITIONAL([TEST_MPFR], [test -n "$LIBMPFR"]) dnl checks for structure members AC_STRUCT_ST_BLKSIZE diff --git a/test/ChangeLog b/test/ChangeLog index 89d10028..abab6f21 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2013-01-31 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am: To decide whether to run MPFR tests, use the output + of gawk --version instead of the automake TEST_MPFR conditional (which + has now been removed from configure.ac). + 2013-01-27 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (EXTRA_DIST): Add all the mpfr test files. Duh. diff --git a/test/Makefile.am b/test/Makefile.am index c8a67d19..6c7eb147 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1024,12 +1024,6 @@ VALGRIND = # And we set AWKLIBPATH to find the extension libraries we built. AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) -if TEST_MPFR -CHECKMPFR = mpfr-msg-start mpfr-tests mpfr-msg-end -else -CHECKMPFR = -endif - # Message stuff is to make it a little easier to follow. # Make the pass-fail last and dependent on others to avoid # spurious errors if `make -j' in effect. @@ -1041,7 +1035,7 @@ check: msg \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ shlib-msg-start shlib-tests shlib-msg-end \ - $(CHECKMPFR) + mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1058,7 +1052,11 @@ inet: inetmesg $(INET_TESTS) machine-tests: $(MACHINE_TESTS) -mpfr-tests: $(MPFR_TESTS) +mpfr-tests: + @if $(AWK) --version | $(AWK) '/MPFR/ { exit 1 }' ; then \ + echo MPFR tests not supported on this system ; \ + else $(MAKE) $(MPFR_TESTS) ; \ + fi shlib-tests: @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \ diff --git a/test/Makefile.in b/test/Makefile.in index ba26b6aa..0e63c6b1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1223,8 +1223,6 @@ AWKPROG = ../gawk$(EXEEXT) # Default for VALGRIND is empty unless overridden by a command-line argument. # This protects against cruft in the environment. VALGRIND = -@TEST_MPFR_FALSE@CHECKMPFR = -@TEST_MPFR_TRUE@CHECKMPFR = mpfr-msg-start mpfr-tests mpfr-msg-end all: all-am .SUFFIXES: @@ -1420,7 +1418,7 @@ check: msg \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ shlib-msg-start shlib-tests shlib-msg-end \ - $(CHECKMPFR) + mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1437,7 +1435,11 @@ inet: inetmesg $(INET_TESTS) machine-tests: $(MACHINE_TESTS) -mpfr-tests: $(MPFR_TESTS) +mpfr-tests: + @if $(AWK) --version | $(AWK) '/MPFR/ { exit 1 }' ; then \ + echo MPFR tests not supported on this system ; \ + else $(MAKE) $(MPFR_TESTS) ; \ + fi shlib-tests: @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \ |