diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:34:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:41:01 +0100 |
| commit | f4c79b3c08b4b16f504a049b2ef14a238e94508f (patch) | |
| tree | 54f859757b8693eb80ebfa23d444d9525053dd51 /m4/gnulib-common.m4 | |
| parent | 54eb59cf4948482461e41f73c0a5b1f9c7081326 (diff) | |
| download | guile-f4c79b3c08b4b16f504a049b2ef14a238e94508f.tar.gz | |
Update Gnulib; use the `func' module.
Update Gnulib to v0.0-3575-g128e4b8.
* m4/gnulib-cache.m4: Add `func'.
Diffstat (limited to 'm4/gnulib-common.m4')
| -rw-r--r-- | m4/gnulib-common.m4 | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index b7812a896..80ba26332 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 12 +# gnulib-common.m4 serial 13 dnl Copyright (C) 2007-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, @@ -61,9 +61,16 @@ m4_ifndef([AS_VAR_IF], [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])]) # AC_PROG_MKDIR_P -# 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], [], [ +# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix +# for interoperability with automake-1.9.6 from autoconf-2.62. +# Remove this macro when we can assume autoconf >= 2.62 or +# autoconf >= 2.60 && automake >= 1.10. +m4_ifdef([AC_PROG_MKDIR_P], [ + dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. + m4_define([AC_PROG_MKDIR_P], + m4_defn([AC_PROG_MKDIR_P])[ + AC_SUBST([MKDIR_P])])], [ + dnl For autoconf < 2.60: Backport of 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)' |