Skip to contentSkip to conversation

Fix build system to accept non-system crypto library locations for plugins.

PATCH In review Steffan Karger 2 participants 2 messages Apr 21, 2014 – Apr 27, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix build system to accept non-system crypto library locations for plugins.

Flags like {OPEN,POLAR}SSL_CFLAGS were used by the core build, but not by the plugins. However, all plugins include openvpn-plugin.h, which need crypto/ssl headers.

---
 src/plugins/auth-pam/Makefile.am  | 5 +++--
 src/plugins/down-root/Makefile.am | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
src/plugins/auth-pam/Makefile.am +3 -2
index 701a749..2aef311 100644
@@ -8,8 +8,9 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
 AM_CFLAGS = \
-	-I$(top_srcdir)/include
-	$(PLUGIN_AUTH_PAM_CFLAGS)
+	-I$(top_srcdir)/include \
+	$(PLUGIN_AUTH_PAM_CFLAGS) \
+	$(OPTIONAL_CRYPTO_CFLAGS)
 
 if ENABLE_PLUGIN_AUTH_PAM
 plugin_LTLIBRARIES = openvpn-plugin-auth-pam.la
src/plugins/down-root/Makefile.am +2 -1
index 064aa30..7ca5a4e 100644
@@ -8,7 +8,8 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
 AM_CFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	$(OPTIONAL_CRYPTO_CFLAGS)
 
 if ENABLE_PLUGIN_DOWN_ROOT
 plugin_LTLIBRARIES = openvpn-plugin-down-root.la
Signature · 1 line
1.8.3.2
#1 lore raw

ACK. (I had a really nice test case for this, as my "test-compile 2.3 with polar 1.2" tree only builds if the compile flags are honoured...)

Your patch has been applied to the master and release/2.3 branches.

commit ea31bc680fc83946b2cc8d0c93544a1ab2a01d63 (master) commit c2faef04e61378ef5f112401b586fc9af6168f33 (master)

Author: Steffan Karger
Date:   Mon Apr 21 13:37:18 2014 +0200
     Fix build system to accept non-system crypto library locations for plugins.

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8576
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering