From 76ce13275858bb6a27d40f502d5679c01d2b8d41 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 9 Aug 2009 19:58:07 +0200 Subject: [PATCH] Avoid warnings from 'aclocal' when AM_XGETTEXT_OPTION is not defined. --- ChangeLog | 13 +++++++++++++ modules/argp | 4 ++-- modules/error | 4 ++-- modules/propername | 4 ++-- modules/vasprintf | 4 ++-- modules/verror | 4 ++-- modules/xprintf | 8 ++++---- modules/xvasprintf | 2 +- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8b59608f..b5bac665f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-08-09 Bruno Haible + + Avoid warnings from 'aclocal' that are due to a use of macro name + AM_XGETTEXT_OPTION that is not defined in automake. + * modules/argp (configure.ac): Hide use of AM_XGETTEXT_OPTION from + automake. + * modules/error (configure.ac): Likewise. + * modules/propername (configure.ac): Likewise. + * modules/vasprintf (configure.ac): Likewise. + * modules/verror (configure.ac): Likewise. + * modules/xprintf (configure.ac): Likewise. + * modules/xvasprintf (configure.ac): Likewise. + 2009-08-08 Bruno Haible Avoid compilation error in C++ mode. diff --git a/modules/argp b/modules/argp index e232e2e04..a32cae946 100644 --- a/modules/argp +++ b/modules/argp @@ -42,8 +42,8 @@ memmove configure.ac: gl_ARGP m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=argp_error:2:c-format]) - AM_XGETTEXT_OPTION([--flag=argp_failure:4:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=argp_error:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=argp_failure:4:c-format])]) Makefile.am: lib_SOURCES += argp.h argp-ba.c argp-eexst.c \ diff --git a/modules/error b/modules/error index 7b57a8610..fbeeb0d93 100644 --- a/modules/error +++ b/modules/error @@ -17,8 +17,8 @@ strerror configure.ac: gl_ERROR m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=error:3:c-format]) - AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) + AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) Makefile.am: diff --git a/modules/propername b/modules/propername index 8c76453e1..fc819a979 100644 --- a/modules/propername +++ b/modules/propername @@ -26,8 +26,8 @@ gettext-h configure.ac: m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"']) - AM_XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])]) + [AM_][XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"']) + AM_][XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])]) Makefile.am: lib_SOURCES += propername.h propername.c diff --git a/modules/vasprintf b/modules/vasprintf index 1a65ef03e..e0eed16b2 100644 --- a/modules/vasprintf +++ b/modules/vasprintf @@ -21,8 +21,8 @@ configure.ac: gl_FUNC_VASPRINTF gl_STDIO_MODULE_INDICATOR([vasprintf]) m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=asprintf:2:c-format]) - AM_XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) Makefile.am: diff --git a/modules/verror b/modules/verror index c8431981d..6b837e9e3 100644 --- a/modules/verror +++ b/modules/verror @@ -16,8 +16,8 @@ xvasprintf configure.ac: m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=verror:3:c-format]) - AM_XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=verror:3:c-format]) + AM_][XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])]) Makefile.am: lib_SOURCES += verror.h verror.c diff --git a/modules/xprintf b/modules/xprintf index e3ad1e095..186e3b013 100644 --- a/modules/xprintf +++ b/modules/xprintf @@ -20,10 +20,10 @@ stdio configure.ac: m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=xprintf:1:c-format]) - AM_XGETTEXT_OPTION([--flag=xvprintf:1:c-format]) - AM_XGETTEXT_OPTION([--flag=xfprintf:2:c-format]) - AM_XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=xprintf:1:c-format]) + AM_][XGETTEXT_OPTION([--flag=xvprintf:1:c-format]) + AM_][XGETTEXT_OPTION([--flag=xfprintf:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])]) Makefile.am: lib_SOURCES += xprintf.h xprintf.c diff --git a/modules/xvasprintf b/modules/xvasprintf index 70caa4aa0..a931d7c91 100644 --- a/modules/xvasprintf +++ b/modules/xvasprintf @@ -22,7 +22,7 @@ errno configure.ac: gl_XVASPRINTF m4_ifdef([AM_XGETTEXT_OPTION], - [AM_XGETTEXT_OPTION([--flag=xasprintf:1:c-format])]) + [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])]) Makefile.am: lib_SOURCES += xvasprintf.h xvasprintf.c xasprintf.c -- 2.11.0