diff options
| author | Alin Serdean <aserdean@cloudbasesolutions.com> | 2015-12-10 22:18:51 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2015-12-14 04:28:15 -0800 |
| commit | aca8be36a2aba3dccd48c1ad91ff8ea7e9249761 (patch) | |
| tree | ce54ba95312dbe07b658c368f98a30f3b367ab81 /m4 | |
| parent | 8d70a861c26d8500045048991982c76b3749f64a (diff) | |
| download | openvswitch-aca8be36a2aba3dccd48c1ad91ff8ea7e9249761.tar.gz | |
confifugre: Fix broken sed calls in shell code.
Commit 43000bc (openvswitch.m4: Portability improvement), which introduced
a portability improvement, also introduces two bugs. This commit fixes
both bug, by adding the command for $SED 's' and changes to x86 for 32 bit
instead of x64.
Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 683a6a7d6..0cfaae69c 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -109,11 +109,11 @@ AC_DEFUN([OVS_CHECK_WIN32], fi if test "$cl_cv_x64" = yes; then PTHREAD_WIN32_DIR=$withval/lib/x64 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e '/://')/dll/x64 + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x64 PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x64 else PTHREAD_WIN32_DIR=$withval/lib/x86 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e '/://')/dll/x64 + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x86 PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x86 fi PTHREAD_INCLUDES=-I$withval/include |