[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113945: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r113945: Merge from gnulib. |
Date: |
Mon, 19 Aug 2013 05:23:09 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113945
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-18 22:23:05 -0700
message:
Merge from gnulib.
This incorporates:
2013-08-15 warnings: minor optimization
2013-08-15 warnings: check -Wfoo rather than -Wno-foo
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
m4/warnings.m4 warnings.m4-20120409074357-zmklh5i58niw7z33-2
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-15 16:37:15 +0000
+++ b/ChangeLog 2013-08-19 05:23:05 +0000
@@ -1,3 +1,9 @@
+2013-08-19 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2013-08-15 warnings: minor optimization
+ 2013-08-15 warnings: check -Wfoo rather than -Wno-foo
+
2013-08-15 Ken Brown <address@hidden>
* configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
=== modified file 'm4/warnings.m4'
--- a/m4/warnings.m4 2013-05-16 07:10:39 +0000
+++ b/m4/warnings.m4 2013-08-19 05:23:05 +0000
@@ -1,4 +1,4 @@
-# warnings.m4 serial 8
+# warnings.m4 serial 10
dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,15 +25,24 @@
AC_DEFUN([gl_COMPILER_OPTION_IF],
[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
+AS_LITERAL_IF([$1],
+ [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
+ [gl_positive="$1"
+case $gl_positive in
+ -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
+esac
+m4_pushdef([gl_Positive], [$gl_positive])])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
gl_save_compiler_FLAGS="$gl_Flags"
- gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors
$1"])
+ gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
+ [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
[AS_VAR_SET(gl_Warn, [yes])],
[AS_VAR_SET(gl_Warn, [no])])
gl_Flags="$gl_save_compiler_FLAGS"
])
AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
+m4_popdef([gl_Positive])dnl
AS_VAR_POPDEF([gl_Flags])dnl
AS_VAR_POPDEF([gl_Warn])dnl
])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113945: Merge from gnulib.,
Paul Eggert <=