Skip to content

Commit

Permalink
confifugre: Fix broken sed calls in shell code.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
  • Loading branch information
Alin Serdean authored and blp committed Dec 14, 2015
1 parent 8d70a86 commit aca8be3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions m4/openvswitch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aca8be3

Please sign in to comment.