From b8748dd0932cbcf44bcbde8591f5cebad7eebfb1 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Fri, 4 Aug 2017 22:46:31 -0700
Subject: Merge from gnulib

This incorporates:
2017-08-04 manywarnings: port to 64-bit GCC builds of Emacs
2017-08-01 manywarnings: port to 32-bit GCC bug
* lib/gnulib.mk.in: Regenerate.
* m4/manywarnings.m4: Copy from gnulib.
---
 lib/gnulib.mk.in | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 11c1ecf05ad..a385c8c8384 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -546,8 +546,6 @@ LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
 LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
 LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
 LIBGIF = @LIBGIF@
-LIBGNUTLS3_CFLAGS = @LIBGNUTLS3_CFLAGS@
-LIBGNUTLS3_LIBS = @LIBGNUTLS3_LIBS@
 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
 LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
-- 
cgit v1.2.1