diff options
| author | Paul Eggert | 2017-08-04 22:46:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-08-04 22:47:05 -0700 |
| commit | b8748dd0932cbcf44bcbde8591f5cebad7eebfb1 (patch) | |
| tree | e6a09c879d36a427d04d48b05f8c287bd337f88f /lib | |
| parent | 0a24f47f0eeba688f92043ef8733e0f7d9836c18 (diff) | |
| download | emacs-b8748dd0932cbcf44bcbde8591f5cebad7eebfb1.tar.gz emacs-b8748dd0932cbcf44bcbde8591f5cebad7eebfb1.zip | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnulib.mk.in | 2 |
1 files changed, 0 insertions, 2 deletions
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@ | |||
| 546 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ | 546 | LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ |
| 547 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ | 547 | LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ |
| 548 | LIBGIF = @LIBGIF@ | 548 | LIBGIF = @LIBGIF@ |
| 549 | LIBGNUTLS3_CFLAGS = @LIBGNUTLS3_CFLAGS@ | ||
| 550 | LIBGNUTLS3_LIBS = @LIBGNUTLS3_LIBS@ | ||
| 551 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ | 549 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ |
| 552 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ | 550 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ |
| 553 | LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ | 551 | LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ |