mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-04 16:33:40 +02:00
build: Drop fallback checks for libmount versions without pkg-config
Building against libmount installed into a non-default prefix wasn’t working, as we were using #include <libmount/libmount.h> rather than the correct #include <libmount.h> — all the mount.pc pkg-config files set `Cflags: -I${includedir}/libmount`. Fixing this while retaining the fallback support for versions of libmount without a pkg-config file would have been tricky (we would need to work out a suitable -I flag to set in LIBMOUNT_CFLAGS) to still be able to use the correct #include path). Thankfully, libmount gained pkg-config support a long time ago, so I think we can safely drop the fallback code. In particular, Debian Jessie, Ubuntu Trusty, and CentOS 5 all ship a mount.pc file. Signed-off-by: Philip Withnall <withnall@endlessm.com> https://bugzilla.gnome.org/show_bug.cgi?id=793288
This commit is contained in:
@@ -159,7 +159,7 @@ static guint64 mount_poller_time = 0;
|
||||
#ifdef HAVE_MNTENT_H
|
||||
#include <mntent.h>
|
||||
#ifdef HAVE_LIBMOUNT
|
||||
#include <libmount/libmount.h>
|
||||
#include <libmount.h>
|
||||
#endif
|
||||
#elif defined (HAVE_SYS_MNTTAB_H)
|
||||
#include <sys/mnttab.h>
|
||||
|
Reference in New Issue
Block a user