]> git.proxmox.com Git - mirror_zfs.git/commit
config: better libtirpc detection
authorRafael Kitover <rkitover@gmail.com>
Sun, 3 Mar 2019 00:19:05 +0000 (16:19 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 3 Mar 2019 00:19:05 +0000 (16:19 -0800)
commit762f9ef3d9d897b5baf7c91d6e8a7bf371a9b02f
treef7a62c6fc76497d7724aaec5f5b93191fa525a52
parent0409679d88a8ccd06397ceae1b6d08935198c756
config: better libtirpc detection

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
config/ax_restore_flags.m4 [new file with mode: 0644]
config/ax_save_flags.m4 [new file with mode: 0644]
config/find_system_library.m4 [new file with mode: 0644]
config/pkg.m4 [new file with mode: 0644]
config/user-libtirpc.m4
configure.ac
lib/libnvpair/Makefile.am
lib/libspl/Makefile.am
lib/libspl/include/rpc/xdr.h