[svn] GnuPG - r4478 - in branches/STABLE-BRANCH-1-4: . tools

[svn author dshaw]

Author: dshaw
Date: 2007-04-16 17:32:49 +0200 (Mon, 16 Apr 2007)
New Revision: 4478

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/tools/ChangeLog
   branches/STABLE-BRANCH-1-4/tools/Makefile.am
Log:
Don't build shmtest unless we have shm.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2007-04-16 13:37:09 UTC (rev 4477)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2007-04-16 15:32:49 UTC (rev 4478)
@@ -1,5 +1,7 @@
 2007-04-16  David Shaw  <dshaw at jabberwocky.com>
 
+	* 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.
 

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2007-04-16 13:37:09 UTC (rev 4477)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2007-04-16 15:32:49 UTC (rev 4478)
@@ -1051,6 +1051,8 @@
             [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

Modified: branches/STABLE-BRANCH-1-4/tools/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/tools/ChangeLog	2007-04-16 13:37:09 UTC (rev 4477)
+++ branches/STABLE-BRANCH-1-4/tools/ChangeLog	2007-04-16 15:32:49 UTC (rev 4478)
@@ -1,3 +1,8 @@
+2007-04-16  David Shaw  <dshaw at jabberwocky.com>
+
+	* Makefile.am (noinst_PROGRAMS): Don't build shmtest unless we
+	have shm.
+
 2006-12-11  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (AM_CPPFLAGS): Use in place of INCLUDES.  Define

Modified: branches/STABLE-BRANCH-1-4/tools/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/tools/Makefile.am	2007-04-16 13:37:09 UTC (rev 4477)
+++ branches/STABLE-BRANCH-1-4/tools/Makefile.am	2007-04-16 15:32:49 UTC (rev 4478)
@@ -30,7 +30,6 @@
 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 @@
 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@