luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-09-26 10:07:34 +01:00
parent 88a1188fc1
commit 59f3c1f17a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1786,9 +1786,13 @@ fi
]) ])
if test x$have_libmount = xyes; then if test x$have_libmount = xyes; then
LIBMOUNT_REQUIRES="mount >= 2.23"
AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available]) AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available])
else
LIBMOUNT_REQUIRES=""
fi fi
AM_CONDITIONAL(HAVE_LIBMOUNT, [test x$have_libmount = xyes]) AM_CONDITIONAL(HAVE_LIBMOUNT, [test x$have_libmount = xyes])
AC_SUBST([LIBMOUNT_REQUIRES])
dnl **************************************** dnl ****************************************
dnl *** platform dependent source checks *** dnl *** platform dependent source checks ***

4
gio-2.0.pc.in
View File

@ -15,7 +15,7 @@ Name: GIO
Description: glib I/O library Description: glib I/O library
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0 gobject-2.0 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: -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: Cflags: