Skip to content
Snippets Groups Projects
Commit 80b1a195 authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

don't blow up if multiple copies of the headers are found

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 452f87a4
Branches
Tags
No related merge requests found
...@@ -33,7 +33,7 @@ else ...@@ -33,7 +33,7 @@ else
endif endif
SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex
SPEEX_SYSTEM_HEADERS:=$(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h)) SPEEX_SYSTEM_HEADERS:=$(firstword $(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h)))
ifeq (${SPEEX_SYSTEM_HEADERS},) ifeq (${SPEEX_SYSTEM_HEADERS},)
MODS:=$(filter-out codec_speex.so,$(MODS)) MODS:=$(filter-out codec_speex.so,$(MODS))
else else
...@@ -48,7 +48,7 @@ else ...@@ -48,7 +48,7 @@ else
endif endif
LIBGSM_PATH:=/usr/local/include /usr/include LIBGSM_PATH:=/usr/local/include /usr/include
LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h)) LIBGSM_SYSTEM_HEADERS:=$(firstword $(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h)))
ifneq ($(LIBGSM_SYSTEM_HEADERS),) ifneq ($(LIBGSM_SYSTEM_HEADERS),)
LIBGSM=-lgsm LIBGSM=-lgsm
LIBGSMT= LIBGSMT=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment