diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-06 11:04:45 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-06 11:04:45 +0200 |
| commit | adb834ebf078a00ed67ebc325c692452e6e5dcf6 (patch) | |
| tree | 07ad1e1004ae662598fd276efc84f06f3fd51405 /m4 | |
| parent | 68075ce0b2c88cb6972031b9bb3505338c5ab321 (diff) | |
| parent | 37267407001d025b48648c4fbcf5b3f16072fcc1 (diff) | |
| download | automake-adb834ebf078a00ed67ebc325c692452e6e5dcf6.tar.gz | |
Merge branch 'maint'
* maint:
m4: prepend m4 builtins with "m4_"
docs: fix clumsy grammar in the scripts-based testsuite chapter
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/init.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index 91a0620d9..a496154d0 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -90,20 +90,20 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES([CC])], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES([CXX])], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], [_AM_DEPENDENCIES([OBJC])], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], - [define([AC_PROG_OBJCXX], - defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) AC_REQUIRE([AM_SILENT_RULES])dnl dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |