Merged revisions 77410 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 26 Jul 2007 21:24:42 +0000 (21:24 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 26 Jul 2007 21:24:42 +0000 (21:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77410 | russell | 2007-07-26 16:23:23 -0500 (Thu, 26 Jul 2007) | 10 lines

AST_DEVMODE was defined in trunk, but not in 1.4.  When Asterisk is compiled
under dev mode, AST_DEVMODE will get defined in buildopts.h.  Change 1.4 to
define it in the same way that trunk does.  Also, revert the change that added
this define in the Makefile

The advantage to doing it this way is that buildopts.h gets installed when
you install Asterisk.  Then, when building any out of tree modules, or
building asterisk-addons, these modules know which options the rest of Asterisk
was built with.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77411 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 697c18a..fe6211d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declar
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -DAST_DEVMODE
+  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)