summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorAlin Serdean <aserdean@cloudbasesolutions.com>2015-06-25 15:30:34 +0000
committerBen Pfaff <blp@nicira.com>2015-06-25 08:37:54 -0700
commit3e2e7588135834f8f8bf768719713d395a07a5bc (patch)
treef912e67075125566edcc1579ce447dfc22be3fed /m4
parentc4bb1f8b6e68c78e2a8486d68a4d13c68f8b0a10 (diff)
downloadopenvswitch-3e2e7588135834f8f8bf768719713d395a07a5bc.tar.gz
tests: Reduce user burden for running "make check".
With this commit, users do not have to manually add the pthread-win32 DLL directory to their PATH. Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Co-authored-by: Ben Pfaff <blp@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'm4')
-rw-r--r--m4/openvswitch.m47
1 files changed, 5 insertions, 2 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index f89cde04e..087c7e544 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -86,9 +86,12 @@ AC_DEFUN([OVS_CHECK_WIN32],
AC_MSG_ERROR([Invalid --with-pthread value])
;;
*)
- PTHREAD_INCLUDES="-I$withval/include"
- PTHREAD_LDFLAGS="-L$withval/lib/x86"
+ PTHREAD_WIN32_DIR=$withval/lib/x86
+ PTHREAD_WIN32_DIR_DLL=/${withval/:/}/dll/x86
+ PTHREAD_INCLUDES=-I$withval/include
+ PTHREAD_LDFLAGS=-L$PTHREAD_WIN32_DIR
PTHREAD_LIBS="-lpthreadVC2"
+ AC_SUBST([PTHREAD_WIN32_DIR_DLL])
AC_SUBST([PTHREAD_INCLUDES])
AC_SUBST([PTHREAD_LDFLAGS])
AC_SUBST([PTHREAD_LIBS])