You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2014/06/28 04:25:56 UTC

git commit: Improved the checking for libnl3 in configure.ac.

Repository: mesos
Updated Branches:
  refs/heads/master 00983a2b0 -> 451c3b6a7


Improved the checking for libnl3 in configure.ac.

Review: https://reviews.apache.org/r/23145


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/451c3b6a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/451c3b6a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/451c3b6a

Branch: refs/heads/master
Commit: 451c3b6a79354402495d4c558b6e0b8c922ce188
Parents: 00983a2
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Jun 27 19:25:26 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Jun 27 19:25:26 2014 -0700

----------------------------------------------------------------------
 configure.ac | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/451c3b6a/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 17230aa..0a8555a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -813,10 +813,13 @@ Network isolator is only supported on Linux!
   ])])
 
   # Check for libnl (both headers and libraries).
-  AC_CHECK_LIB([nl-3], [nl_connect], [],
+  AC_CHECK_LIB([nl-3], [nl_has_capability], [],
                [AC_MSG_ERROR([cannot find libnl-3
 -------------------------------------------------------------------
 We need libnl-3 for building network isolator!
+
+Please install libnl3 (version 3.2.24 or higher):
+http://www.infradead.org/~tgr/libnl/
 -------------------------------------------------------------------
   ])])
 
@@ -825,22 +828,31 @@ We need libnl-3 for building network isolator!
                    [AC_MSG_ERROR([cannot find libnl-3 headers
 -------------------------------------------------------------------
 We need libnl-3 headers for building network isolator!
+
+Please install libnl3 (version 3.2.24 or higher):
+http://www.infradead.org/~tgr/libnl/
 -------------------------------------------------------------------
   ])])
 
   # Check for libnl-route (both headers and libraries).
-  AC_CHECK_LIB([nl-route-3], [rtnl_cls_alloc], [],
+  AC_CHECK_LIB([nl-route-3], [rtnl_link_veth_add], [],
                [AC_MSG_ERROR([cannot find libnl-route-3
 -------------------------------------------------------------------
 We need libnl-route-3 for building network isolator!
+
+Please install libnl3 (version 3.2.24 or higher):
+http://www.infradead.org/~tgr/libnl/
 -------------------------------------------------------------------
   ])])
 
-  AC_CHECK_HEADERS([netlink/route/rtnl.h libnl3/netlink/route/rtnl.h],
+  AC_CHECK_HEADERS([netlink/route/link/veth.h libnl3/netlink/route/link/veth.h],
                    [break]
                    [AC_MSG_ERROR([cannot find libnl-route-3 headers
 -------------------------------------------------------------------
 We need libnl-route-3 headers for building network isolator!
+
+Please install libnl3 (version 3.2.24 or higher):
+http://www.infradead.org/~tgr/libnl/
 -------------------------------------------------------------------
   ])])