[beast: 1/3] BUILD: update glib-gettext.m4 to latest version from glib git repo
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 1/3] BUILD: update glib-gettext.m4 to latest version from glib git repo
- Date: Sat, 21 May 2016 12:29:27 +0000 (UTC)
commit ebb0dacbecf63a402c005919c51efcea6fa49884
Author: Stefan Westerfeld <stefan space twc de>
Date: Sat Apr 23 16:33:08 2016 +0200
BUILD: update glib-gettext.m4 to latest version from glib git repo
This fixes autogen.sh issues on KUbuntu 16.04.
Signed-off-by: Tim Janik <timj gnu org>
autotools/glib-gettext.m4 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/autotools/glib-gettext.m4 b/autotools/glib-gettext.m4
index 981ba77..155b1d8 100644
--- a/autotools/glib-gettext.m4
+++ b/autotools/glib-gettext.m4
@@ -239,6 +239,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -280,7 +284,7 @@ msgstr ""
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
+ dnl in configure.ac.
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
@@ -309,9 +313,8 @@ 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
- AC_REQUIRE([AC_HEADER_STDC])dnl
GLIB_LC_MESSAGES
GLIB_WITH_NLS
@@ -378,10 +381,10 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
posrcprefix="../"
fi
rm -f po/POTFILES
- test -e $srcdir/po/POTFILES.in && \
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ 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)
# -------------------------------
@@ -410,7 +413,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
dnl
dnl Now the definitions that aclocal will find
dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]