From: Russell Bryant Date: Thu, 11 May 2006 21:24:54 +0000 (+0000) Subject: fix the build with astmm (issue #7139) X-Git-Tag: 1.4.0-beta1~1384 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad8ff708de2de9658b4bfb8894e5b8f3e3a2c8d3;p=thirdparty%2Fasterisk.git fix the build with astmm (issue #7139) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27023 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index f9e99d2f5e..d934b653e5 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,7 @@ OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I.. # *CLI> show memory allocations [filename] # *CLI> show memory summary [filename] -ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),) +ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),) TOPDIR_CFLAGS+=-include include/asterisk/astmm.h MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h endif diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index f4db2a6870..cca1799250 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -9,5 +9,5 @@ cat << END END TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g` for x in ${TMP}; do - echo "#define ${x}" + echo "#define ${x} 1" done