diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-06-09 17:58:34 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-06-09 17:58:34 +0000 |
| commit | eba8d6d5f5be7a6a410b90903fb3965a46c5b86d (patch) | |
| tree | 34090e79b486d512e8c275fef1016ac3d5da0c7c /ares | |
| parent | 744dceaffe4f79293b6bdd9eefe64ca83c701876 (diff) | |
c-ares' --enable-debug --enable-curldebug decoupling follow-up
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/m4/cares-compilers.m4 | 7 | ||||
| -rw-r--r-- | ares/m4/cares-confopts.m4 | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4 index 9c8294877..b15b1103f 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 @@ AC_DEFUN([CARES_CHECK_CURLDEBUG], [ 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 d265a4d18..cc03a09d6 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 @@ dnl shell variable want_curldebug value as appropriate. 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 @@ dnl variable want_debug value as appropriate. 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, |