From 927868e8b93f508fe89ee82f618f4a1761366f70 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 29 Apr 2018 13:27:12 +0200
Subject: Move --enable-tests out of Python configure and flip the default.

---
 old-configure.in | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index d8a6d01f0..7d336d37f 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2256,6 +2256,7 @@ dnl ========================================================
 
 MOZ_ARG_HEADER(Application)
 
+ENABLE_TESTS=
 ENABLE_SYSTEM_EXTENSION_DIRS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
@@ -3793,6 +3794,32 @@ if test -n "$MOZ_UPDATER"; then
     AC_DEFINE(MOZ_UPDATER)
 fi
 
+dnl ========================================================
+dnl Build the tests?
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(tests,
+[  --enable-tests          Build test libraries & programs],
+    ENABLE_TESTS=1,
+    ENABLE_TESTS= )
+
+if test -n "$ENABLE_TESTS"; then
+    GTEST_HAS_RTTI=0
+    AC_DEFINE(ENABLE_TESTS)
+    AC_DEFINE_UNQUOTED(GTEST_HAS_RTTI, 0)
+    AC_SUBST(GTEST_HAS_RTTI)
+    if test -n "$_WIN32_MSVC"; then
+          AC_DEFINE_UNQUOTED(_VARIADIC_MAX, 10)
+    fi
+    if test "${OS_TARGET}" = "Android"; then
+        AC_DEFINE(GTEST_OS_LINUX_ANDROID)
+        AC_DEFINE(GTEST_USE_OWN_TR1_TUPLE)
+        AC_DEFINE_UNQUOTED(GTEST_HAS_CLONE, 0)
+        AC_SUBST(GTEST_OS_LINUX_ANDROID)
+        AC_SUBST(GTEST_USE_OWN_TR1_TUPLE)
+        AC_SUBST(GTEST_HAS_CLONE)
+    fi
+fi
+
 dnl ========================================================
 dnl parental controls (for Windows Vista)
 dnl ========================================================
@@ -5245,6 +5272,8 @@ AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 
+AC_SUBST(ENABLE_TESTS)
+
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_SPELLCHECK)
-- 
cgit v1.2.3