From 8a8a4b6e3e98db45b7890b2c13c8f9f16dfed7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 24 Nov 2017 13:53:36 +0100
Subject: [PATCH 1/2] Fix build without libkmod

All other places where libkmod.h is included are guarded. Build would
fail with:

In file included from ../src/core/kmod-setup.c:35:0:
../src/basic/module-util.h:23:10: fatal error: libkmod.h: No such file or directory
 #include <libkmod.h>
          ^~~~~~~~~~~
compilation terminated.
---
 src/core/kmod-setup.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 0550e222b5..a2809d03f6 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -22,20 +22,18 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_KMOD
-#include <libkmod.h>
-#endif
-
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "capability-util.h"
 #include "fileio.h"
 #include "kmod-setup.h"
 #include "macro.h"
-#include "module-util.h"
 #include "string-util.h"
 
 #if HAVE_KMOD
+#include <libkmod.h>
+#include "module-util.h"
+
 static void systemd_kmod_log(
                 void *data,
                 int priority,

From 559d215b6733bb46533a52080522a7feca183aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 24 Nov 2017 14:00:29 +0100
Subject: [PATCH 2/2] meson: restore building of man pages on demand even if
 -Dman=false

I want to configure -Dman=false for speed, but be able to build a specific
man page sometimes to check my edits. Commit 5b316b9ea6c broke this by mistake.
Let's adjust the condition to better match the logic of disabling tests only
if xsltproc is really not found.
---
 man/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/meson.build b/man/meson.build
index 8757dccb84..3a684101d2 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -49,7 +49,7 @@ custom_entities_ent = configure_file(
 man_pages = []
 html_pages = []
 source_xml_files = []
-foreach tuple : want_man or want_html ? manpages : []
+foreach tuple : xsltproc.found() ? manpages : []
         stem = tuple[0]
         section = tuple[1]
         aliases = tuple[2]