From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 24 Nov 2017 12:53:36 +0000 (+0100)
Subject: Fix build without libkmod
X-Git-Tag: v236~126^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a8a4b6e3e98db45b7890b2c13c8f9f16dfed7a4;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 0550e222b57..a2809d03f62 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,