X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=fa6f534deb3cfa4f1f276a7cc77ca0a67083c643;hb=refs%2Fheads%2Fbranch-1.1;hp=abbc57e61c83e0bce84b77a7fcd3345edd30d7df;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index abbc57e61..fa6f534de 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ # -*- autoconf -*- -# Copyright (c) 2008, 2009, 2010 Nicira Networks. +# Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,10 +20,20 @@ dnl Configure linux kernel source tree AC_DEFUN([OVS_CHECK_LINUX26], [ AC_ARG_WITH([l26], [AC_HELP_STRING([--with-l26=/path/to/linux-2.6], - [Specify the linux 2.6 kernel sources])], + [Specify the linux 2.6 kernel build directory])], [KBUILD26="$withval"], [KBUILD26=])dnl + AC_ARG_WITH([l26-source], + [AC_HELP_STRING([--with-l26-source=/path/to/linux-2.6-source], + [Specify the linux 2.6 kernel source directory + (usually figured out automatically from build + directory)])], + [KSRC26="$withval"], [KSRC26=])dnl if test -n "$KBUILD26"; then KBUILD26=`eval echo "$KBUILD26"` + case $KBUILD26 in + /*) ;; + *) KBUILD26=`pwd`/$KBUILD26 ;; + esac # The build directory is what the user provided. # Make sure that it exists. @@ -40,18 +50,29 @@ AC_DEFUN([OVS_CHECK_LINUX26], [ # We want the source headers, but $KBUILD26 gives us the "build" headers. # Use heuristics to find the source headers. AC_MSG_CHECKING([for Linux 2.6 source directory]) - KSRC26=$KBUILD26 - if test ! -e $KSRC26/include/linux/kernel.h; then - case `echo "$KBUILD26" | sed 's,/*$,,'` in # ( - */build) - KSRC26=`echo "$KBUILD26" | sed 's,/build/*$,/source,'` - ;; # ( - *) - KSRC26=`(cd $KBUILD26 && pwd -P) | sed 's,-[[^-]]*$,-common,'` - ;; + if test -n "$KSRC26"; then + KSRC26=`eval echo "$KSRC26"` + case $KSRC26 in + /*) ;; + *) KSRC26=`pwd`/$KSRC26 ;; esac if test ! -e $KSRC26/include/linux/kernel.h; then - AC_MSG_ERROR([cannot find source directory]) + AC_MSG_ERROR([$KSRC26 is not a kernel source directory)]) + fi + else + KSRC26=$KBUILD26 + if test ! -e $KSRC26/include/linux/kernel.h; then + case `echo "$KBUILD26" | sed 's,/*$,,'` in # ( + */build) + KSRC26=`echo "$KBUILD26" | sed 's,/build/*$,/source,'` + ;; # ( + *) + KSRC26=`(cd $KBUILD26 && pwd -P) | sed 's,-[[^-]]*$,-common,'` + ;; + esac + fi + if test ! -e $KSRC26/include/linux/kernel.h; then + AC_MSG_ERROR([cannot find source directory (please use --with-l26-source)]) fi fi AC_MSG_RESULT([$KSRC26]) @@ -76,30 +97,39 @@ AC_DEFUN([OVS_CHECK_LINUX26], [ AC_MSG_ERROR([Linux kernel source in $KBUILD26 is not configured]) fi OVS_CHECK_LINUX26_COMPAT + elif test -n "$KSRC26"; then + AC_MSG_ERROR([--with-l26-source may not be specified without --with-l26]) fi AM_CONDITIONAL(L26_ENABLED, test -n "$KBUILD26") ]) -dnl OVS_GREP_IFELSE(FILE, REGEX, IF-MATCH, IF-NO-MATCH) +dnl OVS_GREP_IFELSE(FILE, REGEX, [IF-MATCH], [IF-NO-MATCH]) dnl dnl Greps FILE for REGEX. If it matches, runs IF-MATCH, otherwise IF-NO-MATCH. +dnl If IF-MATCH is empty then it defines to OVS_DEFINE(HAVE_), with +dnl translated to uppercase. AC_DEFUN([OVS_GREP_IFELSE], [ AC_MSG_CHECKING([whether $2 matches in $1]) - grep '$2' $1 >/dev/null 2>&1 - status=$? - case $status in - 0) - AC_MSG_RESULT([yes]) - $3 - ;; - 1) - AC_MSG_RESULT([no]) - $4 - ;; - *) - AC_MSG_ERROR([grep exited with status $status]) - ;; - esac + if test -f $1; then + grep '$2' $1 >/dev/null 2>&1 + status=$? + case $status in + 0) + AC_MSG_RESULT([yes]) + m4_if([$3], [], [OVS_DEFINE([HAVE_]m4_toupper([$2]))], [$3]) + ;; + 1) + AC_MSG_RESULT([no]) + $4 + ;; + *) + AC_MSG_ERROR([grep exited with status $status]) + ;; + esac + else + AC_MSG_RESULT([file not found]) + $4 + fi ]) dnl OVS_DEFINE(NAME) @@ -109,26 +139,6 @@ AC_DEFUN([OVS_DEFINE], [ echo '#define $1 1' >> datapath/linux-2.6/kcompat.h.new ]) -AC_DEFUN([OVS_CHECK_VETH], [ - AC_MSG_CHECKING([whether to build veth module]) - if test "$sublevel" = 18; then - AC_MSG_RESULT([yes]) - AC_SUBST([BUILD_VETH], 1) - else - AC_MSG_RESULT([no]) - fi -]) - -AC_DEFUN([OVS_CHECK_GRE], [ - AC_MSG_CHECKING([whether to build gre module]) - if test "$sublevel" -ge 18; then - AC_MSG_RESULT([yes]) - AC_SUBST([BUILD_GRE], 1) - else - AC_MSG_RESULT([no]) - fi -]) - AC_DEFUN([OVS_CHECK_LOG2_H], [ AC_MSG_CHECKING([for $KSRC26/include/linux/log2.h]) if test -e $KSRC26/include/linux/log2.h; then @@ -147,27 +157,22 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ rm -f datapath/linux-2.6/kcompat.h.new mkdir -p datapath/linux-2.6 : > datapath/linux-2.6/kcompat.h.new - OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [bool], - [OVS_DEFINE([HAVE_BOOL_TYPE])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header], - [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [raw], - [OVS_DEFINE([HAVE_MAC_RAW])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], - [skb_copy_from_linear_data_offset], - [OVS_DEFINE([HAVE_SKB_COPY_FROM_LINEAR_DATA_OFFSET])]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING], - [OVS_DEFINE([HAVE_NLA_NUL_STRING])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST], - [OVS_DEFINE([HAVE_ERR_CAST])]) - OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold], - [OVS_DEFINE([HAVE_CSUM_UNFOLD])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow], - [OVS_DEFINE([HAVE_SKB_COW])]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16], - [OVS_DEFINE([HAVE_NLA_GET_BE16])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/in.h], [ipv4_is_multicast], - [OVS_DEFINE([HAVE_IPV4_IS_MULTICAST])]) + + OVS_GREP_IFELSE([$KSRC26/arch/x86/include/asm/checksum_32.h], [src_err,], + [OVS_DEFINE([HAVE_CSUM_COPY_DBG])]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/in.h], [ipv4_is_multicast]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro]) + OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats]) + OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_by_index_rcu]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/rcupdate.h], [rcu_read_lock_held], [], + [OVS_GREP_IFELSE([$KSRC26/include/linux/rtnetlink.h], + [rcu_read_lock_held])]) + # Check for the proto_data_valid member in struct sk_buff. The [^@] # is necessary because some versions of this header remove the # member but retain the kerneldoc comment that describes it (which @@ -175,9 +180,42 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ # quoting rules. OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [[[^@]]proto_data_valid], [OVS_DEFINE([HAVE_PROTO_DATA_VALID])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [raw], + [OVS_DEFINE([HAVE_MAC_RAW])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_dst(], + [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], + [skb_copy_from_linear_data_offset]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header], + [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/icmpv6.h], [icmp6_hdr], + [OVS_DEFINE([HAVE_ICMP6_HDR])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro], + [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/string.h], [kmemdup], [], + [OVS_GREP_IFELSE([$KSRC26/include/linux/slab.h], [kmemdup])]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [bool], + [OVS_DEFINE([HAVE_BOOL_TYPE])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [__wsum], + [OVS_DEFINE([HAVE_CSUM_TYPES])]) + + OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_replace4]) + OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold]) + + OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING]) + OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16]) + OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_find_nested]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/if_link.h], [rtnl_link_stats64]) + + OVS_GREP_IFELSE([$KSRC26/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD], + [OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])]) + OVS_CHECK_LOG2_H - OVS_CHECK_VETH - OVS_CHECK_GRE + if cmp -s datapath/linux-2.6/kcompat.h.new \ datapath/linux-2.6/kcompat.h >/dev/null 2>&1; then rm datapath/linux-2.6/kcompat.h.new @@ -272,3 +310,29 @@ AC_DEFUN([OVS_CONDITIONAL_CC_OPTION], [$1], [ovs_have_cc_option=yes], [ovs_have_cc_option=no]) AM_CONDITIONAL([$2], [test $ovs_have_cc_option = yes])]) dnl ---------------------------------------------------------------------- + +dnl Check for too-old XenServer. +AC_DEFUN([OVS_CHECK_XENSERVER_VERSION], + [AC_CACHE_CHECK([XenServer release], [ovs_cv_xsversion], + [if test -e /etc/redhat-release; then + ovs_cv_xsversion=`sed -n 's/^XenServer DDK release \([[^-]]*\)-.*/\1/p' /etc/redhat-release` + fi + if test -z "$ovs_cv_xsversion"; then + ovs_cv_xsversion=none + fi]) + case $ovs_cv_xsversion in + none) + ;; + + [[1-9]][[0-9]]* | dnl XenServer 10 or later + [[6-9]]* | dnl XenServer 6 or later + 5.[[7-9]]* | dnl XenServer 5.7 or later + 5.6.[[1-9]][[0-9]][[0-9]][[0-9]]* | dnl XenServer 5.6.1000 or later + 5.6.[[2-9]][[0-9]][[0-9]]* | dnl XenServer 5.6.200 or later + 5.6.1[[0-9]][[0-9]]) dnl Xenserver 5.6.100 or later + ;; + + *) + AC_MSG_ERROR([This appears to be XenServer $ovs_cv_xsversion, but only XenServer 5.6.100 or later is supported. (If you are really using a supported version of XenServer, you may override this error message by specifying 'ovs_cv_xsversion=5.6.100' on the "configure" command line.)]) + ;; + esac])