X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/8c45dd9fec485578a09dbf541d4209dcf77acd5f..7029e258114ecffe7a80be495fba50a70e6ab00c:/m4/am-compat.m4 diff --git a/m4/am-compat.m4 b/m4/am-compat.m4 index f8592ab..852fe87 100644 --- 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])])