chiark / gitweb /
Portability fixes for acctdump:
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Oct 2014 23:43:32 +0000 (23:43 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Oct 2014 23:43:32 +0000 (23:43 +0000)
* Do not build on platforms with no <sys/acct.h>

cprogs/Makefile
debian/changelog

index 64d4ba4..cd82ab1 100644 (file)
@@ -28,16 +28,26 @@ include ../settings.make
 RWBUFFER_SIZE_MB=16
 
 PROGRAMS=              readbuffer writebuffer with-lock-ex xbatmon-simple \
-                       summer watershed rcopy-repeatedly xduplic-copier \
-                       acctdump
+                       summer watershed rcopy-repeatedly xduplic-copier
 SUIDSBINPROGRAMS=      really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1 \
                        xduplic-copier.1
-MAN8PAGES=             trivsoundd.8 really.8 acctdump.8
+MAN8PAGES=             trivsoundd.8 really.8
 BUILTTXTDOCS=          watershed.txt
 TXTDOCS=               $(BUILTTXTDOCS)
 
+acctdump_cc_out:=$(shell \
+       printf "\#include <sys/types.h>\n\#include <sys/acct.h>" \
+               | $(CC) -E - 2>&1 >/dev/null \
+)
+ifeq (,$(acctdump_cc_out))
+PROGRAMS+=acctdump
+MAN8PAGES+=acctdump.8
+else
+$(warning Not building acctdump: $(acctdump_cc_out))
+endif
+
 TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)
 
 all:           $(TARGETS)
index 2e9cb13..99e5999 100644 (file)
@@ -1,3 +1,10 @@
+chiark-utils (4.4.1) unstable; urgency=low
+
+  Portability fixes for acctdump:
+  * Do not build on platforms with no <sys/acct.h>
+
+ --
+
 chiark-utils (4.4.0) unstable; urgency=low
 
   New utilities: