diff options
| -rwxr-xr-x | configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index aa84ee51..747a0c61 100755 --- a/configure.ac +++ b/configure.ac @@ -225,7 +225,7 @@ AC_ARG_WITH(pkg-git-version, AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]), [ test "x$withval" != "xno" && with_pkg_git_version="yes" ]) AC_ARG_ENABLE(vtysh, - AS_HELP_STRING([--enable-vtysh], [include integrated vty shell for Quagga])) + AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for Quagga])) AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc], [do not build docs])) AC_ARG_ENABLE(zebra, @@ -245,7 +245,7 @@ AC_ARG_ENABLE(watchquagga, AC_ARG_ENABLE(isisd, AS_HELP_STRING([--disable-isisd], [do not build isisd])) AC_ARG_ENABLE(pimd, - AS_HELP_STRING([--enable-pimd], [build pimd])) + AS_HELP_STRING([--disable-pimd], [do not build pimd])) AC_ARG_ENABLE(bgp-announce, AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement])) AC_ARG_ENABLE(snmp, @@ -637,7 +637,8 @@ dnl --------------------- dnl Integrated VTY option dnl --------------------- case "${enable_vtysh}" in - "yes") VTYSH="vtysh"; + "no") VTYSH="";; + *) VTYSH="vtysh"; AC_DEFINE(VTYSH,,VTY shell) dnl Vtysh uses libreadline, which looks for termcap functions at dnl configure time. We follow readlines search order. @@ -667,7 +668,6 @@ dnl [TODO] on Linux, and in [TODO] on Solaris. fi ;; "no" ) VTYSH="";; - * ) ;; esac AC_SUBST(LIBREADLINE) AM_CONDITIONAL(VTYSH, test "x$VTYSH" = "xvtysh") @@ -1186,9 +1186,8 @@ esac AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd") case "${enable_pimd}" in - "yes") PIMD="pimd";; "no" ) PIMD="";; - * ) ;; + * ) PIMD="pimd";; esac AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd") |