summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2021-09-13 01:17:16 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2021-09-13 01:17:16 +0000
commit816614da2c10803b0d68555b048780d005330e5f (patch)
treef85440051c2677b8ca393deb0549d10f46610121
parent3940ef321512d588391646d35d38ef83d2478487 (diff)
downloadmpfr-816614da2c10803b0d68555b048780d005330e5f.tar.gz
[configure.ac] Reverted r14572, which was solving an issue about the
ordering of macros with ax_pthread.m4 29. But the change done in ax_pthread.m4 29 https://github.com/autoconf-archive/autoconf-archive/commit/2567e0ce0f3a11b535c6b527386197fb49ff172b was incorrect (see comments at this URL) and was reverted in ax_pthread.m4 31: https://github.com/autoconf-archive/autoconf-archive/commit/59008cc7f85e1982eb298e1c424c2e6ad5942c4a (Debian/unstable had the buggy version during a couple of weeks). git-svn-id: https://scm.gforge.inria.fr/anonscm/svn/mpfr/branches/4.1@14577 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r--configure.ac13
1 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 245acd2eb..d46a1fbd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,17 +28,6 @@ https://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
dnl Add check-news when it checks for more than 15 lines
AC_INIT([MPFR],[4.1.1-dev])
-dnl AC_CANONICAL_HOST is needed by this configure.ac file.
-dnl AC_CANONICAL_TARGET is not explicitly needed, but may be required by
-dnl some other macros (e.g. AX_PTHREAD 29, committed on 2021-02-19) and
-dnl must be called quite early in order to avoid the following warning:
-dnl warning: AC_ARG_PROGRAM was called before AC_CANONICAL_TARGET
-dnl (we don't use AC_ARG_PROGRAM explicitly, but again, it is invoked by
-dnl another macro, apparently AM_INIT_AUTOMAKE).
-dnl So we need to call AC_CANONICAL_TARGET here, even if we don't use it.
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
dnl Older Automake versions than 1.13 may still be supported, but no longer
dnl tested, and many things have changed in 1.13. Moreover the INSTALL file
dnl and MPFR manual assume that MPFR has been built using Automake 1.13+
@@ -80,6 +69,8 @@ fi
dnl Basic Autoconf macros. At this point, they must not make Autoconf
dnl choose a compiler because of the CC and CFLAGS setup from gmp.h!
+AC_CANONICAL_HOST
+
AC_PROG_EGREP
AC_PROG_SED