else
FLAKE8_WERROR=-
fi
- AC_SUBST([FLAKE8_WERROR])])
+ AC_SUBST([FLAKE8_WERROR])
+
+ # If --enable-Werror is specified, fail the build on sparse warnings.
+ if test "X$enable_Werror" = Xyes; then
+ SPARSE_WERROR=-Wsparse-error
+ else
+ SPARSE_WERROR=
+ fi
+ AC_SUBST([SPARSE_WERROR])])
dnl OVS_CHECK_LINUX
dnl
AC_MSG_RESULT([$kversion])
if test "$version" -ge 4; then
- if test "$version" = 4 && test "$patchlevel" -le 12; then
+ if test "$version" = 4 && test "$patchlevel" -le 18; then
: # Linux 4.x
else
- AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.11.x is not supported (please refer to the FAQ for advice)])
+ AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.18.x is not supported (please refer to the FAQ for advice)])
fi
elif test "$version" = 3 && test "$patchlevel" -ge 10; then
: # Linux 3.x
AC_DEFUN([OVS_CHECK_LINUX_TC], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <linux/pkt_cls.h>], [
- int x = TCA_FLOWER_KEY_IP_TTL_MASK;
+ int x = TCA_FLOWER_KEY_ENC_IP_TTL_MASK;
])],
- [AC_DEFINE([HAVE_TCA_FLOWER_KEY_IP_TTL_MASK], [1],
- [Define to 1 if TCA_FLOWER_KEY_IP_TTL_MASK is avaiable.])])
+ [AC_DEFINE([HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK], [1],
+ [Define to 1 if TCA_FLOWER_KEY_ENC_IP_TTL_MASK is available.])])
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <linux/tc_act/tc_vlan.h>], [
int x = TCA_VLAN_PUSH_VLAN_PRIORITY;
])],
[AC_DEFINE([HAVE_TCA_VLAN_PUSH_VLAN_PRIORITY], [1],
- [Define to 1 if TCA_VLAN_PUSH_VLAN_PRIORITY is avaiable.])])
+ [Define to 1 if TCA_VLAN_PUSH_VLAN_PRIORITY is available.])])
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <linux/tc_act/tc_tunnel_key.h>], [
- int x = TCA_TUNNEL_KEY_ENC_DST_PORT;
+ int x = TCA_TUNNEL_KEY_ENC_TTL;
])],
- [AC_DEFINE([HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT], [1],
- [Define to 1 if TCA_TUNNEL_KEY_ENC_DST_PORT is avaiable.])])
+ [AC_DEFINE([HAVE_TCA_TUNNEL_KEY_ENC_TTL], [1],
+ [Define to 1 if TCA_TUNNEL_KEY_ENC_TTL is available.])])
+
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([#include <linux/tc_act/tc_pedit.h>], [
+ int x = TCA_PEDIT_KEY_EX_HDR_TYPE_UDP;
+ ])],
+ [AC_DEFINE([HAVE_TCA_PEDIT_KEY_EX_HDR_TYPE_UDP], [1],
+ [Define to 1 if TCA_PEDIT_KEY_EX_HDR_TYPE_UDP is available.])])
])
dnl OVS_CHECK_DPDK
case "$with_dpdk" in
yes)
DPDK_AUTO_DISCOVER="true"
- PKG_CHECK_MODULES([DPDK], [libdpdk],
- [DPDK_INCLUDE="$DPDK_CFLAGS"],
- [DPDK_INCLUDE="-I/usr/local/include/dpdk -I/usr/include/dpdk"])
+ PKG_CHECK_MODULES_STATIC([DPDK], [libdpdk], [
+ DPDK_INCLUDE="$DPDK_CFLAGS"
+ DPDK_LIB="$DPDK_LIBS"], [
+ DPDK_INCLUDE="-I/usr/local/include/dpdk -I/usr/include/dpdk"
+ DPDK_LIB="-ldpdk"])
;;
*)
DPDK_AUTO_DISCOVER="false"
DPDK_INCLUDE="-I$DPDK_INCLUDE_PATH/dpdk"
fi
DPDK_LIB_DIR="$with_dpdk/lib"
+ DPDK_LIB="-ldpdk"
;;
esac
- DPDK_LIB="-ldpdk"
- DPDK_EXTRA_LIB=""
-
ovs_save_CFLAGS="$CFLAGS"
ovs_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $DPDK_INCLUDE"
LDFLAGS="$LDFLAGS -L${DPDK_LIB_DIR}"
fi
+ AC_CHECK_HEADERS([rte_config.h], [], [
+ AC_MSG_ERROR([unable to find rte_config.h in $with_dpdk])
+ ], [AC_INCLUDES_DEFAULT])
+
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
[
#include <rte_config.h>
-#if RTE_LIBRTE_VHOST_NUMA
+#if defined(RTE_LIBRTE_VHOST_NUMA) || defined(RTE_EAL_NUMA_AWARE_HUGEPAGES)
#error
#endif
], [])
], [],
[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([
], [])
], [],
[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(
[
[AC_DEFINE([DPDK_PDUMP], [1], [DPDK pdump enabled in OVS.])])
])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include <rte_config.h>
+#if RTE_LIBRTE_MLX5_PMD
+#error
+#endif
+ ], [])
+ ], [],
+ [AC_SEARCH_LIBS([mnl_attr_put],[mnl],[],[AC_MSG_ERROR([unable to find libmnl, install the dependency package])])])
+
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include <rte_config.h>
+#if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS)
+#error
+#endif
+ ], [])
+ ], [],
+ [AC_SEARCH_LIBS([mlx5dv_create_wq],[mlx5],[],[AC_MSG_ERROR([unable to find libmlx5, install the dependency package])])])
+
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include <rte_config.h>
+#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS)
+#error
+#endif
+ ], [])
+ ], [],
+ [AC_SEARCH_LIBS([mlx4dv_init_obj],[mlx4],[],[AC_MSG_ERROR([unable to find libmlx4, install the dependency package])])])
+
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include <rte_config.h>
+#if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS)
+#error
+#endif
+#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS)
+#error
+#endif
+ ], [])
+ ], [],
+ [AC_SEARCH_LIBS([verbs_init_cq],[ibverbs],[],[AC_MSG_ERROR([unable to find libibverbs, install the dependency package])])])
+
# On some systems we have to add -ldl to link with dpdk
#
# This code, at first, tries to link without -ldl (""),
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>],
#
# These options are specified inside a single -Wl directive to prevent
# autotools from reordering them.
- DPDK_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
+ #
+ # OTOH newer versions of dpdk pkg-config (generated with Meson)
+ # will already have flagged just the right set of libs with
+ # --whole-archive - in those cases do not wrap it once more.
+ case "$DPDK_LIB" in
+ *whole-archive*) DPDK_vswitchd_LDFLAGS=$DPDK_LIB;;
+ *) DPDK_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
+ esac
AC_SUBST([DPDK_vswitchd_LDFLAGS])
AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.])
fi
OVS_GREP_IFELSE([$KSRC/arch/x86/include/asm/checksum_32.h], [src_err,],
[OVS_DEFINE([HAVE_CSUM_COPY_DBG])])
+ OVS_GREP_IFELSE([$KSRC/include/net/ip6_fib.h], [rt6_get_cookie],
+ [OVS_DEFINE([HAVE_RT6_GET_COOKIE])])
+
OVS_GREP_IFELSE([$KSRC/include/net/addrconf.h], [ipv6_dst_lookup.*net],
[OVS_DEFINE([HAVE_IPV6_DST_LOOKUP_NET])])
OVS_GREP_IFELSE([$KSRC/include/net/addrconf.h], [ipv6_stub])
OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [IS_ERR_OR_NULL])
OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [PTR_ERR_OR_ZERO])
+ OVS_GREP_IFELSE([$KSRC/include/linux/jump_label.h], [static_branch_unlikely(],
+ [OVS_DEFINE([HAVE_UPSTREAM_STATIC_KEY])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/jump_label.h], [DEFINE_STATIC_KEY_FALSE],
+ [OVS_DEFINE([HAVE_DEFINE_STATIC_KEY])])
+
OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [eth_hw_addr_random])
OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy])
[OVS_GREP_IFELSE([$KSRC/include/net/ip_tunnels.h],
[iptunnel_pull_offloads],
[OVS_GREP_IFELSE([$KSRC/include/net/dst_cache.h], [dst_cache],
- [OVS_DEFINE([USE_UPSTREAM_TUNNEL])])])])
+ [OVS_GREP_IFELSE([$KSRC/include/net/erspan.h], [erspan_md2],
+ [OVS_DEFINE([USE_UPSTREAM_TUNNEL])])])])])
+ OVS_GREP_IFELSE([$KSRC/include/net/dst_cache.h], [dst_cache],
+ [OVS_DEFINE([USE_BUILTIN_DST_CACHE])])
OVS_GREP_IFELSE([$KSRC/include/net/mpls.h], [mpls_hdr],
[OVS_DEFINE([MPLS_HEADER_IS_L3])])
OVS_GREP_IFELSE([$KSRC/include/linux/net.h], [sock_create_kern.*net],
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_by_index_rcu])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_recursion_level])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [__skb_gso_segment])
+ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [skb_gso_error_unwind])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_get_iflink])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_features_check],
[OVS_DEFINE([USE_UPSTREAM_TUNNEL_GSO])])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_add_vxlan_port])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_add_geneve_port])
+ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_udp_tunnel_add])
OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t])
dnl Ubuntu kernel 3.13 has defined this struct but not used for netdev->tstats.
dnl So check type of tstats.
OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device],
[max_mtu])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device_ops_extended],
+ [ndo_change_mtu], [OVS_DEFINE([HAVE_RHEL7_MAX_MTU])])
OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hook_state])
OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [nf_register_net_hook])
[OVS_DEFINE([HAVE_NF_HOOKFN_ARG_PRIV])])
OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hook_ops],
[owner], [OVS_DEFINE([HAVE_NF_HOOKS_OPS_OWNER])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [NFPROTO_INET])
+
OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter_ipv6.h], [nf_ipv6_ops],
[fragment.*sock], [OVS_DEFINE([HAVE_NF_IPV6_OPS_FRAGMENT])])
[nf_ct_is_untracked])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_zones.h],
[nf_ct_zone_init])
+ OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_l3proto.h],
+ [net_ns_get])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_labels.h],
[nf_connlabels_get])
OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_labels.h],
[nf_conn_labels], [words])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_nat.h], [nf_ct_nat_ext_add])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_nat.h], [nf_nat_alloc_null_binding])
+ OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_nat.h], [nf_nat_range2])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_seqadj.h], [nf_ct_seq_adjust])
+ OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_count.h], [nf_conncount_gc_list],
+ [OVS_DEFINE([HAVE_UPSTREAM_NF_CONNCOUNT])])
OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32_max])
[OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h],
[rcu_read_lock_held])])
OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [lockdep_rtnl_is_held])
+ OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [net_rwsem])
# Check for the proto_data_valid member in struct sk_buff. The [^@]
# is necessary because some versions of this header remove the
OVS_FIND_FIELD_IFELSE([$KSRC/include/net/vxlan.h], [vxlan_dev], [cfg],
[OVS_DEFINE([HAVE_VXLAN_DEV_CFG])])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h],
- [nf_conntrack_helper_put])
+ [nf_conntrack_helper_put],
+ [OVS_DEFINE(HAVE_NF_CONNTRACK_HELPER_PUT)])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],[[[[:space:]]]SKB_GSO_UDP[[[:space:]]]],
+ [OVS_DEFINE([HAVE_SKB_GSO_UDP])])
+ OVS_GREP_IFELSE([$KSRC/include/net/dst.h],[DST_NOCACHE],
+ [OVS_DEFINE([HAVE_DST_NOCACHE])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/net/rtnetlink.h], [rtnl_link_ops],
+ [extack],
+ [OVS_DEFINE([HAVE_EXT_ACK_IN_RTNL_LINKOPS])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hook_ops],
+ [list],
+ [OVS_DEFINE([HAVE_LIST_IN_NF_HOOK_OPS])])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/netfilter/nf_conntrack_common.h],
+ [IP_CT_UNTRACKED])
+ OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h],
+ [netdev_master_upper_dev_link], [extack],
+ [OVS_DEFINE([HAVE_UPPER_DEV_LINK_EXTACK])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/compiler_types.h],
+ [__LINUX_COMPILER_TYPES_H],
+ [OVS_DEFINE([HAVE_LINUX_COMPILER_TYPES_H])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/timekeeping.h],
+ [ktime_get_ts64],
+ [OVS_DEFINE([HAVE_KTIME_GET_TS64])])
+ OVS_GREP_IFELSE([$KSRC/include/net/net_namespace.h],
+ [EXPORT_SYMBOL_GPL(peernet2id_alloc)],
+ [OVS_DEFINE([HAVE_PEERNET2ID_ALLOC])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/timekeeping.h],
+ [ktime_get_ns],
+ [OVS_DEFINE([HAVE_KTIME_GET_NS])])
+ OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h],
+ frag_percpu_counter_batch[],
+ [OVS_DEFINE([HAVE_FRAG_PERCPU_COUNTER_BATCH])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
+ [null_compute_pseudo],
+ [OVS_DEFINE([HAVE_NULL_COMPUTE_PSEUDO])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
+ [__skb_checksum_convert],
+ [OVS_DEFINE([HAVE_SKB_CHECKSUM_CONVERT])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device],
+ [max_mtu],
+ [OVS_DEFINE([HAVE_NET_DEVICE_MAX_MTU])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/net/ip6_tunnel.h], [__ip6_tnl_parm],
+ [erspan_ver],
+ [OVS_DEFINE([HAVE_IP6_TNL_PARM_ERSPAN_VER])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
+ [SKB_GSO_IPXIP6],
+ [OVS_DEFINE([HAVE_SKB_GSO_IPXIP6])])
+ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/ipv6.h],
+ [ip6_make_flowlabel], [fl6],
+ [OVS_DEFINE([HAVE_IP6_MAKE_FLOWLABEL_FL6])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/net/ipv6.h], [netns_sysctl_ipv6],
+ [auto_flowlabels],
+ [OVS_DEFINE([HAVE_NETNS_SYSCTL_IPV6_AUTO_FLOWLABELS])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h],
+ [netif_keep_dst],
+ [OVS_DEFINE([HAVE_NETIF_KEEP_DST])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device_ops],
+ [ndo_get_iflink],
+ [OVS_DEFINE([HAVE_NDO_GET_IFLINK])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
+ [skb_set_inner_ipproto],
+ [OVS_DEFINE([HAVE_SKB_SET_INNER_IPPROTO])])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [tunnel_encap_types],
+ [OVS_DEFINE([HAVE_TUNNEL_ENCAP_TYPES])])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_IPTUN_ENCAP_TYPE],
+ [OVS_DEFINE([HAVE_IFLA_IPTUN_ENCAP_TYPE])])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_IPTUN_COLLECT_METADATA],
+ [OVS_DEFINE([HAVE_IFLA_IPTUN_COLLECT_METADATA])])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_ENCAP_DPORT])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_COLLECT_METADATA])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_IGNORE_DF])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_FWMARK])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_ERSPAN_INDEX])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_GRE_ERSPAN_HWID])
+ OVS_GREP_IFELSE([$KSRC/include/uapi/linux/if_tunnel.h],
+ [IFLA_IPTUN_FWMARK])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/skbuff.h], [sk_buff],
+ [csum_valid],
+ [OVS_DEFINE([HAVE_SKBUFF_CSUM_VALID])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],
+ [skb_checksum_simple_validate])
+ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h],
+ [void.*ndo_get_stats64],
+ [OVS_DEFINE([HAVE_VOID_NDO_GET_STATS64])])
+ OVS_GREP_IFELSE([$KSRC/include/linux/timer.h], [init_timer_deferrable],
+ [OVS_DEFINE([HAVE_INIT_TIMER_DEFERRABLE])])
+ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/ip_tunnels.h],
+ [ip_tunnel_info_opts_set], [flags],
+ [OVS_DEFINE([HAVE_IP_TUNNEL_INFO_OPTS_SET_FLAGS])])
+ OVS_FIND_FIELD_IFELSE([$KSRC/include/net/inet_frag.h], [inet_frags],
+ [rnd],
+ [OVS_DEFINE([HAVE_INET_FRAGS_RND])])
if cmp -s datapath/linux/kcompat.h.new \
datapath/linux/kcompat.h >/dev/null 2>&1; then
fi
])
-dnl Checks for net/if_packet.h.
-AC_DEFUN([OVS_CHECK_IF_PACKET],
- [AC_CHECK_HEADER([net/if_packet.h],
- [HAVE_IF_PACKET=yes],
- [HAVE_IF_PACKET=no])
- AM_CONDITIONAL([HAVE_IF_PACKET], [test "$HAVE_IF_PACKET" = yes])
- if test "$HAVE_IF_PACKET" = yes; then
- AC_DEFINE([HAVE_IF_PACKET], [1],
- [Define to 1 if net/if_packet.h is available.])
- fi])
-
dnl Checks for net/if_dl.h.
dnl
dnl (We use this as a proxy for checking whether we're building on FreeBSD
dnl gcc: unrecognized option '-Qunused-arguments'
dnl 0
dnl %
- CFLAGS="$CFLAGS $WERROR $1"
+ dnl
+ dnl In addition, GCC does not complain about a -Wno-<foo> option that
+ dnl it does not understand, unless it has another error to report, so
+ dnl instead of testing for -Wno-<foo>, test for the positive version.
+ CFLAGS="$CFLAGS $WERROR m4_bpatsubst([$1], [-Wno-], [-W])"
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([int x;])],
[if test -s conftest.err && grep "unrecognized option" conftest.err
: ${SPARSE=sparse}
AC_SUBST([SPARSE])
AC_CONFIG_COMMANDS_PRE(
- [CC='$(if $(C),env REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS) $(SPARSE_EXTRA_INCLUDES) " cgcc $(CGCCFLAGS),'"$CC"')'])])
+ [CC='$(if $(C:0=),env REAL_CC="'"$CC"'" CHECK="$(SPARSE) $(SPARSE_WERROR) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS) $(SPARSE_EXTRA_INCLUDES) " cgcc $(CGCCFLAGS),'"$CC"')'])
+
+ AC_ARG_ENABLE(
+ [sparse],
+ [AC_HELP_STRING([--enable-sparse], [Run "sparse" by default])],
+ [], [enable_sparse=no])
+ AM_CONDITIONAL([ENABLE_SPARSE_BY_DEFAULT], [test $enable_sparse = yes])])
dnl OVS_CTAGS_IDENTIFIERS
dnl
projects / ovs.git / blobdiff