ofproto: Add support for OF1.3 port description multipart message.

[openvswitch] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index f1c045766e331f43dd560b8eee980ebe364153be..1d37b59a74aa18096cd461bdf54f4ad88a552aee 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,7 +2,22 @@
 HAVE_OPENSSL='@HAVE_OPENSSL@'
 HAVE_PYTHON='@HAVE_PYTHON@'
 PERL='@PERL@'
-PYTHON='@PYTHON@'
 
-PYTHONPATH=$PYTHONPATH:$abs_top_srcdir/python
+if test x"$PYTHON" = x; then
+    PYTHON='@PYTHON@'
+fi
+
+PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH
 export PYTHONPATH
+
+PYTHONIOENCODING=utf_8
+export PYTHONIOENCODING
+
+if test $HAVE_PYTHON = yes; then
+    if python -m argparse 2>/dev/null; then
+        :
+    else
+        PYTHONPATH=$PYTHONPATH:$abs_top_srcdir/python/compat
+        export PYTHONPATH
+    fi
+fi