build: Misc cleanup of options

Cleanup of option names, use features where applicable, and printing
of summary.
This commit is contained in:
Patrick Griffis
2021-07-13 11:12:22 -05:00
parent 25440a07c3
commit cbb0927a7a
9 changed files with 91 additions and 55 deletions

View File

@@ -1,5 +1,5 @@
dbus_deps = [
dependency('dbus-glib-1')
dbus_glib_dep
]
dbus_sources = [

View File

@@ -28,6 +28,7 @@ common_sysinfo_deps = []
common_deps = [
libgio_dep,
libcanberra_dep,
] + global_deps
common_includes = [
@@ -72,22 +73,18 @@ textevents = custom_target('textevents',
# SIGACTION
# HAVE_GTK_MAC
if get_option('with-ssl')
if libssl_dep.found()
common_sources += 'ssl.c'
common_deps += libssl_dep
endif
if get_option('with-libcanberra')
common_deps += dependency('libcanberra', version: '>= 0.22')
endif
if get_option('with-dbus')
if dbus_glib_dep.found()
subdir('dbus')
common_deps += hexchat_dbus_dep
common_includes += include_directories('dbus')
endif
if get_option('with-plugin')
if get_option('plugin')
common_deps += libgmodule_dep
install_headers('hexchat-plugin.h')
endif

View File

@@ -43,9 +43,9 @@ hexchat_gtk_cflags = []
hexchat_gtk_ldflags = []
if get_option('with-libnotify')
if libnotify_dep.found()
hexchat_gtk_sources += 'notifications/notification-libnotify.c'
hexchat_gtk_deps += dependency('libnotify')
hexchat_gtk_deps += libnotify_dep
elif false # TODO HAVE_GTK_MAC
elif host_machine.system() == 'windows'
hexchat_gtk_sources += 'notifications/notification-windows.c'
@@ -69,7 +69,7 @@ if iso_codes.found()
join_paths(iso_codes_prefix, 'share/locale'))
endif
if get_option('with-plugin')
if get_option('plugin')
hexchat_gtk_sources += 'plugingui.c'
endif

View File

@@ -1,13 +1,13 @@
subdir('common')
if get_option('with-gtk')
if get_option('gtk-frontend')
subdir('fe-gtk')
endif
if get_option('with-text')
if get_option('text-frontend')
subdir('fe-text')
endif
if get_option('with-theme-manager')
if get_option('theme-manager')
subdir('htm')
endif