2006-09-06 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Wed, 6 Sep 2006 21:09:36 +0000 (21:09 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Wed, 6 Sep 2006 21:09:36 +0000 (21:09 +0000)
* configure.ac: New automake conditional RUN_GPG_TESTS.

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

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

ChangeLog
configure.ac
tests/ChangeLog
tests/Makefile.am

index 73170cb..210943c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-06  Marcus Brinkmann  <marcus@g10code.de>
+
+       * configure.ac: New automake conditional RUN_GPG_TESTS.
+
 2006-09-06  Werner Koch  <wk@g10code.com>
 
        * configure.ac: Define _ASSUAN_ONLY_GPG_ERRORS.  Require Assuan
index afcc77d..bcce906 100644 (file)
@@ -1232,6 +1232,8 @@ AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
 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 )
 
 
 #
index c7ce33d..e7e7c7f 100644 (file)
@@ -1,3 +1,8 @@
+2006-09-06  Marcus Brinkmann  <marcus@g10code.de>
+
+       * Makefile.am (openpgp): New variable.
+       (SUBDIRS): Conditionalize openpgp on RUN_GPG_TESTS.
+
 2006-08-21  Werner Koch  <wk@g10code.com>
 
        * Makefile.am (SUBDIRS): New.
index c4f7dd4..a3cfbbd 100644 (file)
 #
 #SUBDIRS = . ${pkits}
 
-SUBDIRS = openpgp
+if RUN_GPG_TESTS
+openpgp = openpgp
+else
+openpgp =
+endif
+
+SUBDIRS = ${openpgp}
 
 GPGSM = ../sm/gpgsm