assorted build-system improvements

diff --git a/.gitignore b/.gitignore
index 9468328..1f94321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 *.pch
 *.gch
 /pch.mk
+src/admin_rpl.hpp

diff --git a/Makefile.am b/Makefile.am
index 43acfad..f3dbf74 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ LDADD = $(LIBUV_LIBS) $(LIBTLS_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS)
 src/admin.$(OBJEXT): src/admin_rpl.hpp
 src/admin_rpl.hpp: src/ircfmt.hpp rplbindings.lua
        @if test "x$(LUA)" = xno; then echo "No lua interpreter! Please set LUA="; exit 1; fi
-       $(AM_V_GEN)$(LUA) $(srcdir)/rplbindings.lua <$< >$@
+       $(AM_V_GEN)$(LUA) `test -f rplbindings.lua || echo $(srcdir)/`rplbindings.lua <$< >$@
 MAINTAINERCLEANFILES = src/admin_rpl.hpp
 
 dist_ircddata_DATA = \
@@ -46,7 +46,7 @@ dist_ircdlua_DATA = \
        lua/spam.lua
 
 if DATA_IN_PREFIX
-AM_CXXFLAGS += -DIRCDDATADIR='"$(ircddatadir)"' -Dircdluadir='"$(ircdluadir)"'
+AM_CXXFLAGS += -DIRCDDATADIR='"$(ircddatadir)"' -DIRCDLUADIR='"$(ircdluadir)"'
 endif
 
 EXTRA_DIST = \
@@ -61,7 +61,7 @@ EXTRA_DIST = \
 
 .PHONY: valgrind
 valgrind: ircd
-       valgrind --leak-check=full --show-leak-kinds=all -s --suppressions=$(srcdir)/libtls.supp ./ircd
+       valgrind --leak-check=full --show-leak-kinds=all -s --suppressions=`test --f libtls.supp || echo $(srcdir)/`libtls.supp ./ircd
 
 .PHONY: pch
 if ENABLE_PCH
@@ -77,4 +77,5 @@ endif
 
 .PHONY: gperf
 gperf:
-       sed -n 's/.*MATCH_COMMAND("\([^"]*\)").*/\1/p' $(srcdir)/src/irc.cpp | gperf -m1 -k1-3
+       @if test "x$(GPERF)" = xno; then echo "No gperf! Please set GPERF="; exit 1; fi
+       $(SED) -n 's/.*MATCH_COMMAND("\([^"]*\)").*/\1/p' `test -f src/irc.cpp || echo $(srcdir)/`src/irc.cpp | $(GPERF) -m1 -k1-3

diff --git a/configure.ac b/configure.ac
index d3c2a68..b2359eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,5 +61,8 @@ PKG_CHECK_MODULES(SQLITE3, [sqlite3])
 
 AC_ARG_VAR([LUA], [the Lua 5.4 interpreter])
 AS_IF([test "x$LUA" = x], [AC_PATH_PROGS([LUA], [lua5.4 lua54], [no])])
+AC_ARG_VAR([GPERF], [gperf program])
+AS_IF([test "xGPERF" = x], [AC_PATH_PROGS([GPERF], [gperf], [no])])
+AC_PROG_SED
 
 AC_OUTPUT