configure: fix faketime detection

This fixes the cache variable name (gnutls_cv_prog_faketime_works, not
gnutls_cv_faketime_works), and avoids extraneous output from the
configure.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/configure.ac b/configure.ac
index b4b7186605255b0cf963b445eb14e7baaeab7c76..b7aa758cd0ca5624c026f69f29039640a0ab38db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AS_IF([test -n "$FAKETIME"], [FAKETIME_F_OPT="-f"; AC_SUBST([FAKETIME_F_OPT])],
 ])
 
 AC_CACHE_CHECK([whether faketime program works], [gnutls_cv_prog_faketime_works],
-  [AC_RUN_IFELSE(
+  [AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
       [[#include <stdio.h>
         #include <stdlib.h>
@@ -100,8 +100,7 @@ AC_CACHE_CHECK([whether faketime program works], [gnutls_cv_prog_faketime_works]
     [gnutls_cv_prog_faketime_works=no],
     [gnutls_cv_prog_faketime_works=cross-compiling])])
 
-AC_MSG_RESULT([$gnutls_cv_faketime_works])
-AC_SUBST([gnutls_cv_faketime_works])
+AC_SUBST([gnutls_cv_prog_faketime_works])
 
 AC_ARG_ENABLE(bash-tests,
   AS_HELP_STRING([--disable-bash-tests], [skip some tests that badly need bash]),

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 95370f9ef70d6f0fdcc032715befb1d20923cc7f..be4966f4b52673077e5125e2dcb340d729132c53 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -711,7 +711,7 @@ endif
 TESTS_ENVIRONMENT +=                                   \
        FAKETIME="$(FAKETIME)"                          \
        FAKETIME_F_OPT="$(FAKETIME_F_OPT)"              \
-       gnutls_cv_faketime_works="$(gnutls_cv_faketime_works)"
+       gnutls_cv_prog_faketime_works="$(gnutls_cv_prog_faketime_works)"
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)

diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 4e7cbdca34374094183581ba2c06d278f9000fe5..198dba973cb800152f86ef1e079cdf366fe2bbe2 100644 (file)
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -209,7 +209,7 @@ endif
 TESTS_ENVIRONMENT +=                                   \
        FAKETIME="$(FAKETIME)"                          \
        FAKETIME_F_OPT="$(FAKETIME_F_OPT)"              \
-       gnutls_cv_faketime_works="$(gnutls_cv_faketime_works)"
+       gnutls_cv_prog_faketime_works="$(gnutls_cv_prog_faketime_works)"
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)

diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index c5f91b62c409e16e87734ce627cf3113fea6cbce..0d98abdbdaf282ede4c6658365d3085de1bd2d36 100644 (file)
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -96,7 +96,7 @@ GETPORT='
 '
 
 skip_if_no_datefudge() {
-       if test "$gnutls_cv_faketime_works" != yes; then
+       if test "$gnutls_cv_prog_faketime_works" != yes; then
                exit 77
        fi
 }

diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index ee22108a1baf7f1c35f7ea5b9a3efd552b012355..dcb6bc14464966561c949b0a12a697da1914b870 100644 (file)
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -79,7 +79,7 @@ endif
 TESTS_ENVIRONMENT +=                                   \
        FAKETIME="$(FAKETIME)"                          \
        FAKETIME_F_OPT="$(FAKETIME_F_OPT)"              \
-       gnutls_cv_faketime_works="$(gnutls_cv_faketime_works)"
+       gnutls_cv_prog_faketime_works="$(gnutls_cv_prog_faketime_works)"
 
 if ENABLE_OLDGNUTLS_INTEROP
 scripts_to_test += testcompat-oldgnutls.sh