diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-29 22:54:24 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-29 22:54:24 -0700 |
| commit | b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef (patch) | |
| tree | e49268da6abb834c02049ac982b364e991aecb2e /configure.ac | |
| parent | b2d49f178cc69c580039c5fb058f6eba4a542b1f (diff) | |
| parent | 97dd2bf9bb517c428cfa2778cac071ad845d03a1 (diff) | |
| download | quagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.bz2 quagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.xz | |
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-quagga into hollywood
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e679632f..1d2b2a3a 100755 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,8 @@ AC_ARG_ENABLE(bgp-announce, [ --disable-bgp-announce, turn off BGP route announcement]) AC_ARG_ENABLE(netlink, [ --enable-netlink force to use Linux netlink interface]) +AC_ARG_ENABLE(linkdetect, +[ --enable-linkdetect use Linux link-detect configuration]) AC_ARG_ENABLE(broken-aliases, [ --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X]) AC_ARG_ENABLE(snmp, @@ -917,6 +919,16 @@ AC_CHECK_HEADER([net/if.h], QUAGGA_INCLUDES)], [], QUAGGA_INCLUDES ) + +dnl --------------------------------------------------------------- +dnl kernel link-detect enable via /proc/sys/net/ipv4/conf/ethX/link_detect +dnl --------------------------------------------------------------- +if test "${enable_linkdetect}" = "yes"; then + AC_DEFINE(HAVE_LINKDETECT,1,Enable Linux kernel linkdetect) + LINK_DETECT=if_linkdetect.o +fi +AC_SUBST(LINK_DETECT) + dnl ----------------------- dnl check proc file system. dnl ----------------------- @@ -931,12 +943,6 @@ if test -r /proc/net/if_inet6; then fi AC_SUBST(IF_PROC) -if test -r /proc/sys/net/ipv4/conf; then - AC_DEFINE(HAVE_PROC_NET_IPV4_CONF,,/proc/sys/net/ipv4/conf) - LINK_DETECT=if_linkdetect.o -fi -AC_SUBST(LINK_DETECT) - dnl ----------------------------- dnl check ipforward detect method dnl ----------------------------- |