avoid warnings from 'aclocal'

[Bruno Haible]

This snippet from modules/error

  m4_ifdef([AM_XGETTEXT_OPTION],
    [AM_XGETTEXT_OPTION([--flag=error:3:c-format])
     AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])

can lead to warnings by 'aclocal'. Ralf Wildenhues kindly explained the cause
of the problem [1]. It's not a problem in automake. So let me add a workaround
here.

[1] http://lists.gnu.org/archive/html/bug-automake/2009-05/msg00013.html


2009-08-09  Bruno Haible  <address@hidden>

        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.

--- modules/argp.orig   2009-08-09 19:45:57.000000000 +0200
+++ modules/argp        2009-08-09 19:42:12.000000000 +0200
@@ -42,8 +42,8 @@
 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 \
--- modules/error.orig  2009-08-09 19:45:57.000000000 +0200
+++ modules/error       2009-08-09 19:42:13.000000000 +0200
@@ -17,8 +17,8 @@
 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:
 
--- modules/propername.orig     2009-08-09 19:45:57.000000000 +0200
+++ modules/propername  2009-08-09 19:42:12.000000000 +0200
@@ -26,8 +26,8 @@
 
 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
--- modules/vasprintf.orig      2009-08-09 19:45:57.000000000 +0200
+++ modules/vasprintf   2009-08-09 19:42:12.000000000 +0200
@@ -21,8 +21,8 @@
 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:
 
--- modules/verror.orig 2009-08-09 19:45:57.000000000 +0200
+++ modules/verror      2009-08-09 19:42:13.000000000 +0200
@@ -16,8 +16,8 @@
 
 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
--- modules/xprintf.orig        2009-08-09 19:45:57.000000000 +0200
+++ modules/xprintf     2009-08-09 19:42:13.000000000 +0200
@@ -20,10 +20,10 @@
 
 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
--- modules/xvasprintf.orig     2009-08-09 19:45:57.000000000 +0200
+++ modules/xvasprintf  2009-08-09 19:42:13.000000000 +0200
@@ -22,7 +22,7 @@
 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