diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-06-03 13:55:01 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-06-03 13:55:01 +0200 |
| commit | 08d1a3f5fa8b36aa0f02ede9c0027ea03340a583 (patch) | |
| tree | 37dac654a18098c10e25d0c2c3fff9ef5c008a66 /m4/libunistring.m4 | |
| parent | df6774c09485e6b0f31f4659eb55d50c68c008a8 (diff) | |
| download | gnulib-08d1a3f5fa8b36aa0f02ede9c0027ea03340a583.tar.gz | |
Choose among AC_DEFUN_ONCE, AC_DEFUN in a way that aclocal understands.
Diffstat (limited to 'm4/libunistring.m4')
| -rw-r--r-- | m4/libunistring.m4 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 5e4e7d9eaa..2dfa268b9f 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,4 +1,4 @@ -# libunistring.m4 serial 7 +# libunistring.m4 serial 8 dnl Copyright (C) 2009-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, @@ -15,7 +15,19 @@ dnl LTLIBUNISTRING to empty. dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE for Autoconf >= 2.64, in order dnl to avoid warnings like dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required". -m4_version_prereq([2.64],[AC_DEFUN_ONCE],[AC_DEFUN])([gl_LIBUNISTRING], +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_libunistring_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])) +gl_libunistring_AC_DEFUN([gl_LIBUNISTRING], [ AC_BEFORE([$0], [gl_LIBUNISTRING_LIBSOURCE]) AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER]) |