c-ares' --enable-debug --enable-curldebug decoupling follow-up
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index 9c82948..b15b110 100644
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 55
+# serial 56
dnl CARES_CHECK_COMPILER
@@ -1153,6 +1153,11 @@
CPPFLAGS="$CPPFLAGS -DCURLDEBUG"
squeeze CPPFLAGS
fi
+ #
+ if test "$want_debug" = "yes"; then
+ CPPFLAGS="$CPPFLAGS -DDEBUGBUILD"
+ squeeze CPPFLAGS
+ fi
])
diff --git a/ares/m4/cares-confopts.m4 b/ares/m4/cares-confopts.m4
index d265a4d..cc03a09 100644
--- a/ares/m4/cares-confopts.m4
+++ b/ares/m4/cares-confopts.m4
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
-# serial 4
+# serial 5
dnl CARES_CHECK_OPTION_CURLDEBUG
@@ -27,7 +27,7 @@
AC_DEFUN([CARES_CHECK_OPTION_CURLDEBUG], [
AC_BEFORE([$0],[CARES_CHECK_CURLDEBUG])dnl
- AC_MSG_CHECKING([whether to enable curl debug memory tracking requested])
+ AC_MSG_CHECKING([whether to enable curl debug memory tracking])
OPT_CURLDEBUG_BUILD="default"
AC_ARG_ENABLE(curldebug,
AC_HELP_STRING([--enable-curldebug],[Enable curl debug memory tracking])
@@ -66,8 +66,8 @@
AC_DEFUN([CARES_CHECK_OPTION_DEBUG], [
AC_BEFORE([$0],[CARES_CHECK_OPTION_WARNINGS])dnl
+ AC_BEFORE([$0],[CARES_CHECK_OPTION_CURLDEBUG])dnl
AC_BEFORE([$0],[CARES_CHECK_PROG_CC])dnl
- AC_BEFORE([$0],[CARES_CHECK_CURLDEBUG])dnl
AC_MSG_CHECKING([whether to enable debug build options])
OPT_DEBUG_BUILD="default"
AC_ARG_ENABLE(debug,