From d75090f27cf150267bd59a9e1be42ec51bfb7b0e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 10 Oct 2014 07:31:46 +0900 Subject: [PATCH] autopoint: Fix infinite recursion when tracing configure.ac Reported by Andreas Henriksson at: * autopoint.in (func_trace_autoconf): Temporarily redefine built-in macros, instead of undefining. * gettextize.in: Likewise. --- gettext-tools/misc/autopoint.in | 18 +++++++++--------- gettext-tools/misc/gettextize.in | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) Index: gettext-0.18.3.2/gettext-tools/misc/autopoint.in =================================================================== --- gettext-0.18.3.2.orig/gettext-tools/misc/autopoint.in +++ gettext-0.18.3.2/gettext-tools/misc/autopoint.in @@ -142,13 +142,13 @@ func_trace () { echo '\ dnl disable macros which may abort autom4te -m4_undefine([m4_assert]) -m4_undefine([m4_fatal]) -m4_undefine([m4_warn]) -m4_undefine([m4_errprintn]) -m4_undefine([m4_exit]) -m4_undefine([m4_include]) -m4_undefine([m4_esyscmd]) +m4_pushdef([m4_assert]) +m4_pushdef([m4_fatal]) +m4_pushdef([m4_warn]) +m4_pushdef([m4_errprintn]) +m4_pushdef([m4_exit]) +m4_pushdef([m4_include]) +m4_pushdef([m4_esyscmd]) dnl macros which needs to be traced without aclocal.m4 m4_define([AM_GNU_GETTEXT], []) m4_define([AM_GNU_GETTEXT_VERSION], []) Index: gettext-0.18.3.2/gettext-tools/misc/gettextize.in =================================================================== --- gettext-0.18.3.2.orig/gettext-tools/misc/gettextize.in +++ gettext-0.18.3.2/gettext-tools/misc/gettextize.in @@ -142,13 +142,13 @@ func_trace () { echo '\ dnl disable macros which may abort autom4te -m4_undefine([m4_assert]) -m4_undefine([m4_fatal]) -m4_undefine([m4_warn]) -m4_undefine([m4_errprintn]) -m4_undefine([m4_exit]) -m4_undefine([m4_include]) -m4_undefine([m4_esyscmd]) +m4_pushdef([m4_assert]) +m4_pushdef([m4_fatal]) +m4_pushdef([m4_warn]) +m4_pushdef([m4_errprintn]) +m4_pushdef([m4_exit]) +m4_pushdef([m4_include]) +m4_pushdef([m4_esyscmd]) dnl macros which needs to be traced without aclocal.m4 m4_define([AM_GNU_GETTEXT], []) m4_define([AM_GNU_GETTEXT_VERSION], [])