DX_AUTOMAKE_COMPAT: Fix compile with newer Automake.

[dxcommon.git] / m4 / am-compat.m4

diff --git a/m4/am-compat.m4 b/m4/am-compat.m4
index f8592ab74b5db82a22be26e6f3b7b4d9a60f0092..852fe87562189b9fdb835d81b2c8728a5748d8f3 100644 (file)
--- a/m4/am-compat.m4
+++ b/m4/am-compat.m4
@@ -41,6 +41,7 @@ dnl    in Automake 1.11).
 
 AC_DEFUN_ONCE([DX_AUTOMAKE_COMPAT],
 [AC_REQUIRE([DX_INIT])dnl
+AC_REQUIRE([_DX_AUTOMAKE_COMPAT_PATCH_CC])dnl
 AC_CONFIG_COMMANDS_PRE([# Patch install-sh references to include $SHELL
 AS_CASE([$MKDIR_P], ["$ac_install_sh"*], [MKDIR_P="$SHELL $MKDIR_P"])
 AS_CASE([$INSTALL], ["$ac_install_sh"*], [INSTALL="$SHELL $INSTALL"])
@@ -82,6 +83,10 @@ AS_CASE([$dx_cv_am_depfiles],
 AC_SUBST([dx_depfiles_target], [am--depfiles])
 AC_SUBST([dx_include_marker])
 AM_SUBST_NOTMAKE([dx_depfiles_target])
-AM_SUBST_NOTMAKE([dx_include_marker])
+AM_SUBST_NOTMAKE([dx_include_marker])])
 
-])
+AC_DEFUN_ONCE([_DX_AUTOMAKE_COMPAT_PATCH_CC],
+[AC_BEFORE([$0], [_AM_PROG_CC_C_O])dnl
+DX_PATCH_MACRO([_AM_PROG_CC_C_O],
+  ["[$]am_aux_dir/compile],
+  ["$SHELL $am_aux_dir/compile])])