[KBUILD26="$withval"], [KBUILD26=])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.
AC_ERROR([Linux kernel in build tree $KBUILD26 (source tree $KSRC26) is not version 2.6])
fi
fi
- if ! test -e "$KBUILD26"/include/linux/version.h || \
- ! test -e "$KBUILD26"/include/linux/autoconf.h; then
+ if test ! -e "$KBUILD26"/include/linux/version.h || \
+ (test ! -e "$KBUILD26"/include/linux/autoconf.h && \
+ test ! -e "$KBUILD26"/include/generated/autoconf.h); then
AC_MSG_ERROR([Linux kernel source in $KBUILD26 is not configured])
fi
OVS_CHECK_LINUX26_COMPAT
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
[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])])
# 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
[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
char *token1, *token2;
token1 = strtok_r(string, ":", &save_ptr);
token2 = strtok_r(NULL, ":", &save_ptr);
+ freopen ("/dev/null", "w", stdout);
printf ("%s %s\n", token1, token2);
return 0;
]])],
AC_DEFUN([OVS_ENABLE_OPTION],
[OVS_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"])
AC_SUBST([WARNING_FLAGS])])
+
+dnl OVS_CONDITIONAL_CC_OPTION([OPTION], [CONDITIONAL])
+dnl Check whether the given C compiler OPTION is accepted.
+dnl If so, enable the given Automake CONDITIONAL.
+
+dnl Example: OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED])
+AC_DEFUN([OVS_CONDITIONAL_CC_OPTION],
+ [OVS_CHECK_CC_OPTION(
+ [$1], [ovs_have_cc_option=yes], [ovs_have_cc_option=no])
+ AM_CONDITIONAL([$2], [test $ovs_have_cc_option = yes])])
dnl ----------------------------------------------------------------------