Update configure.in; support both baz and tla; avoid using dirent.

[srvx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 68b680427af82cbf0baeb5a2e8d788e8d2673700..8cdf7bb98c21ddaa2b198ec9cf032e6101d5d087 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,30 @@
 AM_CPPFLAGS = @RX_INCLUDES@
 LIBS = @LIBS@ @RX_LIBS@
 
-ARCH_REVISION=$(shell tla logs -f | tail -n 1)
 noinst_PROGRAMS = srvx
 EXTRA_PROGRAMS = checkdb globtest
 noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
 EXTRA_DIST = $(noinst_DATA)
 BUILT_SOURCES = arch-version.h
 noinst_HEADERS = arch-version.h
-arch-version.h:
-       @if [ -e $@ ] ; then OLD_REVISION=`cat $@` ; else OLD_REVISION="" ; fi ; \
-       ARCH_REVISION=`tla logs -f | tail -n 1` ; \
-       VERSION_CONTENTS="#define ARCH_VERSION \"$$ARCH_REVISION\"" ; \
-       if [ "z" != "z$$ARCH_REVISION" -a "z$$OLD_REVISION" != "z$$VERSION_CONTENTS" ] ; then \
-           echo "Putting new arch version into $@" ; \
-           echo $$VERSION_CONTENTS > $@ ; \
+
+if HAS_GNU_ARCH
+.PHONY: checkversion
+arch-version.h: checkversion
+checkversion:
+       @$(GNU_ARCH) logs -f >/dev/null || exit 0; \
+       TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
+       echo "#define ARCH_VERSION \"`$(GNU_ARCH) logs -f | tail -n 1`\"" >> $$TMPFILE ; \
+       if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \
+           rm $$TMPFILE ; \
+        else \
+           echo "Putting new arch version into arch-version.h" ; \
+           rm -f arch-version.h ; \
+           mv $$TMPFILE arch-version.h ; \
        fi
+endif
 
-EXTRA_srvx_SOURCES = proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+EXTRA_srvx_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
 srvx_LDADD = @MODULE_OBJS@
 srvx_DEPENDENCIES = @MODULE_OBJS@
 srvx_SOURCES = \