From 36b46736852fa7e2dee3a9fc1c1150b3d6f32685 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 25 Jan 2010 20:18:15 +0000
Subject: 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/trunk@242857 f38db490-d61c-443f-a65b-d21fe96a405b
---
 res/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res/Makefile')

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:
-- 
cgit v1.2.3