Spruce up pkg-config files for libzfs/libzfs_core
Several of the listed library dependencies are not relevant on FreeBSD. Have ./configure save libraries that are found via pkg-config as ${LIB}_PC and use the configured automake variables instead of hard coded names so we only get what was actually needed. While here, update the URL to point at the OpenZFS Github repo. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #10869
This commit is contained in:
parent
3ec88ab205
commit
ef55446a9c
|
@ -11,10 +11,12 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [
|
|||
|
||||
_header_found=
|
||||
_library_found=
|
||||
_pc_found=
|
||||
|
||||
AS_IF([test -n "$2"], [PKG_CHECK_MODULES([$1], [$2], [
|
||||
_header_found=1
|
||||
_library_found=1
|
||||
_pc_found=1
|
||||
], [:])])
|
||||
|
||||
# set _header_found/_library_found if the user passed in CFLAGS/LIBS
|
||||
|
@ -82,6 +84,9 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [
|
|||
AS_IF([test "x$_header_found" = "x1" && test "x$_library_found" = "x1"], [
|
||||
AC_SUBST([$1]_CFLAGS)
|
||||
AC_SUBST([$1]_LIBS)
|
||||
AS_IF([test "x$_pc_found" = "x1"], [
|
||||
AC_SUBST([$1]_PC, [$2])
|
||||
])
|
||||
AC_DEFINE([HAVE_][$1], [1], [Define if you have [$5]])
|
||||
$7
|
||||
],[dnl ELSE
|
||||
|
|
|
@ -6,9 +6,9 @@ includedir=@includedir@
|
|||
Name: libzfs
|
||||
Description: LibZFS library
|
||||
Version: @VERSION@
|
||||
URL: https://zfsonlinux.org
|
||||
URL: https://github.com/openzfs/zfs
|
||||
Requires: libzfs_core
|
||||
Requires.private: libcrypto zlib
|
||||
Requires.private: @LIBCRYPTO_PC@ @ZLIB_PC@
|
||||
Cflags: -I${includedir}/libzfs -I${includedir}/libspl
|
||||
Libs: -L${libdir} -lzfs -lnvpair
|
||||
Libs.private: -luutil -lm -pthread
|
||||
|
|
|
@ -6,8 +6,8 @@ includedir=@includedir@
|
|||
Name: libzfs_core
|
||||
Description: LibZFS core library
|
||||
Version: @VERSION@
|
||||
URL: https://zfsonlinux.org
|
||||
Requires.private: blkid uuid libtirpc zlib
|
||||
URL: https://github.com/openzfs/zfs
|
||||
Requires.private: @LIBBLKID_PC@ @LIBUUID_PC@ @LIBTIRPC_PC@ @ZLIB_PC@
|
||||
Cflags: -I${includedir}/libzfs -I${includedir}/libspl
|
||||
Libs: -L${libdir} -lzfs_core -lnvpair
|
||||
Libs.private: @LIBCLOCK_GETTIME@ @LIBUDEV_LIBS@ -lm -pthread
|
||||
|
|
Loading…
Reference in New Issue