diff options
| author | Simon McVittie <smcv@debian.org> | 2013-05-19 21:19:36 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-08-28 11:03:02 +0100 |
| commit | 37fbbb0c19b6ca6e466693f65c363c6b80caaa1c (patch) | |
| tree | d0c31dc5ccbb2549d6bc4ba55e88202a64d9e6d1 /Makefile | |
| parent | cd23d424b8e76bc1df24773b60d564839a41bf74 (diff) | |
Find Speex via user override, pkg-config or default search path
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1009,10 +1009,13 @@ ifeq ($(USE_VOIP),1) CLIENT_CFLAGS += -DUSE_VOIP SERVER_CFLAGS += -DUSE_VOIP ifeq ($(USE_INTERNAL_SPEEX),1) - CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include + SPEEX_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include else - CLIENT_LIBS += -lspeex -lspeexdsp + SPEEX_CFLAGS ?= $(shell pkg-config --silence-errors --cflags speex speexdsp || true) + SPEEX_LIBS ?= $(shell pkg-config --silence-errors --libs speex speexdsp || echo -lspeex -lspeexdsp) endif + CLIENT_CFLAGS += $(SPEEX_CFLAGS) + CLIENT_LIBS += $(SPEEX_LIBS) endif ifeq ($(USE_INTERNAL_ZLIB),1) |