xenserver: Ensure that Bridge.other-config:hwaddr and Interface.MAC are set as approp...

[openvswitch] / datapath / linux-2.6 / Makefile.main.in

diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux-2.6/Makefile.main.in
index 967e2f7bcff1953fffbcb3d5c1e3c2ebdbc3b2f1..cb2a042909daf4478b74aa4cd951d5038a18a355 100644 (file)
--- a/datapath/linux-2.6/Makefile.main.in
+++ b/datapath/linux-2.6/Makefile.main.in
@@ -5,6 +5,7 @@ export top_srcdir = @abs_top_srcdir@
 export KSRC = @KBUILD26@
 export VERSION = @VERSION@
 export BUILD_VETH = @BUILD_VETH@
+export BUILD_GRE = @BUILD_GRE@
 
 include $(srcdir)/../Modules.mk
 include $(srcdir)/Modules.mk
@@ -41,9 +42,12 @@ ifeq (,$(wildcard $(VERSION_FILE)))
   $(error Linux kernel source not configured - missing version.h)
 endif
 
-CONFIG_FILE := $(KSRC)/include/linux/autoconf.h
+CONFIG_FILE := $(KSRC)/include/generated/autoconf.h
 ifeq (,$(wildcard $(CONFIG_FILE)))
-  $(error Linux kernel source not configured - missing autoconf.h)
+  CONFIG_FILE := $(KSRC)/include/linux/autoconf.h
+  ifeq (,$(wildcard $(CONFIG_FILE)))
+    $(error Linux kernel source not configured - missing autoconf.h)
+  endif
 endif
 
 default: