From 65d07eece1daee6460bd2d4fcb85253ce9b05ea5 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 1 May 2020 13:07:11 +0200
Subject: Add configure option to disable tests

---
 Makefile.am  | 5 ++++-
 configure.ac | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 1cf0fc6..6499f07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = crypto ssl tls include apps tests man
+SUBDIRS = crypto ssl tls include apps man
+if ENABLE_TESTS
+SUBDIRS += tests
+endif
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index e584113..7b16ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,10 @@ AC_ARG_ENABLE([extratests],
 	AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms]))
 AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes])
 
+AC_ARG_ENABLE([tests],
+	AS_HELP_STRING([--enable-tests], [Enable tests]))
+AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
+
 # Add CPU-specific alignment flags
 old_cflags=$CFLAGS
 CFLAGS="$CFLAGS -I$srcdir/include"
-- 
cgit v1.2.3-55-g6feb


From 1980c68e636f33e5e5addbd642b62e73ee2922b8 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 1 May 2020 16:15:14 +0200
Subject: enable tests by default

---
 configure.ac | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7b16ac5..367938a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,14 @@ AC_ARG_ENABLE([extratests],
 AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes])
 
 AC_ARG_ENABLE([tests],
-	AS_HELP_STRING([--enable-tests], [Enable tests]))
-AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
+       [AS_HELP_STRING([--disable-tests], [Enable tests (default: yes)])],
+       [if test "x$enable-tests" = "xyes"; then
+		have_tests="yes"
+	 else
+		have_tests="no"
+	 fi],
+       [have_tests="yes"])
+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_tests" = xyes])
 
 # Add CPU-specific alignment flags
 old_cflags=$CFLAGS
-- 
cgit v1.2.3-55-g6feb


From 0542dd27cac69093717144db334cf98a20779aed Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 1 May 2020 21:03:06 +0200
Subject: enable tests by default

---
 configure.ac | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 367938a..0221351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,12 +67,11 @@ AC_ARG_ENABLE([extratests],
 AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes])
 
 AC_ARG_ENABLE([tests],
-       [AS_HELP_STRING([--disable-tests], [Enable tests (default: yes)])],
-       [if test "x$enable-tests" = "xyes"; then
-		have_tests="yes"
-	 else
-		have_tests="no"
-	 fi],
+       [AS_HELP_STRING([--disable-tests], [Disable tests @<:@default=yes@:>@])],
+       [
+        if ! test "x${enable_tests}" = "xyes"; then
+		enable_tests="no"
+	fi],
        [have_tests="yes"])
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_tests" = xyes])
 
-- 
cgit v1.2.3-55-g6feb


From 84af4092648b1deb71e1eb2a75272155be9604c0 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 2 May 2020 14:35:34 +0200
Subject: missing change of variable

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0221351..0afbe0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,8 @@ AC_ARG_ENABLE([tests],
         if ! test "x${enable_tests}" = "xyes"; then
 		enable_tests="no"
 	fi],
-       [have_tests="yes"])
-AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_tests" = xyes])
+       [enable_tests="yes"])
+AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
 
 # Add CPU-specific alignment flags
 old_cflags=$CFLAGS
-- 
cgit v1.2.3-55-g6feb


From 1553d87c6cbdc01a1b3ae028492561af3ac2aa59 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 2 May 2020 15:13:13 +0200
Subject: improved default help value

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0afbe0f..888ca19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_ARG_ENABLE([extratests],
 AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes])
 
 AC_ARG_ENABLE([tests],
-       [AS_HELP_STRING([--disable-tests], [Disable tests @<:@default=yes@:>@])],
+       [AS_HELP_STRING([--disable-tests], [Disable tests @<:@default=enabled@:>@])],
        [
         if ! test "x${enable_tests}" = "xyes"; then
 		enable_tests="no"
-- 
cgit v1.2.3-55-g6feb