From: Olof J. <ol...@et...> - 2013-11-04 21:10:42
|
As we have already determined the existence of lua, with the help of pkg-config --exists, we should accept that empty responses from pkg-config --cflags and pkg-config --libs are valid (this has been seen in the wild). Thanks to consus on IRC for reporting the issue. (This change also makes minor formatting adjustments.) --- build/lua-detect.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/lua-detect.mk b/build/lua-detect.mk index 4315b12..5c66406 100644 --- a/build/lua-detect.mk +++ b/build/lua-detect.mk @@ -27,7 +27,9 @@ ifeq ($(LUA_VERSION),5.0) LUA_VERSION= endif -LUA_LIBS := $(or $(shell pkg-config --libs lua$(LUA_VERSION)), $(error "pkg-config couldn't find linker flags for lua$(LUA_VERSION)!")) -LUA_INCLUDES := $(or $(shell pkg-config --cflags lua$(LUA_VERSION)), $(error "pkg-config couldn't find compiler flags for lua$(LUA_VERSION)!")) -LUA := $(or $(shell which lua$(LUA_VERSION)), $(error No lua$(LUA_VERSION) interpreter found!)) -LUAC := $(or $(shell which luac$(LUA_VERSION)), $(error No lua$(LUA_VERSION) compiler found!)) +LUA_LIBS := $(shell pkg-config --libs lua$(LUA_VERSION)) +LUA_INCLUDES := $(shell pkg-config --cflags lua$(LUA_VERSION)) +LUA := $(or $(shell which lua$(LUA_VERSION)), \ + $(error No lua$(LUA_VERSION) interpreter found!)) +LUAC := $(or $(shell which luac$(LUA_VERSION)), \ + $(error No lua$(LUA_VERSION) compiler found!)) -- 1.8.4.rc3 |