>From 6e9f94e9b4478b6f32f2da10891239187aed5ea2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 25 Jul 2020 17:42:18 -0700 Subject: [PATCH 1/2] libgmp: remove HAVE_GMP, LIB_GMP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * m4/libgmp.m4 (gl_LIBGMP): Do not define HAVE_GMP and LIB_GMP, as they’re redundant. I’ll adjust GNU Coreutils accordingly. --- ChangeLog | 6 ++++++ m4/libgmp.m4 | 13 ++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0db10799c..44ce5301b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-07-26 Paul Eggert + + libgmp: remove HAVE_GMP, LIB_GMP + * m4/libgmp.m4 (gl_LIBGMP): Do not define HAVE_GMP and LIB_GMP, as + they’re redundant. I’ll adjust GNU Coreutils accordingly. + 2020-07-26 Bruno Haible inttypes: Remove support for AIX 4. diff --git a/m4/libgmp.m4 b/m4/libgmp.m4 index 7a8742e0c..e48b5c2c2 100644 --- a/m4/libgmp.m4 +++ b/m4/libgmp.m4 @@ -1,4 +1,4 @@ -# libgmp.m4 serial 2 +# libgmp.m4 serial 3 # Configure the GMP library or a replacement. dnl Copyright 2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -8,8 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl gl_LIBGMP dnl Searches for an installed libgmp. dnl If found, it sets and AC_SUBSTs HAVE_LIBGMP=yes and the LIBGMP and LTLIBGMP -dnl variables, and augments the CPPFLAGS variable, and #defines HAVE_LIBGMP -dnl and HAVE_GMP to 1. +dnl variables, and augments the CPPFLAGS variable, and #defines HAVE_LIBGMP. dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBGMP=no and LIBGMP and LTLIBGMP to dnl empty. @@ -44,17 +43,9 @@ AC_DEFUN([gl_LIBGMP], esac if test $HAVE_LIBGMP = yes; then GMP_H= - dnl This is redundant, as HAVE_LIBGMP is also defined to 1. - AC_DEFINE([HAVE_GMP], [1], - [Define to 1 if you have the GMP library instead of just the - mini-gmp replacement.]) else GMP_H=gmp.h fi AC_SUBST([GMP_H]) AM_CONDITIONAL([GL_GENERATE_GMP_H], [test -n "$GMP_H"]) - - dnl For backward compatibility. - LIB_GMP="$LIBGMP" - AC_SUBST([LIB_GMP]) ]) -- 2.17.1