|
|
|
|
@ -1179,97 +1179,6 @@ squeeze() { |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl CARES_CHECK_CURLDEBUG |
|
|
|
|
dnl ------------------------------------------------- |
|
|
|
|
dnl Settings which depend on configure's curldebug given |
|
|
|
|
dnl option, and other additional configure pre-requisites. |
|
|
|
|
dnl Using the curl debug memory tracking feature in c-ares |
|
|
|
|
dnl is a hack that actually can only be used/enabled when |
|
|
|
|
dnl c-ares is built directly in curl's CVS tree, as a static |
|
|
|
|
dnl library or as a shared one on those systems on which |
|
|
|
|
dnl shared libraries support undefined symbols, along with |
|
|
|
|
dnl an equally configured libcurl. |
|
|
|
|
|
|
|
|
|
AC_DEFUN([CARES_CHECK_CURLDEBUG], [ |
|
|
|
|
AC_REQUIRE([XC_LIBTOOL])dnl |
|
|
|
|
AC_REQUIRE([CARES_SHFUNC_SQUEEZE])dnl |
|
|
|
|
cares_builddir=`pwd` |
|
|
|
|
supports_curldebug="unknown" |
|
|
|
|
if test "$want_curldebug" = "yes"; then |
|
|
|
|
if test "x$enable_shared" != "xno" && |
|
|
|
|
test "x$enable_shared" != "xyes"; then |
|
|
|
|
AC_MSG_WARN([unknown enable_shared setting.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
if test "x$enable_static" != "xno" && |
|
|
|
|
test "x$enable_static" != "xyes"; then |
|
|
|
|
AC_MSG_WARN([unknown enable_static setting.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
if test "$supports_curldebug" != "no"; then |
|
|
|
|
if test "$enable_shared" = "yes" && |
|
|
|
|
test "x$xc_lt_shlib_use_no_undefined" = 'xyes'; then |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
AC_MSG_WARN([shared library does not support undefined symbols.]) |
|
|
|
|
fi |
|
|
|
|
if test ! -f "$srcdir/../include/curl/curlbuild.h.dist"; then |
|
|
|
|
AC_MSG_WARN([c-ares source not embedded in curl's CVS tree.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
elif test ! -f "$srcdir/../include/curl/Makefile.in"; then |
|
|
|
|
AC_MSG_WARN([curl's buildconf has not been run.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
elif test ! -f "$cares_builddir/../libcurl.pc" || |
|
|
|
|
test ! -f "$cares_builddir/../include/curl/curlbuild.h"; then |
|
|
|
|
AC_MSG_WARN([curl's configure has not been run.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
elif test ! -f "$cares_builddir/../lib/curl_config.h"; then |
|
|
|
|
AC_MSG_WARN([libcurl's curl_config.h is missing.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
elif test ! -f "$cares_builddir/../config.status"; then |
|
|
|
|
AC_MSG_WARN([curl's config.status is missing.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
if test "$supports_curldebug" != "no"; then |
|
|
|
|
grep '^#define USE_ARES' "$cares_builddir/../lib/curl_config.h" >/dev/null |
|
|
|
|
if test "$?" -ne "0"; then |
|
|
|
|
AC_MSG_WARN([libcurl configured without c-ares support.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
if test "$supports_curldebug" != "no"; then |
|
|
|
|
grep 'CPPFLAGS.*CURLDEBUG' "$cares_builddir/../config.status" >/dev/null |
|
|
|
|
if test "$?" -ne "0"; then |
|
|
|
|
AC_MSG_WARN([libcurl configured without curldebug support.]) |
|
|
|
|
supports_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
# |
|
|
|
|
if test "$want_curldebug" = "yes"; then |
|
|
|
|
AC_MSG_CHECKING([if curl debug memory tracking can be enabled]) |
|
|
|
|
test "$supports_curldebug" = "no" || supports_curldebug="yes" |
|
|
|
|
AC_MSG_RESULT([$supports_curldebug]) |
|
|
|
|
if test "$supports_curldebug" = "no"; then |
|
|
|
|
AC_MSG_WARN([cannot enable curl debug memory tracking.]) |
|
|
|
|
want_curldebug="no" |
|
|
|
|
fi |
|
|
|
|
fi |
|
|
|
|
# |
|
|
|
|
if test "$want_curldebug" = "yes"; then |
|
|
|
|
dnl TODO: Verify if the BUILDING_LIBCURL definition is still required. |
|
|
|
|
AC_DEFINE(BUILDING_LIBCURL, 1, [when building as static part of libcurl]) |
|
|
|
|
CPPFLAGS="-DCURLDEBUG $CPPFLAGS" |
|
|
|
|
squeeze CPPFLAGS |
|
|
|
|
fi |
|
|
|
|
# |
|
|
|
|
if test "$want_debug" = "yes"; then |
|
|
|
|
CPPFLAGS="-DDEBUGBUILD $CPPFLAGS" |
|
|
|
|
squeeze CPPFLAGS |
|
|
|
|
fi |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl CARES_CHECK_COMPILER_HALT_ON_ERROR |
|
|
|
|
dnl ------------------------------------------------- |
|
|
|
|
dnl Verifies if the compiler actually halts after the |
|
|
|
|
|
Brad House
4 years ago