diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
commit | 293067f086565c294862b954bf58e1680d758280 (patch) | |
tree | cf5ebe06faba962952846ab2dc682cbdd62dadcd /configure.ac | |
parent | babeld: The sockaddr code is not passed through anymore (diff) | |
parent | Merge pull request #617 from donaldsharp/bgp_nexthop (diff) | |
download | frr-293067f086565c294862b954bf58e1680d758280.tar.xz frr-293067f086565c294862b954bf58e1680d758280.zip |
Merge remote-tracking branch 'origin/master' into babel
Diffstat (limited to 'configure.ac')
-rwxr-xr-x | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1e414d094..8095f86f0 100755 --- a/configure.ac +++ b/configure.ac @@ -376,11 +376,11 @@ dnl ---------- AC_MSG_CHECKING(whether this OS has MPLS stack) case "$host" in *-linux*) - MPLS_METHOD="zebra_mpls_netlink.o zebra_mpls.o" + MPLS_METHOD="zebra_mpls_netlink.o" AC_MSG_RESULT(Linux MPLS) ;; *-openbsd*) - MPLS_METHOD="zebra_mpls_openbsd.o zebra_mpls.o" + MPLS_METHOD="zebra_mpls_openbsd.o" AC_MSG_RESULT(OpenBSD MPLS) ;; *) |