X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=m4%2Fopenvswitch.m4;h=bdb8b1980f9b096361246f8ebe3df8ba1b686411;hb=a6057323869de5b323d1c75e678b6a0fe0e8addd;hp=6f30792772f6b7f9a32bba1643ca59b63caa726f;hpb=d27ce5292c63d864dfa727e061f63b06ca770e19;p=openvswitch

diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index 6f307927..bdb8b198 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -81,17 +81,18 @@ AC_DEFUN([OVS_CHECK_OPENSSL],
      [ssl=false])
 
    if test "$ssl" = true; then
-   dnl Make sure that pkg-config is installed.
-   m4_pattern_forbid([PKG_CHECK_MODULES])
-   PKG_CHECK_MODULES([SSL], [libssl], 
-     [HAVE_OPENSSL=yes],
-     [HAVE_OPENSSL=no
-      AC_MSG_WARN([Cannot find libssl:
-
-   $SSL_PKG_ERRORS
+       dnl Make sure that pkg-config is installed.
+       m4_pattern_forbid([PKG_CHECK_MODULES])
+       PKG_CHECK_MODULES([SSL], [libssl], 
+         [HAVE_OPENSSL=yes],
+         [HAVE_OPENSSL=no
+          AC_MSG_WARN([Cannot find libssl:
 
-   OpenFlow connections over SSL will not be supported.])])
+$SSL_PKG_ERRORS
 
+OpenFlow connections over SSL will not be supported.])])
+   else
+       HAVE_OPENSSL=no
    fi
    AC_SUBST([HAVE_OPENSSL])
    AM_CONDITIONAL([HAVE_OPENSSL], [test "$HAVE_OPENSSL" = yes])
@@ -255,7 +256,12 @@ else:
           done
         done
       fi])
+   AC_SUBST([HAVE_PYTHON])
    AM_MISSING_PROG([PYTHON], [python])
    if test $ovs_cv_python != no; then
      PYTHON=$ovs_cv_python
-   fi])
+     HAVE_PYTHON=yes
+   else
+     HAVE_PYTHON=no
+   fi
+   AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes])])