762f9ef3d9
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
66 lines
1.8 KiB
C
66 lines
1.8 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License, Version 1.0 only
|
|
* (the "License"). You may not use this file except in compliance
|
|
* with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*
|
|
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*
|
|
* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
|
|
* All Rights Reserved
|
|
*
|
|
* Portions of this source code were derived from Berkeley 4.3 BSD
|
|
* under license from the Regents of the University of California.
|
|
*/
|
|
|
|
#ifndef LIBSPL_RPC_XDR_H
|
|
#define LIBSPL_RPC_XDR_H
|
|
|
|
#include_next <rpc/xdr.h>
|
|
|
|
#ifdef xdr_control /* if e.g. using tirpc */
|
|
#undef xdr_control
|
|
#endif
|
|
|
|
#define XDR_GET_BYTES_AVAIL 1
|
|
|
|
typedef struct xdr_bytesrec {
|
|
bool_t xc_is_last_record;
|
|
size_t xc_num_avail;
|
|
} xdr_bytesrec_t;
|
|
|
|
/*
|
|
* This functionality is not required and is disabled in user space.
|
|
*/
|
|
static inline bool_t
|
|
xdr_control(XDR *xdrs, int request, void *info)
|
|
{
|
|
xdr_bytesrec_t *xptr;
|
|
|
|
ASSERT3U(request, ==, XDR_GET_BYTES_AVAIL);
|
|
|
|
xptr = (xdr_bytesrec_t *)info;
|
|
xptr->xc_is_last_record = TRUE;
|
|
xptr->xc_num_avail = xdrs->x_handy;
|
|
|
|
return (TRUE);
|
|
}
|
|
|
|
#endif /* LIBSPL_RPC_XDR_H */
|