[glib/meson-for-merge] meson: Defining MAJOR_IN_ as done by AC_HEADER_MAJOR
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/meson-for-merge] meson: Defining MAJOR_IN_ as done by AC_HEADER_MAJOR
- Date: Fri, 14 Jul 2017 00:23:09 +0000 (UTC)
commit 1d30c9eebc8bc4efcd8da8c479040389edd0cfe3
Author: Thibault Saunier <thibault saunier osg samsung com>
Date: Fri Jun 23 11:58:51 2017 -0400
meson: Defining MAJOR_IN_ as done by AC_HEADER_MAJOR
https://bugzilla.gnome.org/show_bug.cgi?id=784133
config.h.meson | 3 +++
meson.build | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index b8b419e..7346b92 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -793,3 +793,6 @@
#mesondefine size_t
#mesondefine EXEEXT
+
+#mesondefine MAJOR_IN_MKDEV
+#mesondefine MAJOR_IN_SYSMACROS
diff --git a/meson.build b/meson.build
index c954fbd..892a7ce 100644
--- a/meson.build
+++ b/meson.build
@@ -363,6 +363,12 @@ elif cc.has_function('_strnicmp')
glib_conf_prefix = glib_conf_prefix + '#define HAVE_STRNCASECMP ' + hack_define
endif
+if cc.has_header_symbol('sys/sysmacros.h', 'major')
+ glib_conf.set('MAJOR_IN_SYSMACROS', 1)
+elif cc.has_header_symbol('sys/mkdev.h', 'major')
+ glib_conf.set('MAJOR_IN_MKDEV', 1)
+endif
+
# Check whether to use statfs or statvfs
# Some systems have both statfs and statvfs, pick the most "native" for these
if have_func_statfs and have_func_statvfs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]