From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 18 Mar 2020 16:49:37 +0000 (+0100)
Subject: build: really disable pimd on OpenBSD
X-Git-Tag: base_7.4~217^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0476fdad7acc59c82d630c91a6b20b110db389cc;p=mirror%2Ffrr.git

build: really disable pimd on OpenBSD

For some reason the check did not work

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
---

diff --git a/configure.ac b/configure.ac
index 9aff63a31c..b4d227e794 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1122,16 +1122,6 @@ case "$host_os" in
     AC_DEFINE([OPEN_BSD], [1], [OpenBSD])
     AC_DEFINE([KAME], [1], [KAME IPv6])
     AC_DEFINE([BSD_V6_SYSCTL], [1], [BSD v6 sysctl to turn on and off forwarding])
-
-    if test "$enable_pimd" != "no"; then
-      case "$host_os" in
-      openbsd6.0)
-        ;;
-      openbsd[6-9]*)
-        AC_MSG_FAILURE([pimd cannot be enabled as PIM support has been removed from OpenBSD 6.1])
-        ;;
-      esac
-    fi
     ;;
   *)
     AC_MSG_RESULT([BSD])
@@ -1791,6 +1781,22 @@ if test "$enable_rpki" = "yes"; then
   )
 fi
 
+dnl ------------------------------------
+dnl pimd is not supported on OpenBSD
+dnl ------------------------------------
+if test "$enable_pimd" != "no"; then
+AC_MSG_CHECKING([for pimd OS support])
+case "$host_os" in
+  openbsd*)
+    AC_MSG_RESULT([no])
+    enable_pimd="no"
+    ;;
+  *)
+    AC_MSG_RESULT([yes])
+    ;;
+esac
+fi
+
 dnl -------------------------------------
 dnl VRRP is only supported on linux
 dnl -------------------------------------