diff options
| author | Ilya Maximets <i.maximets@samsung.com> | 2019-02-07 15:20:20 +0300 |
|---|---|---|
| committer | Ian Stokes <ian.stokes@intel.com> | 2019-02-07 15:19:55 +0000 |
| commit | 699571b5179aa9e6633cd14b46a9dc2a2ca294b2 (patch) | |
| tree | 9a314a857ae374ea53b59db6867e9038a78d0fee | |
| parent | baac814a9107652c0afec5ffb667a16686cc1c95 (diff) | |
| download | openvswitch-699571b5179aa9e6633cd14b46a9dc2a2ca294b2.tar.gz | |
acinclude: Drop DPDK_EXTRA_LIB variable.
AC_SEARCH_LIBS enables the libraries itself:
checking for library containing get_mempolicy... -lnuma
checking for library containing pcap_dump... -lpcap
So, they are available in LIBS. No need to add them twice.
Also, DPDK_EXTRA_LIB doesn't even work, because each check overwrites
the variable instead of appending the new library. It was first time
misused while making libnuma optional and copy-pasted to several places
after that.
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 87265afe7..cb67d51c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -198,7 +198,6 @@ AC_DEFUN([OVS_CHECK_DPDK], [ esac DPDK_LIB="-ldpdk" - DPDK_EXTRA_LIB="" ovs_save_CFLAGS="$CFLAGS" ovs_save_LDFLAGS="$LDFLAGS" @@ -217,7 +216,6 @@ AC_DEFUN([OVS_CHECK_DPDK], [ ], []) ], [], [AC_SEARCH_LIBS([get_mempolicy],[numa],[],[AC_MSG_ERROR([unable to find libnuma, install the dependency package])]) - DPDK_EXTRA_LIB="-lnuma" AC_DEFINE([VHOST_NUMA], [1], [NUMA Aware vHost support detected in DPDK.])]) AC_COMPILE_IFELSE([ @@ -230,7 +228,6 @@ AC_DEFUN([OVS_CHECK_DPDK], [ ], []) ], [], [AC_SEARCH_LIBS([pcap_dump],[pcap],[],[AC_MSG_ERROR([unable to find libpcap, install the dependency package])]) - DPDK_EXTRA_LIB="-lpcap" AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [ @@ -253,7 +250,7 @@ AC_DEFUN([OVS_CHECK_DPDK], [ DPDKLIB_FOUND=false save_LIBS=$LIBS for extras in "" "-ldl"; do - LIBS="$DPDK_LIB $extras $save_LIBS $DPDK_EXTRA_LIB" + LIBS="$DPDK_LIB $extras $save_LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include <rte_config.h> #include <rte_eal.h>], |