|
 |
32c7ad1 |
commit d75090f27cf150267bd59a9e1be42ec51bfb7b0e
|
|
|
32c7ad1 |
Author: Eric Blake <eblake@redhat.com>
|
|
|
32c7ad1 |
Date: Fri Oct 10 07:31:46 2014 +0900
|
|
|
32c7ad1 |
|
|
|
32c7ad1 |
autopoint: Fix infinite recursion when tracing configure.ac
|
|
|
32c7ad1 |
|
|
|
32c7ad1 |
Reported by Andreas Henriksson at:
|
|
|
32c7ad1 |
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580>
|
|
|
32c7ad1 |
* autopoint.in (func_trace_autoconf): Temporarily redefine
|
|
|
32c7ad1 |
built-in macros, instead of undefining.
|
|
|
32c7ad1 |
* gettextize.in: Likewise.
|
|
|
32c7ad1 |
|
|
|
32c7ad1 |
Index: gettext-0.19.2/gettext-tools/misc/autopoint.in
|
|
|
32c7ad1 |
===================================================================
|
|
|
32c7ad1 |
--- gettext-0.19.2.orig/gettext-tools/misc/autopoint.in
|
|
|
32c7ad1 |
+++ gettext-0.19.2/gettext-tools/misc/autopoint.in
|
|
|
32c7ad1 |
@@ -1,6 +1,6 @@
|
|
|
32c7ad1 |
#! /bin/sh
|
|
|
32c7ad1 |
#
|
|
|
32c7ad1 |
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
|
|
|
32c7ad1 |
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
|
|
32c7ad1 |
#
|
|
|
32c7ad1 |
# This program is free software: you can redistribute it and/or modify
|
|
|
32c7ad1 |
# it under the terms of the GNU General Public License as published by
|
|
|
32c7ad1 |
@@ -143,14 +143,14 @@ fi
|
|
|
32c7ad1 |
func_trace_autoconf ()
|
|
|
32c7ad1 |
{
|
|
|
32c7ad1 |
echo '\
|
|
|
32c7ad1 |
-dnl disable macros which may abort autom4te
|
|
|
32c7ad1 |
-m4_undefine([m4_assert])
|
|
|
32c7ad1 |
-m4_undefine([m4_fatal])
|
|
|
32c7ad1 |
-m4_undefine([m4_warn])
|
|
|
32c7ad1 |
-m4_undefine([m4_errprintn])
|
|
|
32c7ad1 |
-m4_undefine([m4_exit])
|
|
|
32c7ad1 |
-m4_undefine([m4_include])
|
|
|
32c7ad1 |
-m4_undefine([m4_esyscmd])
|
|
|
32c7ad1 |
+dnl replace macros which may abort autom4te with a no-op variant
|
|
|
32c7ad1 |
+m4_pushdef([m4_assert])
|
|
|
32c7ad1 |
+m4_pushdef([m4_fatal])
|
|
|
32c7ad1 |
+m4_pushdef([m4_warn])
|
|
|
32c7ad1 |
+m4_pushdef([m4_errprintn])
|
|
|
32c7ad1 |
+m4_pushdef([m4_exit])
|
|
|
32c7ad1 |
+m4_pushdef([m4_include])
|
|
|
32c7ad1 |
+m4_pushdef([m4_esyscmd])
|
|
|
32c7ad1 |
' \
|
|
|
32c7ad1 |
| "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 \
|
|
|
32c7ad1 |
--trace="$1":\$% - "$2" 2>/dev/null
|
|
|
32c7ad1 |
Index: gettext-0.19.2/gettext-tools/misc/gettextize.in
|
|
|
32c7ad1 |
===================================================================
|
|
|
32c7ad1 |
--- gettext-0.19.2.orig/gettext-tools/misc/gettextize.in
|
|
|
32c7ad1 |
+++ gettext-0.19.2/gettext-tools/misc/gettextize.in
|
|
|
32c7ad1 |
@@ -1,6 +1,6 @@
|
|
|
32c7ad1 |
#! /bin/sh
|
|
|
32c7ad1 |
#
|
|
|
32c7ad1 |
-# Copyright (C) 1995-1998, 2000-2013 Free Software Foundation, Inc.
|
|
|
32c7ad1 |
+# Copyright (C) 1995-1998, 2000-2014 Free Software Foundation, Inc.
|
|
|
32c7ad1 |
#
|
|
|
32c7ad1 |
# This program is free software: you can redistribute it and/or modify
|
|
|
32c7ad1 |
# it under the terms of the GNU General Public License as published by
|
|
|
32c7ad1 |
@@ -143,14 +143,14 @@ fi
|
|
|
32c7ad1 |
func_trace_autoconf ()
|
|
|
32c7ad1 |
{
|
|
|
32c7ad1 |
echo '\
|
|
|
32c7ad1 |
-dnl disable macros which may abort autom4te
|
|
|
32c7ad1 |
-m4_undefine([m4_assert])
|
|
|
32c7ad1 |
-m4_undefine([m4_fatal])
|
|
|
32c7ad1 |
-m4_undefine([m4_warn])
|
|
|
32c7ad1 |
-m4_undefine([m4_errprintn])
|
|
|
32c7ad1 |
-m4_undefine([m4_exit])
|
|
|
32c7ad1 |
-m4_undefine([m4_include])
|
|
|
32c7ad1 |
-m4_undefine([m4_esyscmd])
|
|
|
32c7ad1 |
+dnl replace macros which may abort autom4te with a no-op variant
|
|
|
32c7ad1 |
+m4_pushdef([m4_assert])
|
|
|
32c7ad1 |
+m4_pushdef([m4_fatal])
|
|
|
32c7ad1 |
+m4_pushdef([m4_warn])
|
|
|
32c7ad1 |
+m4_pushdef([m4_errprintn])
|
|
|
32c7ad1 |
+m4_pushdef([m4_exit])
|
|
|
32c7ad1 |
+m4_pushdef([m4_include])
|
|
|
32c7ad1 |
+m4_pushdef([m4_esyscmd])
|
|
|
32c7ad1 |
' \
|
|
|
32c7ad1 |
| "$AUTOM4TE" --no-cache --language=Autoconf-without-aclocal-m4 \
|
|
|
32c7ad1 |
--trace="$1":\$% - "$2" 2>/dev/null
|