mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-08 10:26:16 +01:00
Merge branch 'libmount' into 'master'
Autotools: Move libmount from Libs.private to Requires.private See merge request GNOME/glib!358
This commit is contained in:
commit
a5e900c329
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user