From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 9 Feb 2015 10:36:10 +0000 (+0100)
Subject: build: enable isisd by default
X-Git-Tag: frr-2.0-rc1~642
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c3a9461e038d422ee677158b18dcd2648a6f9117;p=matthieu%2Ffrr.git

build: enable isisd by default

Most distributors enable it anyway, and it's not THAT broken anymore to
mandate disabling it by default.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Paul Jakma <paul@jakma.org>
---

diff --git a/configure.ac b/configure.ac
index 265e8f915e..a30ec00074 100755
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ AC_ARG_ENABLE(ospf6d,
 AC_ARG_ENABLE(watchquagga,
   AS_HELP_STRING([--disable-watchquagga], [do not build watchquagga]))
 AC_ARG_ENABLE(isisd,
-  AS_HELP_STRING([--enable-isisd], [build isisd]))
+  AS_HELP_STRING([--disable-isisd], [do not build isisd]))
 AC_ARG_ENABLE(pimd,
   AS_HELP_STRING([--disable-pimd], [do not build pimd]))
 AC_ARG_ENABLE(bgp-announce,
@@ -375,7 +375,7 @@ if test "${enable_irdp}" = "yes"; then
   AC_DEFINE(HAVE_IRDP,, IRDP )
 fi
 
-if test "${enable_isisd}" = "yes" && test "${enable_isis_topology}" = yes; then
+if test "${enable_isisd}" != "no" && test "${enable_isis_topology}" = yes; then
   AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code)
   ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology"
   ISIS_TOPOLOGY_DIR="topology"
@@ -1199,9 +1199,8 @@ esac
 AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d")
 
 case "${enable_isisd}" in
-  "yes") ISISD="isisd";;
   "no" ) ISISD="";;
-  *    ) ;;
+  *    ) ISISD="isisd";;
 esac
 AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd")