From 91e01ae6f7dde746551d2c59acff838e07fb5d0c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Jan 2017 00:30:14 +0000 Subject: gmp-src instead of gmp-gmp_version git-svn-id: svn://tug.org/texlive/trunk@42922 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/gmp/ChangeLog | 7 +++++++ Build/source/libs/gmp/configure | 2 +- Build/source/libs/gmp/m4/gmp-alloca.m4 | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'Build/source') diff --git a/Build/source/libs/gmp/ChangeLog b/Build/source/libs/gmp/ChangeLog index 1b1d3dbb30f..09533b7c2eb 100644 --- a/Build/source/libs/gmp/ChangeLog +++ b/Build/source/libs/gmp/ChangeLog @@ -1,3 +1,8 @@ +2017-01-11 Karl Berry + + * m4/gmp-alloca.m4: use gmp-src instead of gmp-6.1.2. + Found by Akira. + 2016-12-16 Akira Kakuto Import gmp-6.1.2. @@ -53,3 +58,5 @@ 2014-03-31 Taco Hoekwater Imported gmp-5.1.3. + +(This ChangeLog file public domain.) diff --git a/Build/source/libs/gmp/configure b/Build/source/libs/gmp/configure index 5342f26e5db..2323f4f2cef 100755 --- a/Build/source/libs/gmp/configure +++ b/Build/source/libs/gmp/configure @@ -6148,7 +6148,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "gmp-tmp.h" -#include "$srcdir/gmp-6.1.2/gmp-impl.h" +#include "$srcdir/gmp-src/gmp-impl.h" int main () { diff --git a/Build/source/libs/gmp/m4/gmp-alloca.m4 b/Build/source/libs/gmp/m4/gmp-alloca.m4 index 2fc59023a88..ea220e5d251 100644 --- a/Build/source/libs/gmp/m4/gmp-alloca.m4 +++ b/Build/source/libs/gmp/m4/gmp-alloca.m4 @@ -1,9 +1,12 @@ +# $Id$ # Autoconf macros for the GNU MP Library. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. # -# Copyright (C) 2014 Peter Breitenlohner +# Copyright 2017 Karl Berry +# Copyright 2014 Peter Breitenlohner # Extracted from gmp-6.0.0/acinclude.m4 and adapted for TeX Live. # +# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +24,7 @@ _GMP_HEADER_ALLOCA AC_CACHE_CHECK([for alloca (via gmp-impl.h)], [gmp_cv_func_alloca], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "gmp-tmp.h" -#include "$srcdir/gmp-]gmp_version[/gmp-impl.h"]], +#include "$srcdir/gmp-src/gmp-impl.h"]], [[char *p = (char *) alloca (1);]])], [gmp_cv_func_alloca=yes], [gmp_cv_func_alloca=no])]) -- cgit v1.2.3