From 93bab7a99f82e2ceadca14a7a6a2440cd69fb8c8 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 10 Mar 2025 23:59:15 +0100 Subject: [PATCH] [#3325] Removed remaining coroutine references --- COPYING | 4 ---- configure.ac | 3 +-- ext/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index 34246fad93..932016dfb6 100644 --- a/COPYING +++ b/COPYING @@ -383,10 +383,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice ---end of MPL 2.0 license --------------------------------------------------- -The ext/coroutine code is externally maintained and distributed under -the Boost Software License, Version 1.0. (See its accompanying file -LICENSE_1_0.txt.) - Sample TLS clients and servers are used for tests and are included in src/lib/asiolink/testutils. The Botan version was ported from the OpenSSL one with the help of the Botan team. The files are diff --git a/configure.ac b/configure.ac index bff8a83ee1..7b786cfc8d 100644 --- a/configure.ac +++ b/configure.ac @@ -1085,7 +1085,7 @@ if test $enable_gtest != "no"; then CPPFLAGS=$CPPFLAGS_SAVED fi -# Provide the ability to include our coroutine header or other headers from ext. +# Provide the ability to include headers from ext. CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_builddir)" # Doesn't seem to be required? @@ -1514,7 +1514,6 @@ AC_CONFIG_FILES([doc/sphinx/Makefile]) AC_CONFIG_FILES([doc/devel/Makefile]) AC_CONFIG_FILES([ext/Makefile]) AC_CONFIG_FILES([ext/gtest/Makefile]) -AC_CONFIG_FILES([ext/coroutine/Makefile]) AC_CONFIG_FILES([fuzz/Makefile]) AC_CONFIG_FILES([fuzz/input/Makefile]) AC_CONFIG_FILES([fuzz/tests/Makefile]) diff --git a/ext/Makefile.am b/ext/Makefile.am index 6cfbdee32f..b2685166c6 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = coroutine +SUBDIRS = . if HAVE_GTEST_SOURCE SUBDIRS += gtest