moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

configure: put CURLDEBUG and DEBUGBUILD in lib/curl_config.h

Browse Source 
They are removed from the compiler flags.

This ensures that make dependency tracking will force a rebuild whenever
configure --enable-debug or --enable-curldebug changes.

Closes #2548
This commit is contained in:
Frank Gevaerts 2018-05-04 14:31:16 +02:00 committed by Daniel Stenberg
parent e9d9d1af8a
commit 7663a7c284
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
m4/curl-compilers.m4
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -1299,15 +1299,6 @@ AC_DEFUN([CURL_CHECK_CURLDEBUG], [
want_curldebug="no" want_curldebug="no"
fi fi
fi fi
#
if test "$want_curldebug" = "yes"; then
CPPFLAGS="-DCURLDEBUG $CPPFLAGS"
squeeze CPPFLAGS
fi
if test "$want_debug" = "yes"; then
CPPFLAGS="-DDEBUGBUILD $CPPFLAGS"
squeeze CPPFLAGS
fi
]) ])

3
m4/curl-confopts.m4
View File

@ -114,6 +114,7 @@ AC_HELP_STRING([--disable-curldebug],[Disable curl debug memory tracking]),
dnl as a request to disable curldebug. dnl as a request to disable curldebug.
if test "$want_debug" = "yes"; then if test "$want_debug" = "yes"; then
AC_MSG_RESULT([(assumed) yes]) AC_MSG_RESULT([(assumed) yes])
AC_DEFINE(CURLDEBUG, 1, [to enable curl debug memory tracking])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@ -130,6 +131,7 @@ AC_HELP_STRING([--disable-curldebug],[Disable curl debug memory tracking]),
dnl --disable-curldebug had been given setting shell variable dnl --disable-curldebug had been given setting shell variable
dnl want_curldebug to 'no'. dnl want_curldebug to 'no'.
want_curldebug="yes" want_curldebug="yes"
AC_DEFINE(CURLDEBUG, 1, [to enable curl debug memory tracking])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
;; ;;
esac esac
@ -164,6 +166,7 @@ AC_HELP_STRING([--disable-debug],[Disable debug build options]),
*) *)
dnl --enable-debug option used dnl --enable-debug option used
want_debug="yes" want_debug="yes"
AC_DEFINE(DEBUGBUILD, 1, [enable debug build options])
;; ;;
esac esac
AC_MSG_RESULT([$want_debug]) AC_MSG_RESULT([$want_debug])