]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
SKIP tests/suite/eagain if libev not available tmp-soft-libev
authorTim Rühsen <tim.ruehsen@gmx.de>
Sun, 5 Jan 2020 17:25:13 +0000 (18:25 +0100)
committerTim Rühsen <tim.ruehsen@gmx.de>
Tue, 7 Jan 2020 09:47:12 +0000 (10:47 +0100)
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
configure.ac
tests/suite/Makefile.am

index 8aa72f443b07c4d50f234e76ebca08cb7329b196..4e579c2d9d5acd5209f43349f9bd19a8110c4318 100644 (file)
@@ -453,13 +453,15 @@ AM_CONDITIONAL(ENABLE_OLDGNUTLS_INTEROP, test "$enable_oldgnutls_interop" != "no
 # check for libev - used in full test suite
 AC_LIB_HAVE_LINKFLAGS(ev,, [#include <ev.h>], [ev_run(0,0);])
 if test "$ac_cv_libev" = yes; then
-        AC_SUBST([LIBEV_LIBS], [$LIBEV])
-elif test "$full_test_suite" = yes;then
-        AC_MSG_ERROR([[***
-*** libev4 was not found.
-***]])
+  AC_SUBST([LIBEV_LIBS], [$LIBEV])
+else
+  AC_MSG_WARN([[
+*** tests/suite/eagain.sh is disabled due to missing libev ***
+]])
 fi
 
+AM_CONDITIONAL(HAVE_LIBEV, test "$ac_cv_libev" = "yes")
+
 dnl GCC warnings to enable
 
 AC_ARG_ENABLE([gcc-warnings],
index 025f513f78f529fb25f4a7d51e17cf3b7c0557f3..603771fa04cea158d85a338296065f352d179afb 100644 (file)
@@ -81,14 +81,16 @@ if !MACOSX
 if !WINDOWS
 mini_record_timing_LDADD = -lrt $(LDADD)
 nodist_mini_record_timing_SOURCES = mini-record-timing.c
+noinst_PROGRAMS = mini-record-timing
+
+if HAVE_LIBEV
 eagain_cli_LDADD = $(LIBEV_LIBS) -lrt -lm $(LIBDL) -lpthread $(LDADD)
 nodist_eagain_cli_SOURCES = eagain-cli.c
-
-noinst_PROGRAMS = eagain-cli mini-record-timing
-
+noinst_PROGRAMS += eagain-cli
 scripts_to_test += eagain.sh
 endif
 endif
+endif
 
 nodist_prime_check_SOURCES = prime-check.c
 nodist_rng_SOURCES = rng.c