From: Uwe Hermann <redacted>
Date: Thu, 19 May 2016 20:46:24 +0000 (+0200)
Subject: Fix Ruby bindings build on Mac OS X and FreeBSD.
X-Git-Tag: libsigrok-0.5.0~375
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=27272a704d4017ff4abc1c840a221a3f62d1f346;p=libsigrok.git

Fix Ruby bindings build on Mac OS X and FreeBSD.

Using "\s*" on BSD sed doesn't work the same way as on GNU sed, thus
yielding e.g. " 3.0.8" instead of "3.0.8" in a ./configure check, which
later prevents the Ruby bindings from being built.

Fix this by simply using exactly one space in the sed invocation, since
swig seems to always use just one space there anyway.

Tested on Mac OS X, FreeBSD, and Linux.

This closes bug #800.
---

diff --git a/configure.ac b/configure.ac
index e6a719b8..c5089f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes],
 AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0])
 AS_IF([test "x$SWIG" != x],
     AC_MSG_CHECKING([for $SWIG version])
-    [SWIG_VERSION=`$SWIG -version 2>&1 | sed -n 's/SWIG Version\s*//p'`]
+    [SWIG_VERSION=`$SWIG -version 2>&1 | sed -n 's/SWIG Version //p'`]
     AC_MSG_RESULT([$SWIG_VERSION]))
 AS_IF([test "x$SWIG" = x],
 	[SR_APPEND([sr_python_missing], [', '], [SWIG])])