bridge: Ignore "null" interfaces as required.

[openvswitch] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 1628ea55be8802e4824a84c5e930225cd2a7942a..1d37b59a74aa18096cd461bdf54f4ad88a552aee 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,23 @@
 # -*- shell-script -*-
 HAVE_OPENSSL='@HAVE_OPENSSL@'
-HAVE_PCRE='@HAVE_PCRE@'
 HAVE_PYTHON='@HAVE_PYTHON@'
 PERL='@PERL@'
-PYTHON='@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