generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: don't build libhostname unless shared libcurl is built

Browse Source
This commit is contained in:
Yang Tse 2010-08-09 09:33:53 +02:00
parent 50a1d5ee1c
commit b24e872502
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -2461,6 +2461,13 @@ AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1)
CURL_CHECK_LIB_ARES CURL_CHECK_LIB_ARES
AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes) AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes)
if test "x$enable_shared" = "xyes"; then
build_libhostname=yes
else
build_libhostname=no
fi
AM_CONDITIONAL(BUILD_LIBHOSTNAME, test x$tests_use_libhostname = xyes)
CURL_CHECK_OPTION_THREADED_RESOLVER CURL_CHECK_OPTION_THREADED_RESOLVER
if test "x$want_thres" = xyes && test "x$want_ares" = xyes; then if test "x$want_thres" = xyes && test "x$want_ares" = xyes; then

4
tests/libtest/Makefile.am
View File

@ -64,7 +64,11 @@ include Makefile.inc
# Preloading of libhostname allows host name overriding, # Preloading of libhostname allows host name overriding,
# this is used to make some tests machine independent. # this is used to make some tests machine independent.
if BUILD_LIBHOSTNAME
noinst_LTLIBRARIES = libhostname.la noinst_LTLIBRARIES = libhostname.la
else
noinst_LTLIBRARIES =
endif
if NO_UNDEFINED if NO_UNDEFINED
# The -no-undefined flag is crucial to build fine on some platforms # The -no-undefined flag is crucial to build fine on some platforms