From fa1b673a452f5c7874cb5dd2610b5238cedc4d65 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 5 Dec 2014 14:22:38 +0000 Subject: gnulib: sync with upstream. Notably this moves to the new 64bit obstack implementation. * gnulib: Sync with upstream, for maint.mk bug fixes et al. * build-aux/m4/gnulib-cache.m4, po/Makevars: Regenerate. Signed-off-by: Gary V. Vaughan --- build-aux/gnulib | 2 +- build-aux/m4/gnulib-cache.m4 | 2 +- po/Makevars | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-aux/gnulib b/build-aux/gnulib index a4482b66..79002fdd 160000 --- a/build-aux/gnulib +++ b/build-aux/gnulib @@ -1 +1 @@ -Subproject commit a4482b667f8c6ba6e89eacb876fab7ff4775dab4 +Subproject commit 79002fdd9f556694728f5ebc2ea0c43c14ef476d diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4 index a31e5666..145b3da6 100644 --- a/build-aux/m4/gnulib-cache.m4 +++ b/build-aux/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/po/Makevars b/po/Makevars index 118868e6..6f3cd637 100644 --- a/po/Makevars +++ b/po/Makevars @@ -9,9 +9,9 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \ ---flag=_:1:pass-c-format \ ---flag=N_:1:pass-c-format \ -$${end_of_xgettext_options+} + --flag=_:1:pass-c-format \ + --flag=N_:1:pass-c-format \ + $${end_of_xgettext_options+} # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -- cgit v1.2.1