File: fapolicyd-uthash-bundle.patch

package info (click to toggle)
fapolicyd 1.3.4-1
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 1,060 kB
  • sloc: ansic: 10,446; makefile: 206; sh: 132; python: 26
file content (41 lines) | stat: -rw-r--r-- 1,129 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
diff --git a/configure.ac b/configure.ac
index 8188d13..6430e1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,9 +112,6 @@ AC_CHECK_HEADER(sys/fanotify.h, , [AC_MSG_ERROR(
 ["Couldn't find sys/fanotify.h...your kernel might not be new enough"] )])
 AC_CHECK_FUNCS(fexecve, [], [])
 AC_CHECK_FUNCS([gettid])
-AC_CHECK_HEADER(uthash.h, , [AC_MSG_ERROR(
-["Couldn't find uthash.h...uthash-devel is missing"] )])
-
 
 echo .
 echo Checking for required libraries
diff --git a/src/Makefile.am b/src/Makefile.am
index 25afbcd..dc308ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,9 @@ AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/src/library
 
+AM_CPPFLAGS += \
+	-I${top_srcdir}/uthash-2.3.0/include
+
 sbin_PROGRAMS = fapolicyd fapolicyd-cli
 lib_LTLIBRARIES= libfapolicyd.la
 
diff --git a/src/library/rpm-backend.c b/src/library/rpm-backend.c
index 8d5aa20..6e92f10 100644
--- a/src/library/rpm-backend.c
+++ b/src/library/rpm-backend.c
@@ -33,7 +33,7 @@
 #include <rpm/rpmpgp.h>
 #include <fnmatch.h>
 
-#include <uthash.h>
+#include "uthash.h"
 
 #include "message.h"
 #include "gcc-attributes.h"