aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog5
-rw-r--r--tools/Makefile.am5
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 00fe0b79d..f62c68ac3 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-16 David Shaw <[email protected]>
+
+ * Makefile.am (noinst_PROGRAMS): Don't build shmtest unless we
+ have shm.
+
2006-12-11 Werner Koch <[email protected]>
* Makefile.am (AM_CPPFLAGS): Use in place of INCLUDES. Define
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8a9c03560..d90009205 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -30,7 +30,6 @@ endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
-
bin_PROGRAMS = gpgsplit
noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest make-dns-cert
@@ -38,6 +37,10 @@ if HAVE_USTAR
bin_SCRIPTS = gpg-zip
endif
+if HAVE_SHM
+noinst_PROGRAMS += shmtest
+endif
+
gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@
mpicalc_LDADD = $(needed_libs) $(other_libs) @W32LIBS@
bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ @LIBREADLINE@