aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2018-05-04 14:31:16 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-05-04 22:30:28 +0200
commit7663a7c2843c86ab232caaf25d09842d70a0b01d (patch)
tree8342964cb21e2deb76079ff55e9016d280ff6beb
parente9d9d1af8a512d4b4ed500308247766524b21763 (diff)
configure: put CURLDEBUG and DEBUGBUILD in lib/curl_config.h
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
-rw-r--r--m4/curl-compilers.m411
-rw-r--r--m4/curl-confopts.m43
2 files changed, 4 insertions, 10 deletions
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 20bdbd706..c1ae6a559 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -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
# you should have received as part of this distribution. The terms
@@ -1299,15 +1299,6 @@ AC_DEFUN([CURL_CHECK_CURLDEBUG], [
want_curldebug="no"
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
])
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
index 6dcd0f1a6..ad6acd8f0 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -114,6 +114,7 @@ AC_HELP_STRING([--disable-curldebug],[Disable curl debug memory tracking]),
dnl as a request to disable curldebug.
if test "$want_debug" = "yes"; then
AC_MSG_RESULT([(assumed) yes])
+ AC_DEFINE(CURLDEBUG, 1, [to enable curl debug memory tracking])
else
AC_MSG_RESULT([no])
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 want_curldebug to 'no'.
want_curldebug="yes"
+ AC_DEFINE(CURLDEBUG, 1, [to enable curl debug memory tracking])
AC_MSG_RESULT([yes])
;;
esac
@@ -164,6 +166,7 @@ AC_HELP_STRING([--disable-debug],[Disable debug build options]),
*)
dnl --enable-debug option used
want_debug="yes"
+ AC_DEFINE(DEBUGBUILD, 1, [enable debug build options])
;;
esac
AC_MSG_RESULT([$want_debug])