1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= <becue@crans.org>
Date: Fri, 7 Apr 2023 17:06:39 +0200
Subject: Drop wget shenanigans from build system
---
configure.ac | 4 ----
wforce/Makefile.am | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2b09dce..96885b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,10 +96,6 @@ PDNS_ENABLE_UNIT_TESTS
PDNS_ENABLE_SANITIZERS
# Check for dependent programs
AC_CHECK_PROG(PERL, perl, perl)
-AC_CHECK_PROG(HAVE_WGET, wget, wget)
-AS_IF([test "x$HAVE_WGET" = "x"], [
- AC_MSG_ERROR([wget not found, wget needed for downloading regexes.yaml and is required])
-])
AX_PROG_PERL_MODULES( Swagger2::Markdown, , AC_MSG_WARN(Need to install Perl Swagger2::Markdown))
# Look for protobuf
PDNS_WITH_PROTOBUF
diff --git a/wforce/Makefile.am b/wforce/Makefile.am
index d6ec753..a0ef7e5 100644
--- a/wforce/Makefile.am
+++ b/wforce/Makefile.am
@@ -112,7 +112,7 @@ nodist_wforce_SOURCES = replication.pb.cc replication.pb.h
wforce.$(OBJEXT): replication.pb.cc
$(UAP_REGEX_FILE):
- wget -q https://raw.githubusercontent.com/ua-parser/uap-core/master/$(UAP_REGEX_FILE) -O $(UAP_REGEX_FILE)
+ cp ../debian/contrib/$(UAP_REGEX_FILE) $(UAP_REGEX_FILE)
if HAVE_SYSTEMD
SYSTEMD_TYPE = notify
|
