From 48269ce93701fd49de2dc433248e0d9e39eb6f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@des.no>
Date: Sat, 29 Apr 2017 18:28:54 +0200
Subject: [PATCH] Fix include paths for some tests.

It was wrong to remove $(AM_CPPFLAGS) in d43a6bf2, because it is only used for code for which there is no explicit *_CPPFLAGS.  It is not entirely clear why this did not trip us (or Travis) up until now, although it is possible that it only breaks when $(builddir) != $(srcdir).

On the other hand, there is no reason to use $(INCLUDES).
---
 t/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/Makefile.am b/t/Makefile.am
index 96c03c6..ea340c6 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = 
 
 EXTRA_DIST =
 noinst_HEADERS =
@@ -19,14 +19,14 @@ libt = $(top_builddir)/lib/test/libcryb-test.la
 
 # Additional headers, flags and libraries for OpenSSL
 if OPENSSL_TESTS
-OPENSSL_INCLUDES = $(INCLUDES)
+OPENSSL_INCLUDES = 
 OPENSSL_CFLAGS = -DWITH_OPENSSL=1
 OPENSSL_LDADD = -lcrypto
 endif OPENSSL_TESTS
 
 # Additional headers, flags and libraries for RSAREF
 if RSAREF_TESTS
-RSAREF_INCLUDES = $(INCLUDES) -I$(top_srcdir)/lib/rsaref
+RSAREF_INCLUDES = -I$(top_srcdir)/lib/rsaref
 RSAREF_CFLAGS = -DWITH_RSAREF=1 -DPROTOTYPES=1
 RSAREF_LDADD = $(top_builddir)/lib/rsaref/librsaref.la
 endif RSAREF_TESTS
@@ -37,7 +37,7 @@ TESTS =
 # c++ header test
 TESTS += t_cxx
 t_cxx_SOURCES = t_cxx.cc
-t_cxx_CPPFLAGS =
+t_cxx_CPPFLAGS = $(AM_CPPFLAGS)
 t_cxx_LDADD =
 if CRYB_CIPHER
 t_cxx_CPPFLAGS += -DWITH_CRYB_CIPHER