matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: enable isisd by default

Browse source 
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>
This commit is contained in:
David Lamparter 2015-02-09 11:36:10 +01:00 committed by Donald Sharp
parent 80db5ac178
commit c3a9461e03
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -237,7 +237,7 @@ AC_ARG_ENABLE(ospf6d,
AC_ARG_ENABLE(watchquagga, AC_ARG_ENABLE(watchquagga,
AS_HELP_STRING([--disable-watchquagga], [do not build watchquagga])) AS_HELP_STRING([--disable-watchquagga], [do not build watchquagga]))
AC_ARG_ENABLE(isisd, AC_ARG_ENABLE(isisd,
AS_HELP_STRING([--enable-isisd], [build isisd])) AS_HELP_STRING([--disable-isisd], [do not build isisd]))
AC_ARG_ENABLE(pimd, AC_ARG_ENABLE(pimd,
AS_HELP_STRING([--disable-pimd], [do not build pimd])) AS_HELP_STRING([--disable-pimd], [do not build pimd]))
AC_ARG_ENABLE(bgp-announce, AC_ARG_ENABLE(bgp-announce,
@ -375,7 +375,7 @@ if test "${enable_irdp}" = "yes"; then
AC_DEFINE(HAVE_IRDP,, IRDP ) AC_DEFINE(HAVE_IRDP,, IRDP )
fi 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) AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code)
ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology" ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology"
ISIS_TOPOLOGY_DIR="topology" ISIS_TOPOLOGY_DIR="topology"
@ -1199,9 +1199,8 @@ esac
AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d") AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d")
case "${enable_isisd}" in case "${enable_isisd}" in
"yes") ISISD="isisd";;
"no" ) ISISD="";; "no" ) ISISD="";;
* ) ;; * ) ISISD="isisd";;
esac esac
AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd") AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd")