git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

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