Commit 8e776955 authored by Beniamino Galvani's avatar Beniamino Galvani

build: rename DNSSEC_TRIGGER_SCRIPT to DNSSEC_TRIGGER_PATH

Rename the define for consistency, since the configure option is named
'dnssec-trigger'.
parent ff837b26
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#mesondefine DNSMASQ_PATH #mesondefine DNSMASQ_PATH
/* Define to path of unbound dnssec-trigger-script */ /* Define to path of unbound dnssec-trigger-script */
#mesondefine DNSSEC_TRIGGER_SCRIPT #mesondefine DNSSEC_TRIGGER_PATH
/* Gettext package */ /* Gettext package */
#mesondefine GETTEXT_PACKAGE #mesondefine GETTEXT_PACKAGE
......
...@@ -941,13 +941,13 @@ AC_SUBST(DNSMASQ_PATH) ...@@ -941,13 +941,13 @@ AC_SUBST(DNSMASQ_PATH)
AC_ARG_WITH(dnssec_trigger, AC_ARG_WITH(dnssec_trigger,
AS_HELP_STRING([--with-dnssec-trigger=/path/to/dnssec-trigger-script], [path to unbound dnssec-trigger-script])) AS_HELP_STRING([--with-dnssec-trigger=/path/to/dnssec-trigger-script], [path to unbound dnssec-trigger-script]))
if test "x${with_dnssec_trigger}" = x; then if test "x${with_dnssec_trigger}" = x; then
AC_PATH_PROG(DNSSEC_TRIGGER_SCRIPT, dnssec-trigger-script, /usr/libexec/dnssec-trigger-script, AC_PATH_PROG(DNSSEC_TRIGGER_PATH, dnssec-trigger-script, /usr/libexec/dnssec-trigger-script,
/usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/libexec:/usr/lib:/usr/lib/dnssec-trigger) /usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/libexec:/usr/lib:/usr/lib/dnssec-trigger)
else else
DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger" DNSSEC_TRIGGER_PATH="$with_dnssec_trigger"
fi fi
AC_DEFINE_UNQUOTED(DNSSEC_TRIGGER_SCRIPT, "$DNSSEC_TRIGGER_SCRIPT", [Define to path of unbound dnssec-trigger-script]) AC_DEFINE_UNQUOTED(DNSSEC_TRIGGER_PATH, "$DNSSEC_TRIGGER_PATH", [Define to path of unbound dnssec-trigger-script])
AC_SUBST(DNSSEC_TRIGGER_SCRIPT) AC_SUBST(DNSSEC_TRIGGER_PATH)
# system CA certificates path # system CA certificates path
AC_ARG_WITH(system-ca-path, AC_ARG_WITH(system-ca-path,
......
...@@ -624,10 +624,10 @@ dnssec_ts_paths = ['/usr/local/libexec', ...@@ -624,10 +624,10 @@ dnssec_ts_paths = ['/usr/local/libexec',
'/usr/lib', '/usr/lib',
'/usr/lib/dnssec-trigger'] '/usr/lib/dnssec-trigger']
# 0: cmdline option, 1: paths, 2: fallback, 3: config.h option # 0: cmdline option, 1: paths, 2: fallback
progs = [['iptables', default_paths, '/sbin/iptables'], progs = [['iptables', default_paths, '/sbin/iptables'],
['dnsmasq', default_paths, ''], ['dnsmasq', default_paths, ''],
['dnssec_trigger', dnssec_ts_paths, join_paths(nm_libexecdir, 'dnssec-trigger-script'), 'DNSSEC_TRIGGER_SCRIPT'], ['dnssec_trigger', dnssec_ts_paths, join_paths(nm_libexecdir, 'dnssec-trigger-script') ],
] ]
foreach prog : progs foreach prog : progs
...@@ -640,7 +640,7 @@ foreach prog : progs ...@@ -640,7 +640,7 @@ foreach prog : progs
exe = find_program(search_paths, required : false) exe = find_program(search_paths, required : false)
path = exe.found() ? exe.path() : prog[2] path = exe.found() ? exe.path() : prog[2]
endif endif
name = prog.length() > 3 ? prog[3] : (prog[0].to_upper() + '_PATH') name = prog[0].to_upper() + '_PATH'
config_h.set_quoted(name, path) config_h.set_quoted(name, path)
endforeach endforeach
......
...@@ -43,7 +43,7 @@ update (NMDnsPlugin *plugin, ...@@ -43,7 +43,7 @@ update (NMDnsPlugin *plugin,
const CList *ip_config_lst_head, const CList *ip_config_lst_head,
const char *hostname) const char *hostname)
{ {
char *argv[] = { DNSSEC_TRIGGER_SCRIPT, "--async", "--update", NULL }; char *argv[] = { DNSSEC_TRIGGER_PATH, "--async", "--update", NULL };
int status; int status;
/* TODO: We currently call a script installed with the dnssec-trigger /* TODO: We currently call a script installed with the dnssec-trigger
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment