Commit 59f3c1f1 authored by Simon McVittie's avatar Simon McVittie

Autotools: Move libmount from Libs.private to Requires.private

libmount depends on libblkid, so if we statically link a trivial
executable to GIO, we need to pull in both libmount and libblkid.
Linking with -lmount is not enough to achieve that, but recursing
into mount.pc is.

This makes the Autotools build a bit more like the Meson build,
which already puts mount in Requires.private.
Signed-off-by: 's avatarSimon McVittie <smcv@collabora.com>
parent 88a1188f
......@@ -1786,9 +1786,13 @@ fi
])
if test x$have_libmount = xyes; then
LIBMOUNT_REQUIRES="mount >= 2.23"
AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available])
else
LIBMOUNT_REQUIRES=""
fi
AM_CONDITIONAL(HAVE_LIBMOUNT, [test x$have_libmount = xyes])
AC_SUBST([LIBMOUNT_REQUIRES])
dnl ****************************************
dnl *** platform dependent source checks ***
......
......@@ -15,7 +15,7 @@ Name: GIO
Description: glib I/O library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0
Requires.private: gmodule-no-export-2.0
Requires.private: gmodule-no-export-2.0 @LIBMOUNT_REQUIRES@
Libs: -L${libdir} -lgio-2.0
Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@
Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
Cflags:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment