diff options
| author | Paul Eggert | 2012-04-21 10:15:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-21 10:15:03 -0700 |
| commit | 9ee7d8b93cb143b473e6dffb708e777bc6fe5bd0 (patch) | |
| tree | bd36f3e122f26a705ee3ce60ffb98005c764b971 | |
| parent | 7dd51bf1c26ff6b830d7cfad78014742afcc2e2a (diff) | |
| download | emacs-9ee7d8b93cb143b473e6dffb708e777bc6fe5bd0.tar.gz emacs-9ee7d8b93cb143b473e6dffb708e777bc6fe5bd0.zip | |
Sync from gnulib version 4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc
dated 2011-10-07. Regenerating from current gnulib would be a
pervasive change, and currently the trunk isn't open to such changes.
* configure.in (WARN_CFLAGS): Remove; no longer needed now
that gnulib does it.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/gnulib.mk | 2 | ||||
| -rw-r--r-- | m4/gl-comp.m4 | 5 |
4 files changed, 14 insertions, 4 deletions
| @@ -1,3 +1,12 @@ | |||
| 1 | 2012-04-21 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Sync from gnulib version 4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc | ||
| 4 | dated 2011-10-07. Regenerating from current gnulib would be a | ||
| 5 | pervasive change, and currently the trunk isn't open to such changes. | ||
| 6 | * configure.in (WARN_CFLAGS): Remove; no longer needed now | ||
| 7 | that gnulib does it. | ||
| 8 | * lib/gnulib.mk, m4/gl-comp.m4: Regenerate. | ||
| 9 | |||
| 1 | 2012-04-21 Andreas Schwab <schwab@linux-m68k.org> | 10 | 2012-04-21 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 11 | ||
| 3 | * m4/gl-comp.m4: Update. (Bug#11285) | 12 | * m4/gl-comp.m4: Update. (Bug#11285) |
diff --git a/configure.in b/configure.in index 1554e10145f..c9592921e75 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -787,8 +787,6 @@ else | |||
| 787 | gl_WARN_ADD([-fdiagnostics-show-option]) | 787 | gl_WARN_ADD([-fdiagnostics-show-option]) |
| 788 | gl_WARN_ADD([-funit-at-a-time]) | 788 | gl_WARN_ADD([-funit-at-a-time]) |
| 789 | 789 | ||
| 790 | AC_SUBST([WARN_CFLAGS]) | ||
| 791 | |||
| 792 | AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) | 790 | AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) |
| 793 | AC_DEFINE([_FORTIFY_SOURCE], [2], | 791 | AC_DEFINE([_FORTIFY_SOURCE], [2], |
| 794 | [enable compile-time and run-time bounds-checking, and some warnings]) | 792 | [enable compile-time and run-time bounds-checking, and some warnings]) |
diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 154ae9882da..153ea11efe4 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | # the same distribution terms as the rest of that program. | 21 | # the same distribution terms as the rest of that program. |
| 22 | # | 22 | # |
| 23 | # Generated by gnulib-tool. | 23 | # Generated by gnulib-tool. |
| 24 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat | 24 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | MOSTLYCLEANFILES += core *.stackdump | 27 | MOSTLYCLEANFILES += core *.stackdump |
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4 index 42a0ed97234..73a26c41324 100644 --- a/m4/gl-comp.m4 +++ b/m4/gl-comp.m4 | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # DO NOT EDIT! GENERATED AUTOMATICALLY! | 1 | # DO NOT EDIT! GENERATED AUTOMATICALLY! |
| 2 | # Copyright (C) 2002-2012 Free Software Foundation, Inc. | 2 | # Copyright (C) 2002-2011 Free Software Foundation, Inc. |
| 3 | # | 3 | # |
| 4 | # This file is free software; you can redistribute it and/or modify | 4 | # This file is free software; you can redistribute it and/or modify |
| 5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
| @@ -62,6 +62,7 @@ AC_DEFUN([gl_EARLY], | |||
| 62 | # Code from module largefile: | 62 | # Code from module largefile: |
| 63 | AC_REQUIRE([AC_SYS_LARGEFILE]) | 63 | AC_REQUIRE([AC_SYS_LARGEFILE]) |
| 64 | # Code from module lstat: | 64 | # Code from module lstat: |
| 65 | # Code from module manywarnings: | ||
| 65 | # Code from module mktime: | 66 | # Code from module mktime: |
| 66 | # Code from module multiarch: | 67 | # Code from module multiarch: |
| 67 | # Code from module nocrash: | 68 | # Code from module nocrash: |
| @@ -100,6 +101,7 @@ AC_DEFUN([gl_EARLY], | |||
| 100 | # Code from module u64: | 101 | # Code from module u64: |
| 101 | # Code from module unistd: | 102 | # Code from module unistd: |
| 102 | # Code from module verify: | 103 | # Code from module verify: |
| 104 | # Code from module warnings: | ||
| 103 | ]) | 105 | ]) |
| 104 | 106 | ||
| 105 | # This macro should be invoked from ./configure.in, in the section | 107 | # This macro should be invoked from ./configure.in, in the section |
| @@ -216,6 +218,7 @@ fi | |||
| 216 | gl_TIME_MODULE_INDICATOR([time_r]) | 218 | gl_TIME_MODULE_INDICATOR([time_r]) |
| 217 | AC_REQUIRE([AC_C_INLINE]) | 219 | AC_REQUIRE([AC_C_INLINE]) |
| 218 | gl_UNISTD_H | 220 | gl_UNISTD_H |
| 221 | AC_SUBST([WARN_CFLAGS]) | ||
| 219 | gl_gnulib_enabled_dosname=false | 222 | gl_gnulib_enabled_dosname=false |
| 220 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false | 223 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false |
| 221 | gl_gnulib_enabled_pathmax=false | 224 | gl_gnulib_enabled_pathmax=false |