git: update to v2.3.2

[cgit.git] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index b5cc7a226a6b18d2d3ff33abb0faa5d23420d08e..5048b09af10d179b307db0052abb75ea88f3aea3 100644 (file)
--- a/cgit.mk
+++ b/cgit.mk
@@ -25,10 +25,51 @@ ifdef NO_C99_FORMAT
        CFLAGS += -DNO_C99_FORMAT
 endif
 
+ifdef NO_LUA
+       LUA_MESSAGE := linking without specified Lua support
+       CGIT_CFLAGS += -DNO_LUA
+else
+ifeq ($(LUA_PKGCONFIG),)
+       LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
+                       pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
+                       done)
+       LUA_MODE := autodetected
+else
+       LUA_MODE := specified
+endif
+ifneq ($(LUA_PKGCONFIG),)
+       LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
+       LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
+       LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
+       CGIT_LIBS += $(LUA_LIBS)
+       CGIT_CFLAGS += $(LUA_CFLAGS)
+else
+       LUA_MESSAGE := linking without autodetected Lua support
+       NO_LUA := YesPlease
+       CGIT_CFLAGS += -DNO_LUA
+endif
+
+endif
+
+# Add -ldl to linker flags on non-BSD systems.
+ifeq ($(findstring BSD,$(uname_S)),)
+       CGIT_LIBS += -ldl
+endif
+
+# glibc 2.1+ offers sendfile which the most common C library on Linux
+ifeq ($(uname_S),Linux)
+       HAVE_LINUX_SENDFILE = YesPlease
+endif
+
+ifdef HAVE_LINUX_SENDFILE
+       CGIT_CFLAGS += -DHAVE_LINUX_SENDFILE
+endif
+
 CGIT_OBJ_NAMES += cgit.o
 CGIT_OBJ_NAMES += cache.o
 CGIT_OBJ_NAMES += cmd.o
 CGIT_OBJ_NAMES += configfile.o
+CGIT_OBJ_NAMES += filter.o
 CGIT_OBJ_NAMES += html.o
 CGIT_OBJ_NAMES += parsing.o
 CGIT_OBJ_NAMES += scan-tree.o
@@ -60,7 +101,6 @@ $(CGIT_VERSION_OBJS): $(CGIT_PREFIX)VERSION
 $(CGIT_VERSION_OBJS): EXTRA_CPPFLAGS = \
        -DCGIT_VERSION='"$(CGIT_VERSION)"'
 
-
 # Git handles dependencies using ":=" so dependencies in CGIT_OBJ are not
 # handled by that and we must handle them ourselves.
 cgit_dep_files := $(foreach f,$(CGIT_OBJS),$(dir $f).depend/$(notdir $f).d)
@@ -87,4 +127,5 @@ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
        $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
 
 $(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
-       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+       @echo 1>&1 "    * $(LUA_MESSAGE)"
+       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)