luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build with old libmount too

Browse Source 
Downstream: https://bugzilla.redhat.com/show_bug.cgi?id=1508056

This is an easy change, and lets us build with RHEL7's libmount.

See also cee57a0268
This commit is contained in:
Colin Walters 2017-11-01 10:21:34 -04:00
parent d011223085
commit 96ebcee8c4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1760,8 +1760,10 @@ AS_IF([ test $have_libmount = maybe ], [
glib_save_LIBS=$LIBS
AC_CHECK_HEADER([libmount/libmount.h], [:], [have_libmount=no])
# Check for a recent enough libmount
AC_CHECK_LIB([mount], [mnt_unref_table], [:], [have_libmount=no])
# We used to check for mnt_unref_table(), but now for compat with
# e.g. RHEL7 just use mnt_free_table(). Let's keep this check
# anyways.
AC_CHECK_LIB([mount], [mnt_free_table], [:], [have_libmount=no])
LIBS=$glib_save_LIBS
if test $have_libmount != no; then

4
gio/gunixmounts.c
View File

@ -505,7 +505,7 @@ _g_get_unix_mounts (void)
mnt_free_iter (iter);
out:
mnt_unref_table (table);
mnt_free_table (table);
return g_list_reverse (return_list);
}
@ -1029,7 +1029,7 @@ _g_get_unix_mount_points (void)
mnt_free_iter (iter);
out:
mnt_unref_table (table);
mnt_free_table (table);
return g_list_reverse (return_list);
}