summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-12 09:31:38 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-12 09:39:40 +0200
commit15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3 (patch)
tree23a8cd6147e747c48ce3323cf7d6ac64414a112f
parentc2dd607f9bac232f862158080741f449f834eeef (diff)
downloadrsyslog-15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3.tar.gz
rsyslog-15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3.tar.bz2
rsyslog-15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3.zip
bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled
Thanks to Jonny Törnbom for reporting this problem Conflicts: ChangeLog runtime/cryprov.h
-rw-r--r--ChangeLog2
-rw-r--r--runtime/cryprov.h2
-rw-r--r--runtime/libgcry.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 83420053..85f7bbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
Version 7.4.5 [v7.4-stable] 2013-09-??
- bugfix: some more build problems with newer json-c versions
Thanks to Michael Biebl for mentioning the problem.
+- bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled
+ Thanks to Jonny Törnbom for reporting this problem
---------------------------------------------------------------------------
Version 7.4.4 [v7.4-stable] 2013-09-03
- better error messages in GuardTime signature provider
diff --git a/runtime/cryprov.h b/runtime/cryprov.h
index 8496b745..005b33f7 100644
--- a/runtime/cryprov.h
+++ b/runtime/cryprov.h
@@ -24,8 +24,6 @@
#ifndef INCLUDED_CRYPROV_H
#define INCLUDED_CRYPROV_H
-#include <gcrypt.h>
-
/* interface */
BEGINinterface(cryprov) /* name must also be changed in ENDinterface macro! */
rsRetVal (*Construct)(void *ppThis);
diff --git a/runtime/libgcry.h b/runtime/libgcry.h
index b77b0f9e..83f508bf 100644
--- a/runtime/libgcry.h
+++ b/runtime/libgcry.h
@@ -21,7 +21,7 @@
#ifndef INCLUDED_LIBGCRY_H
#define INCLUDED_LIBGCRY_H
#include <stdint.h>
-
+#include <gcrypt.h>
struct gcryctx_s {
uchar *key;