git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-openflowd: Remove documentation for obsolete --mgmt-id option.
[sliver-openvswitch.git]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index
e38676f
..
23097b2
100644
(file)
--- 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"`
[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.
# 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
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
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
])
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
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_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
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