ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'meson-fixes' of https://github.com/Hello71/util-linux 

* 'meson-fixes' of https://github.com/Hello71/util-linux:
  meson: make asciidoc optional
  meson: fix building libsmartcols
  meson: fix building logger
This commit is contained in:
Karel Zak 2021-09-16 13:07:05 +02:00
parent f45c818004 00b8a51f88
commit aa57994f73
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsmartcols/meson.build
View File

@ -19,7 +19,6 @@ lib_smartcols_sources = '''
src/print.c
src/print-api.c
src/version.c
src/buffer.c
src/calculate.c
src/grouping.c
src/walk.c

4
meson.build
View File

@ -2245,6 +2245,7 @@ exe = executable(
'logger',
logger_sources,
include_directories : includes,
link_with : [lib_common],
dependencies : [lib_systemd],
install_dir : usrbin_exec_dir,
install : opt,
@ -2259,6 +2260,7 @@ exe = executable(
logger_sources,
include_directories : includes,
c_args : '-DTEST_LOGGER',
link_with : [lib_common],
dependencies : [lib_systemd])
if not is_disabler(exe)
exes += exe
@ -3049,7 +3051,7 @@ if build_libuuid
'libuuid/man/uuid_generate_time_safe.3']
endif
asciidoctor = find_program('asciidoctor')
asciidoctor = find_program('asciidoctor', required : false)
if asciidoctor.found()
foreach adoc : manadocs
name = adoc.split('/')[-1]