diff options
| author | David Shaw <[email protected]> | 2007-04-16 15:32:49 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-04-16 15:32:49 +0000 |
| commit | eec94ac3122cafbd17b98cea5afdbada2ba6bba3 (patch) | |
| tree | c212e3471018337a0b7f68d17d2c0b1b8d7d75eb | |
| parent | Use sysconf() when possible as not all platforms have getpagesize(). (diff) | |
| download | gnupg-eec94ac3122cafbd17b98cea5afdbada2ba6bba3.tar.gz gnupg-eec94ac3122cafbd17b98cea5afdbada2ba6bba3.zip | |
Don't build shmtest unless we have shm.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
4 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2007-04-16 David Shaw <[email protected]> + * configure.ac: Add a HAVE_SHM conditional. + * acinclude.m4: Use sysconf() if available to avoid a false positive on HAVE_BROKEN_MLOCK when checking for page size. diff --git a/configure.ac b/configure.ac index 10ffb7c16..029d2ead8 100644 --- a/configure.ac +++ b/configure.ac @@ -1051,6 +1051,8 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then [define if the shared memory interface should be made available]) fi +AM_CONDITIONAL(HAVE_SHM, test "$ac_cv_header_sys_shm_h" = yes) + dnl dnl check whether we have a random device dnl 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@ |