c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: better libtirpc detection

Browse Source 
Improve the autoconf code for finding libtirpc and do not assume the
headers are in /usr/include/tirpc.

Also remove this assumption from the `rpc/xdr.h` header in libspl and
use the same `#include_next` mechanism that is used for other libspl
headers.

Include pkg.m4 from pkg-config in config/ for PKG_CHECK_MODULES(), the
file license allows this.

Include ax_save_flags.m4 and ax_restore_flags.m4 from autoconf-archive,
the file licenses are compatible. Use the 2012 versions so as not rely
on a more recent autoconf feature AS_VAR_COPY(), which breaks some build
slaves.

Add new macro library `config/find_system_library.m4` which defines the
FIND_SYSTEM_LIBRARY() macro which is a convenience wrapper over using
PKG_CHECK_MODULES() with a fallback to standard library locations and
some sanity checks.

The parameters are:

```
FIND_SYSTEM_LIBRARY(VARIABLE-PREFIX, MODULE, HEADER, HEADER-PREFIXES,
    LIBRARY, FUNCTIONS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
```

`HEADER-PREFIXES` and `FUNCTIONS` are comma-separated m4 lists.

For libtirpc we are using:

```
FIND_SYSTEM_LIBRARY(LIBTIRPC, [libtirpc], [rpc/xdr.h], [tirpc], [tirpc],
    [xdrmem_create], [], [...])
```

The headers are first checked for without the prefixes and then with.

This system works with pkg-config and falls back on checking standard
header/library locations, it can be easily overridden by the user by
setting the `PREFIX_CFLAGS` and `PREFIX_LIBS` variables which are
automatically added to the `./configure --help` output.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Closes #7422 
Closes #8313
This commit is contained in:
Rafael Kitover
2019-03-02 16:19:05 -08:00
committed by Brian Behlendorf
parent 0409679d88
commit 762f9ef3d9
9 changed files with 437 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/include/rpc/xdr.h
+2 -11
View File
@@ -32,21 +32,12 @@
#ifndef LIBSPL_RPC_XDR_H
#define LIBSPL_RPC_XDR_H
/*
* When available prefer libtirpc for xdr functionality. This library is
* mandatory when compiling with musl libc because it does not provide xdr.
*/
#if defined(HAVE_LIBTIRPC)
#include_next <rpc/xdr.h>
#include <tirpc/rpc/xdr.h>
#ifdef xdr_control
#ifdef xdr_control /* if e.g. using tirpc */
#undef xdr_control
#endif
#else
#include_next <rpc/xdr.h>
#endif /* HAVE_LIBTIRPC */
#define XDR_GET_BYTES_AVAIL 1
typedef struct xdr_bytesrec {