[svn] GnuPG - r4242 - in trunk: . tests

[svn author marcus]

Author: marcus
Date: 2006-09-06 23:09:36 +0200 (Wed, 06 Sep 2006)
New Revision: 4242

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/tests/ChangeLog
   trunk/tests/Makefile.am
Log:
2006-09-06  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: New automake conditional RUN_GPG_TESTS.

tests/
2006-09-06  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (openpgp): New variable.
	(SUBDIRS): Conditionalize openpgp on RUN_GPG_TESTS.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-09-06 20:57:57 UTC (rev 4241)
+++ trunk/ChangeLog	2006-09-06 21:09:36 UTC (rev 4242)
@@ -1,3 +1,7 @@
+2006-09-06  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: New automake conditional RUN_GPG_TESTS.
+
 2006-09-06  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Define _ASSUAN_ONLY_GPG_ERRORS.  Require Assuan

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-09-06 20:57:57 UTC (rev 4241)
+++ trunk/configure.ac	2006-09-06 21:09:36 UTC (rev 4242)
@@ -1232,6 +1232,8 @@
 AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
 AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
 
+AM_CONDITIONAL(RUN_GPG_TESTS,
+	test x$cross_compiling = xno -a "$build_gpg" = yes )
 
 
 #

Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog	2006-09-06 20:57:57 UTC (rev 4241)
+++ trunk/tests/ChangeLog	2006-09-06 21:09:36 UTC (rev 4242)
@@ -1,3 +1,8 @@
+2006-09-06  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Makefile.am (openpgp): New variable.
+	(SUBDIRS): Conditionalize openpgp on RUN_GPG_TESTS.
+
 2006-08-21  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (SUBDIRS): New.

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2006-09-06 20:57:57 UTC (rev 4241)
+++ trunk/tests/Makefile.am	2006-09-06 21:09:36 UTC (rev 4242)
@@ -29,8 +29,14 @@
 #
 #SUBDIRS = . ${pkits}
 
-SUBDIRS = openpgp
+if RUN_GPG_TESTS
+openpgp = openpgp
+else
+openpgp =
+endif
 
+SUBDIRS = ${openpgp}
+
 GPGSM = ../sm/gpgsm