Use prereq.sh for xfer system test

(cherry picked from commit 587129b4c0537ea9159bad5b887b945d9811006c)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 4907c1e37dc0a24fce4fca337498aa1166c5b51c..0574f69f458eec5d6f3b329ab294a98b2ee200d7 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -194,16 +194,13 @@ TESTS +=                  \
        verify                  \
        views                   \
        wildcard                \
+       xfer                    \
        xferquota               \
        zero                    \
        zonechecks
 
 if HAVE_PERLMOD_NET_DNS
 
-if HAVE_PERLMOD_DIGEST_HMAC
-TESTS += xfer
-endif HAVE_PERLMOD_DIGEST_HMAC
-
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
 TESTS += reclimit
 endif HAVE_PERLMOD_NET_DNS_NAMESERVER

diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index 16d04a26bd9a2eb533181a9a04d66521b217085f..76252a3cd865fea171a12f4fa8eb99d65dbc741b 100644 (file)
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -23,4 +23,10 @@ then
        exit 1
 fi
 
+if ! ${PERL} -MDigest::HMAC -e ''
+then
+       echo_i "perl Digest::HMAC module is required"
+       exit 1
+fi
+
 exit 0

diff --git a/configure.ac b/configure.ac
index c26265a7dfff5eda19a45055a5cc61b90173483d..9be625d50ce36160cb3eecdf05a47192a8a40f82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -237,10 +237,6 @@ AC_PATH_PROGS([PERL], [perl5 perl])
 AC_SUBST([PERL])
 AM_CONDITIONAL([HAVE_PERL], [test -n "$PERL"])
 
-AX_PERL_MODULE([Digest::HMAC])
-AM_CONDITIONAL([HAVE_PERLMOD_DIGEST_HMAC],
-              [test "$HAVE_PERLMOD_DIGEST__HMAC" = "yes"])
-
 AX_PERL_MODULE([Net::DNS])
 AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
               [test "$HAVE_PERLMOD_NET__DNS" = "yes"])