warnings: Add AC_SUBST.

2008-11-11  Paolo Bonzini  <bonzini@gnu.org>

	* m4/warnings.m4 (gl_WARN_INIT): Substitute WARN_CFLAGS.
	(gl_WARN_ADD): Substitute $2 if literal.

diff --git a/ChangeLog b/ChangeLog
index 70ed1bcabab49b54b694aa592ee1a9b70fd5d21e..23d956765216e359cc4f10268844904ec2561cb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Paolo Bonzini  <bonzini@gnu.org>
+
+       * m4/warnings.m4 (gl_WARN_INIT): Substitute WARN_CFLAGS.
+       (gl_WARN_ADD): Substitute $2 if literal.
+
 2008-11-11  Paolo Bonzini  <bonzini@gnu.org>
 
        * m4/warning.m4: Remove.

diff --git a/m4/warnings.m4 b/m4/warnings.m4
index 634b183a735db904eb0b39b0decc05078087e38e..ca9bf5e9deaea43832c0fc1bd636599b51a8801c 100644 (file)
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -9,8 +9,8 @@ dnl From Simon Josefsson
 # gl_WARN_INIT
 # Initializes WARN_CFLAGS variable.
 AC_DEFUN([gl_WARN_INIT],
-[
-  AC_ARG_VAR(WARN_CFLAGS, [C compiler warning flags])
+[AC_SUBST([WARN_CFLAGS])dnl
+AC_ARG_VAR([WARN_CFLAGS], [C compiler warning flags])
 ])
 
 # gl_AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
@@ -47,4 +47,5 @@ AS_VAR_PUSHDEF([gl_Flags], m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]))dnl
 gl_AS_VAR_IF([gl_Warn], [yes], [gl_AS_VAR_APPEND([gl_Flags], [" $1"])])
 AS_VAR_POPDEF([gl_Flags])dnl
 AS_VAR_POPDEF([gl_Warn])dnl
+AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])dnl
 ])