diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:11 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:11 +0000 |
commit | d82adf08c7958dede2e688e65a62b510d5b8d991 (patch) | |
tree | f505c068e64dc53531f4e83ef072e83baaa51214 /res | |
parent | 061a813b99f77d08be8a8b6812559ef503385475 (diff) |
Merged revisions 242857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines
Merged revisions 242852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines
Restore FreeBSD to able-to-compile-ish-mode
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242885 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/Makefile b/res/Makefile index 597b61662..16216829b 100644 --- a/res/Makefile +++ b/res/Makefile @@ -39,7 +39,7 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o -ifneq ($(FLEX),:) +ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) ael/ael_lex.c: ael/ael.flex else ael/ael_lex.c: @@ -48,7 +48,7 @@ endif $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c) $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) -ifneq ($(BISON),:) +ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) ael/ael.tab.c ael/ael.tab.h: ael/ael.y else ael/ael.tab.c ael/ael.tab.h: |