X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=64384d90fb4ba69234a7c5727b6e66e15c5e4abe;hb=836fad5e1ae4316752150fcdfba9afbf8d5f5801;hp=abbc57e61c83e0bce84b77a7fcd3345edd30d7df;hpb=e0510a6c9b4b82b90ccf564368c1bbdcfdeb7410;p=openvswitch

diff --git a/acinclude.m4 b/acinclude.m4
index abbc57e6..64384d90 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,6 +24,10 @@ AC_DEFUN([OVS_CHECK_LINUX26], [
               [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.
@@ -119,16 +123,6 @@ AC_DEFUN([OVS_CHECK_VETH], [
   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
@@ -168,6 +162,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
                   [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])])
   # 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
@@ -177,7 +173,6 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
                   [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