From a354816a5d6b9026383e9982f3cf25996eddd3ba Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Wed, 26 Jul 2017 08:24:02 -0700 Subject: Use TEST_CPPFLAGS/TEST_CXXFLAGS to add path to CxxTest headers in configure.ac. (#200) CxxTest headers were included in test/unit/Makefile.am as -I@CXXTEST@. However, in configure.ac if CXXTEST was not set by the user, it was initially set to `dirname "$CXXTESTGEN"` while determining the path to the header files. If CXXTESTGEN pointed to /usr/bin and if the headers were found in /usr/include, CXXTEST was not reset, which led to CXXTEST being replaced by /usr/bin in test/unit/Makefile.am. As a consequence, the locale binary in /usr/bin got included instead of the locale header file. --- test/unit/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'test/unit') diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 53981f94e..9640a059a 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -67,7 +67,6 @@ if HAVE_CXXTESTGEN AM_CPPFLAGS = \ -I. \ - "-I@CXXTEST@" \ "-I@top_builddir@/src" \ "-I@top_srcdir@/src/include" \ "-I@top_srcdir@/lib" \ -- cgit v1.2.3