security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Don't build shmtest unless we have shm.

Browse Source
This commit is contained in:
David Shaw 2007-04-16 15:32:49 +00:00
parent 3a2e31ff19
commit eec94ac312
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2007-04-16 David Shaw <dshaw@jabberwocky.com> 2007-04-16 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Add a HAVE_SHM conditional.
* acinclude.m4: Use sysconf() if available to avoid a false * acinclude.m4: Use sysconf() if available to avoid a false
positive on HAVE_BROKEN_MLOCK when checking for page size. positive on HAVE_BROKEN_MLOCK when checking for page size.

2
configure.ac
View File

@ -1051,6 +1051,8 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then
[define if the shared memory interface should be made available]) [define if the shared memory interface should be made available])
fi fi
AM_CONDITIONAL(HAVE_SHM, test "$ac_cv_header_sys_shm_h" = yes)
dnl dnl
dnl check whether we have a random device dnl check whether we have a random device
dnl dnl

5
tools/ChangeLog
View File

@ -1,3 +1,8 @@
2007-04-16 David Shaw <dshaw@jabberwocky.com>
* Makefile.am (noinst_PROGRAMS): Don't build shmtest unless we
have shm.
2006-12-11 Werner Koch <wk@g10code.com> 2006-12-11 Werner Koch <wk@g10code.com>
* Makefile.am (AM_CPPFLAGS): Use in place of INCLUDES. Define * Makefile.am (AM_CPPFLAGS): Use in place of INCLUDES. Define

5
tools/Makefile.am
View File

@ -30,7 +30,6 @@ endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
bin_PROGRAMS = gpgsplit bin_PROGRAMS = gpgsplit
noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest make-dns-cert noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest make-dns-cert
@ -38,6 +37,10 @@ if HAVE_USTAR
bin_SCRIPTS = gpg-zip bin_SCRIPTS = gpg-zip
endif endif
if HAVE_SHM
noinst_PROGRAMS += shmtest
endif
gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@ gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@
mpicalc_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ mpicalc_LDADD = $(needed_libs) $(other_libs) @W32LIBS@
bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ @LIBREADLINE@ bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ @LIBREADLINE@