From 7934f2fc6610086013341d529c7243b2d436af3b Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 28 Jan 2009 09:16:10 -0700 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ m4/gnulib-common.m4 | 4 ++-- m4/pmccabe2html.m4 | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0eb833f7..119d5ad93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-30 Eric Blake + + 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 version-etc: use consistent URL formatting diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index fff9d0f96..50e399aa1 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -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 @@ m4_ifndef([m4_foreach_w], # 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])])]) diff --git a/m4/pmccabe2html.m4 b/m4/pmccabe2html.m4 index 5e207422d..2985f7c6d 100644 --- a/m4/pmccabe2html.m4 +++ b/m4/pmccabe2html.m4 @@ -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 @@ dnl From Simon Josefsson # Usage: gl_PMCCABE2HTML([]). AC_DEFUN([gl_PMCCABE2HTML], [ - AC_PROG_AWK + AC_REQUIRE([AC_PROG_AWK]) AC_PATH_PROG([PMCCABE], [pmccabe], [false]) ]) -- 2.11.0