From cefc2e68975586c5e0e88c95201b856707a1398d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 8 Jan 2022 15:40:04 +0100 Subject: [PATCH] curl-functions.m4: revert DYLD_LIBRARY_PATH tricks in CURL_RUN_IFELSE Mostly reverts ba0657c343f, but now instead just run the plain macro on darwin. The approach as used on other platforms is simply not necessary on macOS. Fixes #8229 Reported-by: Ryan Schmidt Closes #8247 --- m4/curl-functions.m4 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 157cdd9050..e2cfd2f14f 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -6516,11 +6516,7 @@ dnl changes contained within this macro. AC_DEFUN([CURL_RUN_IFELSE], [ case $host_os in darwin*) - old=$DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export DYLD_LIBRARY_PATH AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4) - DYLD_LIBRARY_PATH=$old # restore ;; *) old=$LD_LIBRARY_PATH -- 2.47.3