c-ares embbeded builds header include paths fully defined in makefiles

diff --git a/configure.ac b/configure.ac
index a7065e361bb9ab7069f704294cf7b1b49dd875d1..04aee8f3b89ef0bc2b1b07225c8e9ef8a7b1b9d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2229,10 +2229,10 @@ AC_HELP_STRING([--disable-ares],[Disable c-ares for name lookups]),
          if test -d "$srcdir/ares"; then
             aresembedded="yes"
             AC_CONFIG_SUBDIRS(ares)
-            aresinc=`cd $srcdir/ares && pwd`
-            CPPFLAGS="$CPPFLAGS -I$aresinc"
             dnl This c-ares library is an uninstalled libtool archive, so
             dnl we delegate all the linking magic on libtool and automake.
+            dnl Since c-ares has installable configured header files, path
+            dnl inclusion is fully done in makefiles for in-tree builds.
          else
            LIBS="-lcares $LIBS"
          fi

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ec1905745fc5b118ff9eda00436ae0662eaf6b29..1089c5f6d8dd7b8dfa7871ddb6a45ab708ed88e8 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -57,12 +57,19 @@ LIBCURL_LIBS = @LIBCURL_LIBS@
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
+if USE_EMBEDDED_ARES
 INCLUDES = -I$(top_builddir)/include \
            -I$(top_srcdir)/include   \
            -I$(top_builddir)/lib     \
            -I$(top_srcdir)/lib       \
            -I$(top_builddir)/ares    \
            -I$(top_srcdir)/ares
+else
+INCLUDES = -I$(top_builddir)/include \
+           -I$(top_srcdir)/include   \
+           -I$(top_builddir)/lib     \
+           -I$(top_srcdir)/lib
+endif
 
 if SONAME_BUMP
 #

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 228ae6b49ddbf9c16d6a14844542357006569327..a4ce4b14eea8faadb7fc345ada533b10ecb56f2a 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -31,11 +31,22 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # $(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
+# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
+# $(top_srcdir)/ares is for in-tree c-ares's external include files
 
+if USE_EMBEDDED_ARES
+INCLUDES = -I$(top_builddir)/include \
+           -I$(top_srcdir)/include   \
+           -I$(top_builddir)/lib     \
+           -I$(top_srcdir)/lib       \
+           -I$(top_builddir)/ares    \
+           -I$(top_srcdir)/ares
+else
 INCLUDES = -I$(top_builddir)/include \
            -I$(top_srcdir)/include   \
            -I$(top_builddir)/lib     \
            -I$(top_srcdir)/lib 
+endif
 
 LIBDIR = $(top_builddir)/lib
 

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 7c520ae04de0929f0c78239c70b4bedc57027e05..c8863c265a29c338095bb308cdb54de955c0128c 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -34,12 +34,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
+if USE_EMBEDDED_ARES
 INCLUDES = -I$(top_builddir)/include \
            -I$(top_srcdir)/include   \
            -I$(top_builddir)/lib     \
            -I$(top_srcdir)/lib       \
            -I$(top_builddir)/ares    \
            -I$(top_srcdir)/ares
+else
+INCLUDES = -I$(top_builddir)/include \
+           -I$(top_srcdir)/include   \
+           -I$(top_builddir)/lib     \
+           -I$(top_srcdir)/lib
+endif
 
 # Makefile.inc provides the source defines (noinst_PROGRAMS, useful, *_SOURCES, and *_LDADD)
 include Makefile.inc