diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:30 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:30 +0000 |
commit | 51188e459840af4dfb1af49f654c95feefa7be04 (patch) | |
tree | 694fa7b972ed90916d215567ccdd31c568ec4368 /res | |
parent | 3ca76344d15d97a110d1cbbe93093f2cc772a29c (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.2@242889 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 b842dec78..b8e33be14 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,7 +45,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: @@ -54,7 +54,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: |