Commit 13fdb9d8 authored by Yang Tse's avatar Yang Tse
Browse files

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

parent 52b2bc41

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/Makefile.am

+7 −0
Original line number Diff line number Diff line
@@ -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

#

tests/libtest/Makefile.am

+11 −0
Original line number Diff line number Diff line
@@ -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

tests/server/Makefile.am

+7 −0
Original line number Diff line number Diff line
@@ -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