X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/2f638e51e602982648087e00c788a4751f1a4a8c..4bd99d1590b1a3cb9a8403ac420aa2571bc78af5:/m4/am-compat.m4 diff --git a/m4/am-compat.m4 b/m4/am-compat.m4 index 852fe87..f56b4b2 100644 --- a/m4/am-compat.m4 +++ b/m4/am-compat.m4 @@ -1,4 +1,4 @@ -dnl Copyright © 2012, 2021, 2023 Nick Bowler +dnl Copyright © 2012, 2021, 2023-2024 Nick Bowler dnl dnl Definitions to help maintain compatibility with multiple Automake versions. dnl @@ -42,6 +42,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_REQUIRE([_DX_AUTOMAKE_COMPAT_PATCH_AR])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"]) @@ -90,3 +91,9 @@ AC_DEFUN_ONCE([_DX_AUTOMAKE_COMPAT_PATCH_CC], DX_PATCH_MACRO([_AM_PROG_CC_C_O], ["[$]am_aux_dir/compile], ["$SHELL $am_aux_dir/compile])]) + +AC_DEFUN_ONCE([_DX_AUTOMAKE_COMPAT_PATCH_AR], +[AC_BEFORE([$0], [AM_PROG_AR])dnl +DX_PATCH_MACRO([AM_PROG_AR], + ["[$]am_aux_dir/ar-lib], + ["$SHELL $am_aux_dir/ar-lib])])