summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2012-08-17 04:43:15 +0200
committerWerner Koch <wk@gnupg.org>2012-08-24 09:37:23 +0200
commit1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f (patch)
tree40ad55b861c0967051c9271d7a024900ea595ca0 /Makefile.am
parentFix left over use of jnlib on some platforms (diff)
downloadgnupg2-1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f.tar.xz
gnupg2-1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f.zip
Fix build system for Android by disabling tests since its x-compiled
* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New. (AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname. * Makefile.am: Depend tests on new RUN_TESTS conditional.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 6207d7bb9..c5ac11c4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,10 +82,10 @@ else
doc =
endif
-if HAVE_W32_SYSTEM
-tests =
-else
+if RUN_TESTS
tests = tests
+else
+tests =
endif
SUBDIRS = m4 gl include common ${kbx} \