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>

diff --git a/ChangeLog b/ChangeLog
index c0eb833f70bf2c1c05068bb2122f65733c0457fa..119d5ad9303c1ce8304fc6036378e9b1ad0699e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index fff9d0f9675e0dd412141766ba360a2157c13f50..50e399aa1c18f37ff4f1737df0db707d6ecef6a6 100644 (file)
--- 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 5e207422d330c5b3aba6d59ee4c4b306f8115d6d..2985f7c6d234d882ba2fe90e36ef49211df6c0ff 100644 (file)
--- 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])
 ])