projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Add rtnl_is_locked compatibility function.
[openvswitch]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index e38676fdc013d35f2c3ae91aa6e00e847acb9b95..81e9948807f765afce9e2e1870e59eb880b67a2d 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