diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-15 15:44:55 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-15 15:44:55 +0100 |
| commit | 60fe7d3d124f9b3f3b580432f44acbc6f4bcd7b7 (patch) | |
| tree | cec95fb0c77caaf2ac24eaa89eedceacd04e5fb7 /m4 | |
| parent | 33c836b2ad72c1384ba0a8983989322b88e6bfa2 (diff) | |
| parent | 26432142c64229f6c11c833aa8019e672593d2c1 (diff) | |
| download | automake-60fe7d3d124f9b3f3b580432f44acbc6f4bcd7b7.tar.gz | |
Merge branch 'ac-config-macro-dirs'
* ac-config-macro-dirs:
tests: AC_CONFIG_MACRO_DIRS: ignore inevitable failures with old autoconf
aclocal: AC_CONFIG_MACRO_DIRS: work around autom4te option parsing bugs
aclocal: tracing AC_CONFIG_MACRO_DIRS can work with older autoconf as well
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/internal/ac-config-macro-dirs.m4 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4 new file mode 100644 index 000000000..530e655c3 --- /dev/null +++ b/m4/internal/ac-config-macro-dirs.m4 @@ -0,0 +1,15 @@ +# Support AC_CONFIG_MACRO_DIRS with older autoconf. -*- Autoconf -*- +# FIXME: To be removed in Automake 1.14, once we can assume autoconf +# 2.70 or later. +# FIXME: keep in sync with the contents of the variable +# '$ac_config_macro_dirs_fallback' in aclocal.in. + +# Copyright (C) 2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], +[m4_defun([_AM_CONFIG_MACRO_DIRS],[])]dnl +[m4_defun([AC_CONFIG_MACRO_DIRS],[_AM_CONFIG_MACRO_DIRS($@)])]) |