summaryrefslogtreecommitdiff
path: root/m4/curl-functions.m4
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-05-19 11:24:33 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-05-21 19:55:51 +0200
commit302d537423c0bf2429bd6691a775319c0dec0c10 (patch)
tree2c7c26a6cc9c4ffb5976ff95a8131062091984e2 /m4/curl-functions.m4
parentd5a2df5f1d41787ff7847466fee48a2fefba6fbd (diff)
downloadcurl-302d537423c0bf2429bd6691a775319c0dec0c10.tar.gz
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
Diffstat (limited to 'm4/curl-functions.m4')
-rw-r--r--m4/curl-functions.m43
1 files changed, 2 insertions, 1 deletions
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
])