DPDK_INCLUDE=$RTE_SDK/include
DPDK_LIB_DIR=$RTE_SDK/lib
- DPDK_LIBS="$DPDK_LIB_DIR/libintel_dpdk.a"
- LIBS="$DPDK_LIBS $LIBS"
- CPPFLAGS="-I$DPDK_INCLUDE $CPPFLAGS"
+ LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR"
+ CFLAGS="$CFLAGS -I$DPDK_INCLUDE"
+
+ # On some systems we have to add -ldl to link with dpdk
+ #
+ # This code, at first, tries to link without -ldl (""),
+ # then adds it and tries again.
+ # Before each attempt the search cache must be unset,
+ # otherwise autoconf will stick with the old result
+
+ found=false
+ save_LIBS=$LIBS
+ for extras in "" "-ldl"; do
+ LIBS="-lintel_dpdk $extras $save_LIBS"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([#include <rte_config.h>
+ #include <rte_eal.h>],
+ [int rte_argc; char ** rte_argv;
+ rte_eal_init(rte_argc, rte_argv);])],
+ [found=true])
+ if $found; then
+ break
+ fi
+ done
+ if $found; then :; else
+ AC_MSG_ERROR([cannot link with dpdk])
+ fi
AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.])
else
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],
[OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [rxhash])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [u16.*rxhash],
+ [OVS_DEFINE([HAVE_U16_RXHASH])])
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],
[OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([_OVS_CHECK_CC_OPTION], [dnl
- m4_define([ovs_cv_name], [ovs_cv_[]m4_translit([$1], [-], [_])])dnl
+ m4_define([ovs_cv_name], [ovs_cv_[]m4_translit([$1], [-=], [__])])dnl
AC_CACHE_CHECK([whether $CC accepts $1], [ovs_cv_name],
[ovs_save_CFLAGS="$CFLAGS"
dnl Include -Werror in the compiler options, because without -Werror