moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yang Tse 2009-06-04 04:13:39 +00:00
parent 52b2bc4109
commit 13fdb9d8a5
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2229,10 +2229,10 @@ AC_HELP_STRING([--disable-ares],[Disable c-ares for name lookups]),
if test -d "$srcdir/ares"; then if test -d "$srcdir/ares"; then
aresembedded="yes" aresembedded="yes"
AC_CONFIG_SUBDIRS(ares) 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 This c-ares library is an uninstalled libtool archive, so
dnl we delegate all the linking magic on libtool and automake. 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 else
LIBS="-lcares $LIBS" LIBS="-lcares $LIBS"
fi fi

7
lib/Makefile.am
View File

@ -57,12 +57,19 @@ LIBCURL_LIBS = @LIBCURL_LIBS@
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file # $(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 # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include \ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/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 if SONAME_BUMP
# #

11
tests/libtest/Makefile.am
View File

@ -31,11 +31,22 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/include is for libcurl's external include files # $(top_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/config.h file # $(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_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 \ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
endif
LIBDIR = $(top_builddir)/lib LIBDIR = $(top_builddir)/lib

7
tests/server/Makefile.am
View File

@ -34,12 +34,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file # $(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 # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include \ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/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) # Makefile.inc provides the source defines (noinst_PROGRAMS, useful, *_SOURCES, and *_LDADD)
include Makefile.inc include Makefile.inc