From 801e7da121dc91ff6b0602ae68a10d910914e7d9 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 23 Feb 2010 10:57:38 -0700 Subject: [PATCH] warn-on-use: work with old autoconf Before autoconf documented the AS_VAR_* interfaces, it used to require the user to pre-expand the pushed macro name. Newer autoconf can see through macros, but this is one case where breaking the rule of thumb and underquoting does not hurt. * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Accomodate older AS_VAR semantics of autoconf 2.60. Reported by Bruno Haible. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ m4/warn-on-use.m4 | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f47da8c..501c267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-02-23 Eric Blake + warn-on-use: work with old autoconf + * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Accomodate older + AS_VAR semantics of autoconf 2.60. + Reported by Bruno Haible. + bootstrap: improve some comments * build-aux/bootstrap: Drop unneeded emacs hint. Add some clarification comments. diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index ab46422..42daae8 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,4 +1,4 @@ -# warn-on-use.m4 serial 1 +# warn-on-use.m4 serial 2 dnl Copyright (C) 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,12 +30,12 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl AC_CACHE_CHECK([whether $gl_func is declared without a macro], - [gl_Symbol], + gl_Symbol, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], address@hidden:@undef $gl_func (void) $gl_func;])], - [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) - AS_VAR_IF([gl_Symbol], [yes], + [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) + AS_VAR_IF(gl_Symbol, [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) dnl shortcut - if the raw declaration exists, then set a cache dnl variable to allow skipping any later AC_CHECK_DECL efforts -- 1.6.6.1