349cc4a507
The advantage is that is the name is mispellt, cpp will warn us.
$ git grep -Ee "conf.set\('(HAVE|ENABLE)_" -l|xargs sed -r -i "s/conf.set\('(HAVE|ENABLE)_/conf.set10('\1_/"
$ git grep -Ee '#ifn?def (HAVE|ENABLE)' -l|xargs sed -r -i 's/#ifdef (HAVE|ENABLE)/#if \1/; s/#ifndef (HAVE|ENABLE)/#if ! \1/;'
$ git grep -Ee 'if.*defined\(HAVE' -l|xargs sed -i -r 's/defined\((HAVE_[A-Z0-9_]*)\)/\1/g'
$ git grep -Ee 'if.*defined\(ENABLE' -l|xargs sed -i -r 's/defined\((ENABLE_[A-Z0-9_]*)\)/\1/g'
+ manual changes to meson.build
squash! build-sys: use #if Y instead of #ifdef Y everywhere
v2:
- fix incorrect setting of HAVE_LIBIDN2
50 lines
1.7 KiB
Meson
50 lines
1.7 KiB
Meson
systemd_journal_upload_sources = files('''
|
|
journal-upload.h
|
|
journal-upload.c
|
|
journal-upload-journal.c
|
|
'''.split())
|
|
|
|
systemd_journal_remote_sources = files('''
|
|
journal-remote-parse.h
|
|
journal-remote-parse.c
|
|
journal-remote-write.h
|
|
journal-remote-write.c
|
|
journal-remote.h
|
|
journal-remote.c
|
|
microhttpd-util.h
|
|
microhttpd-util.c
|
|
'''.split())
|
|
|
|
systemd_journal_gatewayd_sources = files('''
|
|
journal-gatewayd.c
|
|
microhttpd-util.h
|
|
microhttpd-util.c
|
|
'''.split())
|
|
|
|
if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1
|
|
journal_upload_conf = configure_file(
|
|
input : 'journal-upload.conf.in',
|
|
output : 'journal-upload.conf',
|
|
configuration : substs)
|
|
install_data(journal_upload_conf,
|
|
install_dir : pkgsysconfdir)
|
|
endif
|
|
|
|
if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
|
|
journal_remote_conf = configure_file(
|
|
input : 'journal-remote.conf.in',
|
|
output : 'journal-remote.conf',
|
|
configuration : substs)
|
|
install_data(journal_remote_conf,
|
|
install_dir : pkgsysconfdir)
|
|
|
|
install_data('browse.html',
|
|
install_dir : join_paths(pkgdatadir, 'gatewayd'))
|
|
|
|
meson.add_install_script('sh', '-c',
|
|
mkdir_p.format('/var/log/journal/remote'))
|
|
meson.add_install_script('sh', '-c',
|
|
'chown 0:0 $DESTDIR/var/log/journal/remote &&
|
|
chmod 755 $DESTDIR/var/log/journal/remote || :')
|
|
endif
|