From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Wed, 13 Jun 2018 09:41:40 +0000 (+0300)
Subject: Fix quoting in autoconf ifunc test
X-Git-Tag: nettle_3.4.1rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8514df12b20e0c399f84429d95a81b66c82b3ddd;p=thirdparty%2Fnettle.git

Fix quoting in autoconf ifunc test

* aclocal.m4 (NETTLE_CHECK_IFUNC): fix quoting so that
  AC_LINK_IFELSE/AC_TRY_LINK is defined outside of this test.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
(cherry picked from commit e07e5605b3da65e07c7fe5fcf1ce3b050595d1b5)
---

diff --git a/ChangeLog b/ChangeLog
index 6b14e822..9c3ba473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2018-06-17  Niels Möller  <nisse@lysator.liu.se>
 
 	Backported from master branch.
+	* aclocal.m4 (NETTLE_CHECK_IFUNC): Fix quoting. Patch contributed
+	by Dmitry Eremin-Solenikov.
 	* testsuite/symbols-test: Exclude ____chkstk_darwin symbols,
 	produced by Apple's Xcode 10 compiler. Patch contributed by
 	Dominyk Tiller.
diff --git a/aclocal.m4 b/aclocal.m4
index 783dbc49..772f68e8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -650,7 +650,7 @@ AC_DEFUN([NETTLE_CHECK_IFUNC],
 [AC_REQUIRE([AC_PROG_CC])
 AC_CACHE_CHECK([for ifunc support],
   nettle_cv_link_ifunc,
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([
 static int
 foo_imp(int x)
 {
@@ -671,7 +671,7 @@ int foo (int x) __attribute__ ((ifunc("foo_resolv")));
 
 ])],
 [nettle_cv_link_ifunc=yes],
-[nettle_cv_link_ifunc=no]))
+[nettle_cv_link_ifunc=no])])
 AH_TEMPLATE([HAVE_LINK_IFUNC], [Define if compiler and linker supports __attribute__ ifunc])
 if test "x$nettle_cv_link_ifunc" = xyes ; then
   AC_DEFINE(HAVE_LINK_IFUNC)