From 448645d47991e36337c11dff0271be77218e82c7 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sun, 11 Oct 2015 16:46:55 -0700 Subject: Use bundled headers instead of installed headers when building The build system incorrectly set include directives in AM_CFLAGS which causes them to be placed after the configured CPPFLAGS. Thus, if a user or packaging system sets CPPFLAGS to a location that has libressl or openssl headers installed, they will be used instead of the bundled versions. This corrects that issue by setting up the variables correctly. https://github.com/libressl-portable/portable/issues/150 Signed-off-by: Jeremy Huddleston Sequoia --- crypto/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crypto') diff --git a/crypto/Makefile.am b/crypto/Makefile.am index bed4712..e1e785d 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/Makefile.am.common -AM_CFLAGS += -I$(top_srcdir)/crypto/asn1 -AM_CFLAGS += -I$(top_srcdir)/crypto/evp -AM_CFLAGS += -I$(top_srcdir)/crypto/modes +AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 +AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp +AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes lib_LTLIBRARIES = libcrypto.la @@ -14,7 +14,8 @@ EXTRA_DIST += compat/strcasecmp.c libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la -libcrypto_la_CPPFLAGS = -DLIBRESSL_INTERNAL +libcrypto_la_CPPFLAGS = $(AM_CPPFLAGS) +libcrypto_la_CPPFLAGS += -DLIBRESSL_INTERNAL libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK if OPENSSL_NO_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM -- cgit v1.2.3-55-g6feb