From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
Date: Tue, 17 May 2016 13:26:27 +0300
|
Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
|
|
This avoids
|
error: m4_copy: won't overwrite defined macro: glib_DEFUN
|
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
Upstream-Status: Pending
|
|
---
|
glib/m4macros/glib-gettext.m4 | 5 +++--
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4
|
index 5217fd8..155b1d8 100644
|
--- a/glib/m4macros/glib-gettext.m4
|
+++ b/glib/m4macros/glib-gettext.m4
|
@@ -313,7 +313,7 @@ msgstr ""
|
# on various variables needed by the Makefile.in.in installed by
|
# glib-gettextize.
|
dnl
|
-glib_DEFUN([GLIB_GNU_GETTEXT],
|
+AU_DEFUN([GLIB_GNU_GETTEXT],
|
[AC_REQUIRE([AC_PROG_CC])dnl
|
|
GLIB_LC_MESSAGES
|
@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
|
rm -f po/POTFILES
|
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
< $srcdir/po/POTFILES.in > po/POTFILES
|
- ])
|
+ ],
|
+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
|
|
# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
|
# -------------------------------
|
--
|
2.1.4
|
