Merge pull request #1475 from bynect/fix-version-meson

Fix meson configuration files

Author: bynect

.editorconfig

@@ -49,6 +49,9 @@ indent_style = tab
 [test/functional-tests/dunstrc.vertical_align]
 indent_style =
 
+[meson.build]
+indent_size = 4
+
 # Contains external or generated files
 [src/wayland/protocols/**]
 indent_style =

Makefile

@@ -142,9 +142,9 @@ docs/dunst.1: docs/dunst.1.pod
 docs/dunst.5: docs/dunst.5.pod
 	${POD2MAN} --name=dunst -c "Dunst Reference" --section=5 --release=${VERSION} $< > $@
 docs/dunstctl.1: docs/dunstctl.pod
-	${POD2MAN} --name=dunstctl -c "dunstctl reference" --section=1 --release=${VERSION} $< > $@
+	${POD2MAN} --name=dunstctl -c "Dunstctl Reference" --section=1 --release=${VERSION} $< > $@
 docs/dunstify.1: docs/dunstify.pod
-	${POD2MAN} --name=dunstify -c "dunstify reference" --section=1 --release=${VERSION} $< > $@
+	${POD2MAN} --name=dunstify -c "Dunstify Reference" --section=1 --release=${VERSION} $< > $@
 
 doc-doxygen:
 	${DOXYGEN} docs/internal/Doxyfile
@@ -200,6 +200,7 @@ clean-dunstify:
 
 clean-doc:
 	rm -f docs/dunst.1
+	rm -f docs/dunst.1.pod
 	rm -f docs/dunst.5
 	rm -f docs/dunstctl.1
 	rm -f docs/dunstify.1

docs/meson.build

@@ -48,8 +48,25 @@ custom_target(
     output: 'dunstctl.1',
     command: [
         pod2man,
-        '--name=dunst',
-        '--center=dunstctl Reference',
+        '--name=dunstctl',
+        '--center=Dunstctl Reference',
+        '--section=1',
+        pod2man_version_arg,
+        '@INPUT@',
+        '@OUTPUT@',
+    ],
+    install: true,
+    install_dir: man1,
+)
+
+custom_target(
+    'dunstify_pod2man',
+    input: 'dunstify.pod',
+    output: 'dunstify.1',
+    command: [
+        pod2man,
+        '--name=dunstify',
+        '--center=Dunstify Reference',
         '--section=1',
         pod2man_version_arg,
         '@INPUT@',

meson.build

@@ -13,24 +13,37 @@ project(
 
 cc = meson.get_compiler('c')
 
+# Required dependencies
 cairo = dependency('cairo')
 glib = dependency('glib-2.0')
 gio = dependency('gio-2.0')
 gdk_pixbuf = dependency('gdk-pixbuf-2.0')
 pangocairo = dependency('pangocairo')
+realtime = cc.find_library('rt')
+math = cc.find_library('m')
+
+# Optional dependencies (X11)
 x11 = dependency('x11', required: get_option('x11'))
 xinerama = dependency('xinerama', required: get_option('x11'))
 xext = dependency('xext', required: get_option('x11'))
 xrandr = dependency('xrandr', required: get_option('x11'), version: '>=1.5')
 xscrnsaver = dependency('xscrnsaver', required: get_option('x11'))
-systemd = dependency('systemd', required: get_option('systemd'))
-libnotify = dependency('libnotify', required: get_option('dunstify'))
-realtime = cc.find_library('rt')
-math = cc.find_library('m')
+
+x11_support = x11.found() and xinerama.found() and xext.found() and xrandr.found() and xscrnsaver.found()
+
+# Optional dependencies (Wayland)
 wayland_client = dependency('wayland-client', required: get_option('wayland'))
 wayland_protos = dependency('wayland-protocols', version: '>=1.12', required: get_option('wayland'))
 wayland_cursor = dependency('wayland-cursor', required: get_option('wayland'))
 
+wayland_support = wayland_client.found() and wayland_cursor.found() and wayland_protos.found()
+
+# Soft dependency (systemd)
+systemd = dependency('systemd', required: get_option('systemd'))
+
+# Optional dependency (dunstify)
+libnotify = dependency('libnotify', required: get_option('dunstify'))
+
 dunst_depends = [
     cairo,
     glib,
@@ -43,15 +56,8 @@ dunst_depends = [
     math,
 ]
 
-x11_support = x11.found() and xinerama.found() and xext.found() and xrandr.found() and xscrnsaver.found()
-wayland_support = wayland_client.found() and wayland_cursor.found() and wayland_protos.found()
-
 if not x11_support and not wayland_support
-    error('either wayland or x11 support is required')
-endif
-
-if wayland_support and not x11_support
-    add_project_arguments('-DWAYLAND_ONLY', language: 'c')
+    error('You have to compile at least one output (X11, Wayland)')
 endif
 
 if x11_support
@@ -62,6 +68,10 @@ endif
 if wayland_support
     dunst_depends += [wayland_client, wayland_cursor]
     add_project_arguments('-DENABLE_WAYLAND', language: 'c')
+
+    if not x11_support
+        add_project_arguments('-DWAYLAND_ONLY', language: 'c')
+    endif
 endif
 
 c_version_arg = '-DVERSION="@0@"'.format(meson.project_version())
@@ -78,8 +88,8 @@ install_data('dunstctl', install_dir: get_option('bindir'))
 install_data('dunstrc', install_dir: sysconfdir / 'dunst')
 
 conf_data = configuration_data()
-conf_data.set('bindir', get_option('bindir'))
-conf_data.set('sysconfdir', sysconfdir)
+conf_data.set('bindir', get_option('prefix') / get_option('bindir'))
+conf_data.set('sysconfdir', get_option('prefix') / sysconfdir)
 
 configure_file(
     input: 'org.knopwob.dunst.service.in',

src/dunst.c

@@ -348,14 +348,20 @@ void usage(int exit_status)
 void print_version(void)
 {
         printf("Dunst - A customizable and lightweight notification-daemon %s\n", VERSION);
+#ifdef _CCDATE
         printf("Compiled on %s with the following options:\n", STR_TO(_CCDATE));
+#endif
 
         printf("X11 support: %s\n", X11_SUPPORT ? "enabled" : "disabled");
         printf("Wayland support: %s\n", WAYLAND_SUPPORT ? "enabled" : "disabled");
         printf("SYSCONFDIR set to: %s\n", SYSCONFDIR);
 
+#ifdef _CFLAGS
         printf("Compiler flags: %s\n", STR_TO(_CFLAGS));
+#endif
+#ifdef _LDFLAGS
         printf("Linker flags: %s\n", STR_TO(_LDFLAGS));
+#endif
         exit(EXIT_SUCCESS);
 }