blob: c85f047c0eb27ea1a28de7cbb0d5d7d3c6e9642b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
Message-Id: <c93756c8f066a1e35fa2f46b231771d78e292600.1509419562.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 31 Oct 2017 04:11:42 +0100
Subject: [PATCH] meson: Fix libmount support
The define was still missing.
---
config.h.meson | 3 +++
meson.build | 1 +
2 files changed, 4 insertions(+)
diff --git a/config.h.meson b/config.h.meson
index c67e1792f4af1ada..3f310b3c960fcb29 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -247,6 +247,9 @@
/* Define if libelf is available */
#mesondefine HAVE_LIBELF
+/* Define if libmount is available */
+#mesondefine HAVE_LIBMOUNT
+
/* Define to 1 if you have the <linux/magic.h> header file. */
#mesondefine HAVE_LINUX_MAGIC_H
diff --git a/meson.build b/meson.build
index 208c23087627de1e..cd9cbf2ce10595c2 100644
--- a/meson.build
+++ b/meson.build
@@ -1535,6 +1535,7 @@ if use_system_pcre
endif
if libmount_dep.length() == 1 and libmount_dep[0].found()
glib_conf.set('LIBMOUNT_LIBS', '-lmount')
+ glib_conf.set('HAVE_LIBMOUNT', 1)
endif
glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
# FIXME: Missing:
--
2.15.0
|