diff --git a/sdk/aws-autoloader.php b/sdk/aws-autoloader.php index 1003138a2..4c8cf78eb 100644 --- a/sdk/aws-autoloader.php +++ b/sdk/aws-autoloader.php @@ -2826,8 +2826,13 @@ } }, true); -require __DIR__ . '/Aws/functions.php'; -require __DIR__ . '/GuzzleHttp/functions_include.php'; +if ((!isset($CFG->libraries) && !file_exists($CFG->libraries . '/optional/aws/aws-sdk-php/src/functions.php')) + && !function_exists('Aws\constantly')) { + require_once __DIR__ . '/Aws/functions.php'; +} +if (!function_exists('GuzzleHttp\describe_type')) { + require_once __DIR__ . '/GuzzleHttp/functions_include.php'; +} require __DIR__ . '/GuzzleHttp/Psr7/functions_include.php'; require __DIR__ . '/GuzzleHttp/Promise/functions_include.php'; require __DIR__ . '/JmesPath/JmesPath.php';