X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a089c9aaa6d8ef6f73f16d7be054564f8709e6cc;hb=6cdb1da6c95d006d423a6e8c9ed7d6580d85bba4;hp=e6a719b8b29e8e205f77691569b50a1320735559;hpb=5a2c71ccd7c46b18583dd068a8508e9d93ed9190;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index e6a719b8..a089c9aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,18 @@ AM_CONDITIONAL([NEED_RPC], [test "x$sr_cv_have_rpc" = xyes])
 # Check for compiler support of 128 bit integers
 AC_CHECK_TYPES([__int128_t, __uint128_t], [], [], [])
 
+# Linker flag to retain the objects of a static lib that are not referenced
+AX_CHECK_LINK_FLAG([-Wl,--whole-archive -Wl,--no-whole-archive],
+                   [SR_LINK_BEFORE_LIB=-Wl,--whole-archive
+                    SR_LINK_AFTER_LIB=-Wl,--no-whole-archive], [
+AX_CHECK_LINK_FLAG([-Wl,-force_load],
+                   [SR_LINK_BEFORE_LIB=-Wl,-force_load
+                    SR_LINK_AFTER_LIB=],
+                   [SR_LINK_BEFORE_LIB=
+                    SR_LINK_AFTER_LIB=])])
+AC_SUBST(SR_LINK_BEFORE_LIB)
+AC_SUBST(SR_LINK_AFTER_LIB)
+
 ########################
 ##  Hardware drivers  ##
 ########################
@@ -395,7 +407,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])])