Unverified Commit 302d5374 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: replace AC_TRY_RUN with CURL_RUN_IFELSE 

... and export LD_LIBRARY_PATH properly. This is a follow-up from
2d4c2152.

Fixes #2586
Reported-by: Bernhard Walle
parent d5a2df5f

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -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;

m4/curl-functions.m4

+2 −1
Original line number Diff line number Diff line
@@ -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

])