summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2019-01-24 18:17:40 +0100
committerDavid Lamparter <equinox@diac24.net>2019-02-19 21:34:31 +0100
commit3ec9556728c7fe17bb1c47e62abf75bbff29502f (patch)
tree8edbd514dcbae0913a0e344ec6d5677d75c67050 /configure.ac
parentdebian: remove superseded systemd lintian override (diff)
downloadfrr-3ec9556728c7fe17bb1c47e62abf75bbff29502f.tar.xz
frr-3ec9556728c7fe17bb1c47e62abf75bbff29502f.zip
watchfrr: build in defaults for -r/-s/-k
There's no good reason to not have these options default to the installation path of tools/watchfrr.sh. Doing so allows us to ditch watchfrr_options from daemons/daemons.conf completely. Fixes: #3652 Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'configure.ac')
-rwxr-xr-xconfigure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 8ae1a7bbc..4a05c0d69 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2157,6 +2157,7 @@ AC_SUBST([CFG_LIBYANG_PLUGINS])
AC_DEFINE_UNQUOTED([MODULE_PATH], ["$CFG_MODULE"], [path to modules])
AC_DEFINE_UNQUOTED([YANG_MODELS_PATH], ["$CFG_YANGMODELS"], [path to YANG data models])
AC_DEFINE_UNQUOTED([LIBYANG_PLUGINS_PATH], ["$CFG_LIBYANG_PLUGINS"], [path to libyang plugins])
+AC_DEFINE_UNQUOTED([WATCHFRR_SH_PATH], ["${CFG_SBIN%/}/watchfrr.sh"], [path to watchfrr.sh])
dnl ------------------------------------
dnl Enable RPKI and add librtr to libs