X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=23097b2e3a04968de230f7630f2ae88783474928;hb=79c9f2ee7883b52860c76c3730725f5731402874;hp=e38676fdc013d35f2c3ae91aa6e00e847acb9b95;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch

diff --git a/acinclude.m4 b/acinclude.m4
index e38676fd..23097b2e 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.
@@ -70,8 +74,9 @@ AC_DEFUN([OVS_CHECK_LINUX26], [
          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
@@ -118,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
@@ -176,7 +171,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