Unverified Commit 7663a7c2 authored by Frank Gevaerts's avatar Frank Gevaerts Committed by Daniel Stenberg
Browse files

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
parent e9d9d1af

m4/curl-compilers.m4

+1 −10
Original line number Diff line number Diff line
@@ -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

])

m4/curl-confopts.m4

+3 −0
Original line number Diff line number Diff line
@@ -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])