From 6bc30095442918b4f76fb4ccca58bb140f52c818 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 11 Feb 2014 17:49:19 -0800 Subject: [PATCH] fix minor configure error for debug builds redux 1. Backed out change from commit 8178acfe. 2. AX_DEBUG calling AX_ADD_AM_MACRO incorrectly. Syntax should be AX_ADD_AM_MACRO( VAR += value ), not AX_ADD_AM_MACRO( value, VAR ). --- m4/ax_append_to_file.m4 | 2 +- m4/ax_debug.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/ax_append_to_file.m4 b/m4/ax_append_to_file.m4 index 15395178c..f9f54e088 100644 --- a/m4/ax_append_to_file.m4 +++ b/m4/ax_append_to_file.m4 @@ -23,5 +23,5 @@ AC_DEFUN([AX_APPEND_TO_FILE],[ AC_REQUIRE([AX_FILE_ESCAPES]) -printf -- "$2\n" >> "$1" +printf "$2\n" >> "$1" ]) diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4 index 5ea3c3594..7696a1147 100644 --- a/m4/ax_debug.m4 +++ b/m4/ax_debug.m4 @@ -52,8 +52,8 @@ AC_DEFUN([AX_DEBUG], [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], [ax_enable_debug=yes AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) - AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) - AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], + AX_ADD_AM_MACRO([AM_YFLAGS += --debug]) + AX_ADD_AM_MACRO([AM_CPPFLAGS += -D_GLIBCXX_DEBUG])], [ax_enable_debug=no AC_SUBST([MCHECK]) AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])