diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2012-12-07 12:37:02 +0900 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2012-12-07 10:23:15 -0800 |
| commit | 2520f4528742decf78a8b375f5389b50977f5e4b (patch) | |
| tree | 74ae93191004d1e2056c8ab2cd70785dc2d18e99 /acinclude.m4 | |
| parent | b411e5c35132f61cc1fd99dbeb1ed3f859d6f5ac (diff) | |
linux/Makefile.main.in, acinclude: preparation for linux 3.7.0+
The version.h is moved from include/linux/version.h to
include/generated/uapi/linux/version.h.
So check both pathes.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d502b000..02dc9525 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -144,7 +144,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [ AC_ERROR([Linux kernel in build tree $KBUILD (source tree $KSRC) is version $kversion, but version 2.6 or later is required]) fi fi - if test ! -e "$KBUILD"/include/linux/version.h || \ + if (test ! -e "$KBUILD"/include/linux/version.h && \ + test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \ (test ! -e "$KBUILD"/include/linux/autoconf.h && \ test ! -e "$KBUILD"/include/generated/autoconf.h); then AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured]) |