aboutsummaryrefslogtreecommitdiff
path: root/tests/libtest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/libtest')
-rw-r--r--tests/libtest/Makefile.am18
-rw-r--r--tests/libtest/lib506.c2
-rw-r--r--tests/libtest/test.h2
3 files changed, 12 insertions, 10 deletions
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 52e49b944..8efeef13f 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -22,14 +22,16 @@
###########################################################################
AUTOMAKE_OPTIONS = foreign nostdinc
-# $(top_srcdir)/include/curl is for the main curl include files, to make it
-# easier to include this specific set of curl headers, and NOT the ones
-# possibly already installed in the system.
-# -I$(top_srcdir)/lib is for the setup.h file, included by test.h
-# -I$(top_builddir)/lib is for the config.h file, possibly included by the
-# setup.h file
-
-INCLUDES = -I$(top_srcdir)/include/curl \
+# Specify our include paths here, and do it relative to $(top_srcdir) and
+# $(top_builddir), to ensure that these paths which belong to the library
+# being currently built and tested are searched before the library which
+# might possibly already be installed in the system.
+#
+# $(top_srcdir)/include is for libcurl's external include files
+# $(top_builddir)/lib is for libcurl's generated lib/config.h file
+# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+
+INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index cadd2ee63..0fc59591a 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -13,7 +13,7 @@
#include <ctype.h>
#include <errno.h>
-#include <mprintf.h>
+#include <curl/mprintf.h>
const char *HOSTHEADER = "Host: www.host.foo.com";
const char *JAR = "log/jar506";
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index 50c3a7959..ef85c346f 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -15,7 +15,7 @@
#include "setup.h"
-#include <curl.h>
+#include <curl/curl.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>