]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
curl-functions.m4: remove inappropriate AC_REQUIRE
authorRoss Burton <ross.burton@intel.com>
Fri, 20 Mar 2020 21:16:24 +0000 (21:16 +0000)
committerJay Satiro <raysatiro@yahoo.com>
Sat, 21 Mar 2020 21:31:32 +0000 (17:31 -0400)
AC_REQUIRE means "if this macro hasn't been executed already, execute
it".  So in a wrapper around AC_RUN_IFELSE, AC_REQUIRE(AC_RUN_IFELSE)
isn't correct at that will execute AC_RUN_IFELSE without any arguments.

With autoconf 2.69 this is basically a no-op, but with autoconf 2.70,
AC_RUN_IFELSE without a default value when cross-compiling is fatal.
The result is that curl with autoconf 2.70 cannot cross-compile.

Fixes https://github.com/curl/curl/issues/5126
Closes https://github.com/curl/curl/pull/5130

m4/curl-functions.m4

index e773f670090b7962bff7757d5bec629b463b851e..b4e64cf33e0c2c4f0bc45e0ce92376e346f13363 100644 (file)
@@ -7289,8 +7289,6 @@ dnl CURL_LIBRARY_PATH variable. It keeps the LD_LIBRARY_PATH
 dnl changes contained within this macro.
 
 AC_DEFUN([CURL_RUN_IFELSE], [
-   AC_REQUIRE([AC_RUN_IFELSE])dnl
-
    old=$LD_LIBRARY_PATH
    LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old
    export LD_LIBRARY_PATH