# -*- autoconf -*-
-# Copyright (c) 2008, 2009 Nicira Networks.
+# Copyright (c) 2008, 2009, 2010 Nicira Networks.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
AC_MSG_CHECKING([for Linux 2.6 source directory])
KSRC26=$KBUILD26
if test ! -e $KSRC26/include/linux/kernel.h; then
- KSRC26=`(cd $KBUILD26 && pwd -P) | sed 's,-[[^-]]*$,-common,'`
+ case `echo "$KBUILD26" | sed 's,/*$,,'` in # (
+ */build)
+ KSRC26=`echo "$KBUILD26" | sed 's,/build/*$,/source,'`
+ ;; # (
+ *)
+ KSRC26=`(cd $KBUILD26 && pwd -P) | sed 's,-[[^-]]*$,-common,'`
+ ;;
+ esac
if test ! -e $KSRC26/include/linux/kernel.h; then
AC_MSG_ERROR([cannot find source directory])
fi
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
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_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])])
+ # 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
+ # starts with @). The brackets must be doubled because of m4
+ # quoting rules.
+ OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [[[^@]]proto_data_valid],
+ [OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
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
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)], [ovs_cv_name[]=yes], [ovs_cv_name[]=no])
CFLAGS="$ovs_save_CFLAGS"])
if test $ovs_cv_name = yes; then
- m4_if([$2], [], [;], [$2])
+ m4_if([$2], [], [:], [$2])
else
m4_if([$3], [], [:], [$3])
fi
dnl OVS_ENABLE_OPTION([OPTION])
dnl Check whether the given C compiler OPTION is accepted.
-dnl If so, add it to CFLAGS.
+dnl If so, add it to WARNING_FLAGS.
dnl Example: OVS_ENABLE_OPTION([-Wdeclaration-after-statement])
AC_DEFUN([OVS_ENABLE_OPTION],
- [OVS_CHECK_CC_OPTION([$1], [CFLAGS="$CFLAGS $1"])])
+ [OVS_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"])
+ AC_SUBST([WARNING_FLAGS])])
dnl ----------------------------------------------------------------------