aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acinclude.m44
-rw-r--r--m4/curl-functions.m43
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, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, 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
])