File 0001-Use-pkg-config-for-rpc-library-detection.p... of Package libsigrok

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-pkg-config-for-rpc-library-detection.patch of Package libsigrok (Revision d4fa7164af601fc68bceb555db2ee1ed)

Currently displaying revision d4fa7164af601fc68bceb555db2ee1ed , Show latest

From 0efe71d10402096dc013188fce5fb6bd5dc33d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 29 Dec 2019 16:19:41 +0100
Subject: [PATCH] Use pkg-config for rpc library detection

The old SunRPC was removed with glibc 2.26, and libtirpc should be used
instead. As RPC is implemented in a separate library the lib has to be
added to linker flags as well (otherwise the linking during configure
already fails). Instead of rolling our own autoconf macros, use
pkg-config instead.
---
 configure.ac | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c42cf3b..6d5a28ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,15 +186,9 @@ AS_CASE([$host_os], [mingw*], [SR_PREPEND([SR_EXTRA_LIBS], [-lws2_32])])
 SR_SEARCH_LIBS([SR_EXTRA_LIBS], [pow], [m])
 
 # RPC is only needed for VXI support.
-AC_CACHE_CHECK([for RPC support], [sr_cv_have_rpc],
-	[AC_LINK_IFELSE([AC_LANG_PROGRAM(
-			[[#include <rpc/rpc.h>]m4_newline[CLIENT *rpc_test(void);]],
-			[[(void) clnt_create("", 0, 0, "");]])],
-		[sr_cv_have_rpc=yes], [sr_cv_have_rpc=no])])
-AS_IF([test "x$sr_cv_have_rpc" = xyes],
-	[AC_DEFINE([HAVE_RPC], [1], [Specifies whether we have RPC support.])])
+SR_ARG_OPT_PKG([rpc], [RPC], , [libtirpc])
 # VXI support is only compiled if RPC support was found.
-AM_CONDITIONAL([NEED_RPC], [test "x$sr_cv_have_rpc" = xyes])
+AM_CONDITIONAL([NEED_RPC], [test "x$sr_have_rpc" = xyes])
 
 # Check for compiler support of 128 bit integers
 AC_CHECK_TYPES([__int128_t, __uint128_t], [], [], [])
@@ -644,7 +638,7 @@ Enabled serial communication transports:
 
 Enabled SCPI backends:
  - TCP............................. yes
- - RPC............................. $sr_cv_have_rpc
+ - RPC/VXI11....................... $sr_have_rpc
  - serial.......................... $sr_have_serial_comm
  - VISA............................ $sr_have_librevisa
  - GPIB............................ $sr_have_libgpib
-- 
2.24.1

Places

File 0001-Use-pkg-config-for-rpc-library-detection.patch of Package libsigrok (Revision d4fa7164af601fc68bceb555db2ee1ed)

Places