Start 0.11.x branch

[project/luci.git] / build / gccconfig.mk

diff --git a/build/gccconfig.mk b/build/gccconfig.mk
index 0e4de2795f6886769880d3c26f2b787e0b444ca6..97d19bde35db2ba495f2f73550b013c8f3252ccb 100644 (file)
--- a/build/gccconfig.mk
+++ b/build/gccconfig.mk
@@ -1,8 +1,8 @@
 OS ?= $(shell uname)
 
-LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1)
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua)
 LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
-LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1)
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua)
 
 CC = gcc
 AR = ar
@@ -10,7 +10,7 @@ RANLIB = ranlib
 CFLAGS = -O2
 FPIC = -fPIC
 EXTRA_CFLAGS = --std=gnu99
-WFLAGS = -Wall -Werror -pedantic
+WFLAGS = -Wall -pedantic
 CPPFLAGS =
 COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
 ifeq ($(OS),Darwin)
@@ -18,5 +18,5 @@ ifeq ($(OS),Darwin)
 else
   SHLIB_FLAGS = -shared
 endif
-LINK = $(CC)
+LINK = $(CC) $(LDFLAGS)