Distribute ovsdb-idlc built sources, so Python is not required for build.

The Xen DDK VM does not include Python, so it's best if we don't have to
require it for the build.

The built sources are still regenerated if necessary.

diff --git a/INSTALL.Linux b/INSTALL.Linux
index 7090ce672e1e331b314a9dd0004fb85a0de77a4c..c0344f23010bdad00857e7010f6e9e8f70f3be56 100644 (file)
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -67,6 +67,8 @@ you will also need the following software:
 
     - pkg-config.  We test with version 0.22.
 
+    - Python 2.x, for x >= 4.
+
 Installation Requirements
 -------------------------
 

diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index b7267438c97127448cea3506ff7505003fea5fd1..ceb10732cfff22f1d0d118ed5c4cf150b9933a56 100644 (file)
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -236,8 +236,7 @@ AC_DEFUN([OVS_CHECK_PCRE],
 
 dnl Checks for Python 2.x, x >= 4.
 AC_DEFUN([OVS_CHECK_PYTHON],
-  [AC_ARG_VAR([PYTHON], [path to Python 2.x])
-   AC_CACHE_CHECK(
+  [AC_CACHE_CHECK(
      [for Python 2.x for x >= 4],
      [ovs_cv_python],
      [if test -n "$PYTHON"; then
@@ -260,4 +259,7 @@ else:
           done
         done
       fi])
-   PYTHON=$ovs_cv_python])
+   AM_MISSING_PROG([PYTHON], [python])
+   if test $ovs_cv_python != no; then
+     PYTHON=$ovs_cv_python
+   fi])

diff --git a/tests/automake.mk b/tests/automake.mk
index 93b187e93c7464036f068f4c91fbad5eaf58ad44..6d383d71bbc73773d8026cbff4bba38184a52c37 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -114,6 +114,7 @@ BUILT_SOURCES += tests/idltest.c tests/idltest.h
 noinst_DATA += tests/idltest.ovsschema
 DISTCLEANFILES += tests/idltest.ovsschema
 tests/idltest.c tests/idltest.h tests/idltest.ovsschema: ovsdb/ovsdb-idlc.in
+EXTRA_DIST += tests/idltest.c tests/idltest.h tests/idltest.ovsschema
 
 noinst_PROGRAMS += tests/test-reconnect
 tests_test_reconnect_SOURCES = tests/test-reconnect.c

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index a36d1ae5ed06ca8ac0ac9fc24f79556175b77890..e7942df7e441303a454da333a18eaf725b4a78f1 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -40,3 +40,4 @@ noinst_DATA += vswitchd/vswitch-idl.ovsschema
 DISTCLEANFILES += vswitchd/vswitch-idl.ovsschema
 vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h vswitchd/vswitch-idl.ovsschema: \
        ovsdb/ovsdb-idlc.in
+EXTRA_DIST += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h vswitchd/vswitch-idl.ovsschema