From 302d537423c0bf2429bd6691a775319c0dec0c10 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 19 May 2018 11:24:33 +0200 Subject: [PATCH] configure: replace AC_TRY_RUN with CURL_RUN_IFELSE ... and export LD_LIBRARY_PATH properly. This is a follow-up from 2d4c215. Fixes #2586 Reported-by: Bernhard Walle --- acinclude.m4 | 4 ++-- m4/curl-functions.m4 | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 69bb6c002..81c16f9b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2018, 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 @@ -2464,7 +2464,7 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [ dnl just run a program to verify that the libs checked for previous to this dnl point also is available run-time! AC_MSG_CHECKING([run-time libs availability]) - AC_TRY_RUN([ + CURL_RUN_IFELSE([ main() { return 0; diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 1bbde9ed5..49b4c7932 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -7020,7 +7020,8 @@ AC_DEFUN([CURL_RUN_IFELSE], [ AC_REQUIRE([AC_RUN_IFELSE])dnl old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4) LD_LIBRARY_PATH=$old # restore ])