Mercurial > gnulib
changeset 30796:84a0230a4f69
fix more require-before-expand issues
* m4/pmccabe2html.m4 (gl_PMCCABE2HTML): Require, rather than
expand, AC_PROG_AWK.
* m4/gnulib-common.m4 (AC_PROG_MKDIR_P): Use AC_DEFUN_ONCE.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Wed, 28 Jan 2009 09:16:10 -0700 |
| parents | d4f3de726bea |
| children | 117df2c192eb |
| files | ChangeLog m4/gnulib-common.m4 m4/pmccabe2html.m4 |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 30 06:17:28 2009 -0800 +++ b/ChangeLog Wed Jan 28 09:16:10 2009 -0700 @@ -1,3 +1,10 @@ +2009-01-30 Eric Blake <ebb9@byu.net> + + fix more require-before-expand issues + * m4/pmccabe2html.m4 (gl_PMCCABE2HTML): Require, rather than + expand, AC_PROG_AWK. + * m4/gnulib-common.m4 (AC_PROG_MKDIR_P): Use AC_DEFUN_ONCE. + 2009-01-28 Eric Blake <ebb9@byu.net> version-etc: use consistent URL formatting
--- a/m4/gnulib-common.m4 Fri Jan 30 06:17:28 2009 -0800 +++ b/m4/gnulib-common.m4 Wed Jan 28 09:16:10 2009 -0700 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 9 +# gnulib-common.m4 serial 10 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -53,7 +53,7 @@ # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. # Remove this macro when we can assume autoconf >= 2.60. m4_ifdef([AC_PROG_MKDIR_P], [], [ - AC_DEFUN([AC_PROG_MKDIR_P], + AC_DEFUN_ONCE([AC_PROG_MKDIR_P], [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])])
--- a/m4/pmccabe2html.m4 Fri Jan 30 06:17:28 2009 -0800 +++ b/m4/pmccabe2html.m4 Wed Jan 28 09:16:10 2009 -0700 @@ -1,5 +1,5 @@ -# pmccabe2html.m4 serial 1 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# pmccabe2html.m4 serial 2 +dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +9,6 @@ # Usage: gl_PMCCABE2HTML([]). AC_DEFUN([gl_PMCCABE2HTML], [ - AC_PROG_AWK + AC_REQUIRE([AC_PROG_AWK]) AC_PATH_PROG([PMCCABE], [pmccabe], [false]) ])