1From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001 2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 3Date: Tue, 17 May 2016 13:26:27 +0300 4Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib 5 6This avoids 7 error: m4_copy: won't overwrite defined macro: glib_DEFUN 8 9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 10Upstream-Status: Pending 11 12--- 13 glib/m4macros/glib-gettext.m4 | 5 +++-- 14 1 file changed, 3 insertions(+), 2 deletions(-) 15 16diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4 17index 5217fd8..155b1d8 100644 18--- a/glib/m4macros/glib-gettext.m4 19+++ b/glib/m4macros/glib-gettext.m4 20@@ -313,7 +313,7 @@ msgstr "" 21 # on various variables needed by the Makefile.in.in installed by 22 # glib-gettextize. 23 dnl 24-glib_DEFUN([GLIB_GNU_GETTEXT], 25+AU_DEFUN([GLIB_GNU_GETTEXT], 26 [AC_REQUIRE([AC_PROG_CC])dnl 27 28 GLIB_LC_MESSAGES 29@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], 30 rm -f po/POTFILES 31 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ 32 < $srcdir/po/POTFILES.in > po/POTFILES 33- ]) 34+ ], 35+ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) 36 37 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) 38 # ------------------------------- 39-- 402.1.4 41 42