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
# 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])
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")
])
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_LOG2_H], [
AC_MSG_CHECKING([for $KSRC26/include/linux/log2.h])
if test -e $KSRC26/include/linux/log2.h; then
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/include/linux/string.h $KSRC26/include/linux/slab.h],
- [kmemdup], [OVS_DEFINE([HAVE_KMEMDUP])])
- OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro],
- [OVS_DEFINE([HAVE_SKB_WARN_LRO])])
+
+ OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro],
+ [OVS_DEFINE([HAVE_DEV_DISABLE_LRO])])
+ OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats],
+ [OVS_DEFINE([HAVE_DEV_GET_STATS])])
+
# 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
# 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_DEFINE([HAVE_SKB_COPY_FROM_LINEAR_DATA_OFFSET])])
+ OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head],
+ [OVS_DEFINE([HAVE_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/skbuff.h], [skb_warn_if_lro],
+ [OVS_DEFINE([HAVE_SKB_WARN_LRO])])
+
+ OVS_GREP_IFELSE([$KSRC26/include/linux/string.h $KSRC26/include/linux/slab.h],
+ [kmemdup], [OVS_DEFINE([HAVE_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_unfold],
+ [OVS_DEFINE([HAVE_CSUM_UNFOLD])])
+
+ OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING],
+ [OVS_DEFINE([HAVE_NLA_NUL_STRING])])
+ OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16],
+ [OVS_DEFINE([HAVE_NLA_GET_BE16])])
+
OVS_CHECK_LOG2_H
- OVS_CHECK_VETH
+
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
git://git.onelab.eu / sliver-openvswitch.git / blobdiff