Skip to content

Commit

Permalink
meson: add missing header files check
Browse files Browse the repository at this point in the history
Fixes: #1318
Signed-off-by: Karel Zak <kzak@redhat.com>
  • Loading branch information
karelzak committed May 26, 2021
1 parent 05cbd5a commit 647f80e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions configure.ac
Expand Up @@ -301,6 +301,7 @@ AC_CHECK_HEADERS([ \
inttypes.h \
lastlog.h \
libutil.h \
linux/blkzoned.h \
linux/btrfs.h \
linux/capability.h \
linux/cdrom.h \
Expand Down Expand Up @@ -382,8 +383,6 @@ AC_CHECK_HEADERS([security/pam_misc.h],
#endif
])

AC_CHECK_HEADERS([linux/blkzoned.h])

AC_CHECK_DECLS([BLK_ZONE_REP_CAPACITY], [], [], [
#include <linux/blkzoned.h>
])
Expand Down
7 changes: 5 additions & 2 deletions meson.build
Expand Up @@ -4,8 +4,8 @@ project('util-linux', 'c',

pkgconfig = import('pkgconfig')

libblkid_version = '1.1.0'
libblkid_date = '11-Dec-2019'
libblkid_version = '1.1.0'
libuuid_version = '1.3.0'
libmount_version = '1.1.0'
libsmartcols_version = '1.1.0'
Expand Down Expand Up @@ -156,8 +156,10 @@ headers = '''
linux/compiler.h
linux/falloc.h
linux/fd.h
linux/fs.h
linux/fiemap.h
linux/gsmmux.h
linux/net_namespace.h
linux/nsfs.h
linux/raw.h
linux/securebits.h
linux/tiocl.h
Expand Down Expand Up @@ -195,6 +197,7 @@ headers = '''
sys/types.h
sys/ucred.h
sys/un.h
sys/xattr.h
'''.split()

lib_m = cc.find_library('m')
Expand Down

0 comments on commit 647f80e

Please sign in to comment.