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

vnc: default to enabled

Browse source
This commit is contained in:
Lou Berger 2016-09-28 18:16:25 -04:00 committed by Donald Sharp
parent f8b6f49912
commit f95f2ad915
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -259,7 +259,7 @@ AC_ARG_ENABLE(pimd,
AC_ARG_ENABLE(bgp-announce, AC_ARG_ENABLE(bgp-announce,
AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement])) AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement]))
AC_ARG_ENABLE(bgp-vnc, AC_ARG_ENABLE(bgp-vnc,
AS_HELP_STRING([--enable-bgp-vnc],[turn on BGP VNC support])) AS_HELP_STRING([--disable-bgp-vnc],[turn off BGP VNC support]))
AC_ARG_WITH(rfp-path, AC_ARG_WITH(rfp-path,
AS_HELP_STRING([--with-rfp-path[=DIR]],[path to replaced stub RFP used with BGP VNC])) AS_HELP_STRING([--with-rfp-path[=DIR]],[path to replaced stub RFP used with BGP VNC]))
AC_ARG_ENABLE(snmp, AC_ARG_ENABLE(snmp,
@ -1374,7 +1374,7 @@ if test "${with_rfp_path}" != "no"; then
AC_SUBST(VNC_RFP_PATH) AC_SUBST(VNC_RFP_PATH)
fi fi
if test "${enable_bgp_vnc}" = "yes";then if test "${enable_bgp_vnc}" != "no";then
AC_DEFINE(ENABLE_BGP_VNC,1,Enable BGP VNC support) AC_DEFINE(ENABLE_BGP_VNC,1,Enable BGP VNC support)
RFPTEST="${with_rfp_path}/rfptest" RFPTEST="${with_rfp_path}/rfptest"
LIBRFP="${with_rfp_path}/librfp" LIBRFP="${with_rfp_path}/librfp"
@ -1385,7 +1385,7 @@ else
RFPINC="bgpd/rfp-example/librfp" RFPINC="bgpd/rfp-example/librfp"
fi fi
# set # set
AM_CONDITIONAL([ENABLE_BGP_VNC], [test x${enable_bgp_vnc} = xyes]) AM_CONDITIONAL([ENABLE_BGP_VNC], [test x${enable_bgp_vnc} != xno])
AC_SUBST(DOC) AC_SUBST(DOC)
AC_SUBST(ZEBRA) AC_SUBST(ZEBRA)
@ -1773,7 +1773,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh]) pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh])
if test "${enable_bgp_vnc}" = "yes"; then if test "${enable_bgp_vnc}" != "no"; then
if test "${with_rfp_path}" = "bgpd/rfp-example" ; then if test "${with_rfp_path}" = "bgpd/rfp-example" ; then
AC_CONFIG_FILES([bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile]) AC_CONFIG_FILES([bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile])
else else