From cefa09ada55ada45d05d6c9da52153b117500b30 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 4 Sep 2023 14:32:06 +0200
Subject: [PATCH] Use prereq.sh for statschannel system test

(cherry picked from commit 27281955afe901d2705829edc8c327043cd689fd)
---
 bin/tests/system/Makefile.am            |  5 +----
 bin/tests/system/statschannel/prereq.sh | 28 +++++++++++++++++++++++++
 configure.ac                            |  4 ----
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 bin/tests/system/statschannel/prereq.sh

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index af5795f5fc..4907c1e37d 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -177,6 +177,7 @@ TESTS +=			\
 	spf			\
 	staticstub		\
 	statistics		\
+	statschannel		\
 	stress			\
 	stub			\
 	synthfromdnssec		\
@@ -199,10 +200,6 @@ TESTS +=			\
 
 if HAVE_PERLMOD_NET_DNS
 
-if HAVE_PERLMOD_FILE_FETCH
-TESTS += statschannel
-endif HAVE_PERLMOD_FILE_FETCH
-
 if HAVE_PERLMOD_DIGEST_HMAC
 TESTS += xfer
 endif HAVE_PERLMOD_DIGEST_HMAC
diff --git a/bin/tests/system/statschannel/prereq.sh b/bin/tests/system/statschannel/prereq.sh
new file mode 100644
index 0000000000..77d0c38334
--- /dev/null
+++ b/bin/tests/system/statschannel/prereq.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+. ../conf.sh
+
+if ! ${PERL} -MNet::DNS -e ''
+then
+	echo_i "perl Net::DNS module is required"
+	exit 1
+fi
+
+if ! ${PERL} -MFile::Fetch -e ''
+then
+	echo_i "perl File::Fetch module is required"
+	exit 1
+fi
+
+exit 0
diff --git a/configure.ac b/configure.ac
index 263014e51b..c26265a7df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,10 +241,6 @@ AX_PERL_MODULE([Digest::HMAC])
 AM_CONDITIONAL([HAVE_PERLMOD_DIGEST_HMAC],
 	       [test "$HAVE_PERLMOD_DIGEST__HMAC" = "yes"])
 
-AX_PERL_MODULE([File::Fetch])
-AM_CONDITIONAL([HAVE_PERLMOD_FILE_FETCH],
-	       [test "$HAVE_PERLMOD_FILE__FETCH" = "yes"])
-
 AX_PERL_MODULE([Net::DNS])
 AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
 	       [test "$HAVE_PERLMOD_NET__DNS" = "yes"])