summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorMark Stapp <mjs.ietf@gmail.com>2022-07-12 17:44:29 +0200
committerGitHub <noreply@github.com>2022-07-12 17:44:29 +0200
commitb33396cb7573749df7d535802af0b8b875a9c060 (patch)
tree5525f3b16fffb2c7c53f540a92235773c238e6a2 /pimd
parentMerge pull request #11285 from iqras23/conditional_def_orig (diff)
parentdebian: Add pkg.frr.pim6d build profile (diff)
downloadfrr-b33396cb7573749df7d535802af0b8b875a9c060.tar.xz
frr-b33396cb7573749df7d535802af0b8b875a9c060.zip
Merge pull request #11461 from mobash-rasool/pimv6-enable
pim6d: Enable/disable pim6d daemons on different platforms based on flags
Diffstat (limited to 'pimd')
-rw-r--r--pimd/subdir.am10
1 files changed, 2 insertions, 8 deletions
diff --git a/pimd/subdir.am b/pimd/subdir.am
index 9546a7776..aa06b8647 100644
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -170,17 +170,11 @@ clippy_scan += \
pimd_pimd_CFLAGS = $(AM_CFLAGS) -DPIM_IPV=4
pimd_pimd_LDADD = lib/libfrr.la $(LIBCAP)
-if PIMD
-if DEV_BUILD
-#
-# pim6d is only enabled for --enable-dev-build, and NOT installed currently
-# (change noinst_ to sbin_ below to install it.)
-#
-noinst_PROGRAMS += pimd/pim6d
+if PIM6D
+sbin_PROGRAMS += pimd/pim6d
pimd_pim6d_CFLAGS = $(AM_CFLAGS) -DPIM_IPV=6
pimd_pim6d_LDADD = lib/libfrr.la $(LIBCAP)
endif
-endif
pimd_test_igmpv3_join_LDADD = lib/libfrr.la
pimd_test_igmpv3_join_SOURCES = pimd/test_igmpv3_join.c