summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-01-25 16:07:23 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-01-25 16:07:23 +0200
commitfa2a0367f26d5aca03fbfc360d987b49c816d9c4 (patch)
tree85b108f0e2aacce4c158e05eaa6a2ed3036439c7
parent75af33433f3ffbe25c81960d8d1888be7ce35418 (diff)
downloadsquark-fa2a0367f26d5aca03fbfc360d987b49c816d9c4.tar.bz2
squark-fa2a0367f26d5aca03fbfc360d987b49c816d9c4.tar.xz
build: fix lua module building, and disable -Werror
-rw-r--r--Make.rules2
-rw-r--r--src/Makefile6
2 files changed, 5 insertions, 3 deletions
diff --git a/Make.rules b/Make.rules
index 9fd4862..75d4a3f 100644
--- a/Make.rules
+++ b/Make.rules
@@ -70,7 +70,7 @@ INSTALL := install
INSTALLDIR := $(INSTALL) -d
CFLAGS ?= -g -O2
-CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
+CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
CFLAGS_ALL += $(CFLAGS)
LDFLAGS ?= -g
diff --git a/src/Makefile b/src/Makefile
index eb24877..d7df654 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,10 +14,12 @@ CFLAGS_config.o += -DSQUARK_VERSION=\"$(FULL_VERSION)\" \
-DLIBDIR=\"$(LIBDIR)\"
LIBS += -lrt
-CFLAGS_lua-squarkdb.o += $(shell pkg-config --cflags lua5.1)
+PKG_LUA ?= lua5.1
+
+CFLAGS_lua-squarkdb.o += $(shell pkg-config --cflags $(PKG_LUA))
LIBS_squark-filter += $(shell pkg-config --libs cmph)
LIBS_squark-auth-snmp += $(shell net-snmp-config --libs)
-LIBS_squarkdb.so += $(shell pkg-config --libs lua5.1)
+LIBS_squarkdb.so += $(shell pkg-config --libs $(PKG_LUA) cmph)
install:
$(INSTALLDIR) $(DESTDIR)$(BINDIR)