diff options
| author | Alin Gabriel Serdean <aserdean@ovn.org> | 2018-03-06 13:01:00 +0200 |
|---|---|---|
| committer | Alin Gabriel Serdean <aserdean@ovn.org> | 2018-03-08 04:11:07 +0200 |
| commit | d1309588dd3ba914a625690ec226d27d24b9aef3 (patch) | |
| tree | 13f92d39726fef9ba73a17f107d821e0e7e88060 /m4 | |
| parent | 593e93e5fff692fff412035b00a2299bfb3c1598 (diff) | |
| download | openvswitch-d1309588dd3ba914a625690ec226d27d24b9aef3.tar.gz | |
tests-windows: Add OpenSSL directory to autotest path
Running OpenSSL unit tests without it already being included in library path
revealed a problem: the AUTOTEST_PATH does not include it.
This patch adds a new variable `SSL_DIR` which will be added in AUTOTEST_PATH.
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_check_openssl.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 index 7846fb071..281d4dc65 100644 --- a/m4/ax_check_openssl.m4 +++ b/m4/ax_check_openssl.m4 @@ -14,6 +14,7 @@ # SSL_INCLUDES to the include directives required # SSL_LIBS to the -l directives required # SSL_LDFLAGS to the -L or -R flags required +# SSL_DIR to add it to various paths # # and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately # @@ -81,8 +82,10 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ SSL_LDFLAGS="-L$ssldir/lib" if test "$WIN32" = "yes"; then SSL_LIBS="-lssleay32 -llibeay32" + SSL_DIR=/$(echo ${ssldir} | ${SED} -e 's/://') else SSL_LIBS="-lssl -lcrypto" + SSL_DIR="$ssldir" fi found=true AC_MSG_RESULT([yes]) @@ -126,4 +129,5 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ AC_SUBST([SSL_INCLUDES]) AC_SUBST([SSL_LIBS]) AC_SUBST([SSL_LDFLAGS]) + AC_SUBST([SSL_DIR]) ]) |