From d30e714ccb9d13caf39d14d5b2fc9523b678ed51 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 14 Mar 2013 15:20:55 -0700 Subject: [PATCH] configure: Only link against libpcap on FreeBSD. On other platforms there is no benefit to linking against libpcap, because it is not used. Signed-off-by: Ben Pfaff CC: Ed Maste --- acinclude.m4 | 7 ++++++- configure.ac | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f0610c90e..19a47dd44 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ # -*- autoconf -*- -# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -295,6 +295,8 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], fi]) dnl Checks for net/if_dl.h. +dnl +dnl (We use this as a proxy for checking whether we're building on FreeBSD.) AC_DEFUN([OVS_CHECK_IF_DL], [AC_CHECK_HEADER([net/if_dl.h], [HAVE_IF_DL=yes], @@ -303,6 +305,9 @@ AC_DEFUN([OVS_CHECK_IF_DL], if test "$HAVE_IF_DL" = yes; then AC_DEFINE([HAVE_IF_DL], [1], [Define to 1 if net/if_dl.h is available.]) + + # On FreeBSD we use libpcap to access network devices. + AC_SEARCH_LIBS([pcap_open_live], [pcap]) fi]) dnl Checks for buggy strtok_r. diff --git a/configure.ac b/configure.ac index 1cacd2936..bd491796c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -44,7 +44,6 @@ AC_SYS_LARGEFILE AC_SEARCH_LIBS([pow], [m]) AC_SEARCH_LIBS([clock_gettime], [rt]) AC_SEARCH_LIBS([timer_create], [rt]) -AC_SEARCH_LIBS([pcap_open_live], [pcap]) OVS_CHECK_ESX OVS_CHECK_COVERAGE -- 2.43.0