1 diff -uNr cgit-0.10.old/cgit.mk cgit-0.10/cgit.mk
2 --- cgit-0.10.old/cgit.mk 2014-01-17 16:09:16.000000000 +0100
3 +++ cgit-0.10/cgit.mk 2014-02-25 18:26:04.391520820 +0100
5 LUA_MESSAGE := linking without specified Lua support
6 CGIT_CFLAGS += -DNO_LUA
8 -LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null)
9 -LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
10 -LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
11 -LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
12 -ifeq (JIT,$(LUA_IMPLEMENTATION))
13 - ifeq ($(strip $(LUAJIT_LIBS)),)
14 - $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
16 - LUA_MESSAGE := linking with selected LuaJIT
17 - CGIT_LIBS += $(LUAJIT_LIBS)
18 - CGIT_CFLAGS += $(LUAJIT_CFLAGS)
19 -else ifeq (VANILLA,$(LUA_IMPLEMENTATION))
20 - ifeq ($(strip $(LUA_LIBS)),)
21 - $(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
23 - LUA_MESSAGE := linking with selected Lua
24 - CGIT_LIBS += $(LUA_LIBS)
25 - CGIT_LIBS += $(LUA_CFLAGS)
26 -else ifneq ($(strip $(LUAJIT_LIBS)),)
27 - LUA_MESSAGE := linking with autodetected LuaJIT
28 - CGIT_LIBS += $(LUAJIT_LIBS)
29 - CGIT_CFLAGS += $(LUAJIT_CFLAGS)
30 -else ifneq ($(strip $(LUA_LIBS)),)
31 - LUA_MESSAGE := linking with autodetected Lua
32 +ifeq ($(LUA_PKGCONFIG),)
33 + LUA_PKGCONFIG := $(shell for pc in lua5.2 lua51 lua50; do \
34 + pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
36 + LUA_MODE := autodetected
38 + LUA_MODE := specified
40 +ifneq ($(LUA_PKGCONFIG),)
41 + LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
42 + LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
43 + LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
44 CGIT_LIBS += $(LUA_LIBS)
45 CGIT_CFLAGS += $(LUA_CFLAGS)