Avoid warnings from 'aclocal' when AM_XGETTEXT_OPTION is not defined.

diff --git a/ChangeLog b/ChangeLog
index b8b59608f4685eadacbfcc9a329f58a842f7d2e5..b5bac665f1315245d8f350fe028fadc54e3a89d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-08-09  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Avoid compilation error in C++ mode.

diff --git a/modules/argp b/modules/argp
index e232e2e04b3a7fc339b8b00e454bff4dccf026bd..a32cae9466b2cb69048b71262e6057a25d6a8e16 100644 (file)
--- 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 7b57a8610ffe34381af4811e7b8dde4660abe02c..fbeeb0d9320a69e4b041e5f6d74ed0cefc84e362 100644 (file)
--- 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 8c76453e198c63f8fbf6760cb450b255b7ded207..fc819a979696b3183e52fa22e82168e266fd5654 100644 (file)
--- 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 1a65ef03e13169894ef64f9552deb3eb1d909a6f..e0eed16b242a67a35e4ba7351ef405114ee7e9f5 100644 (file)
--- 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 c8431981d8d313d21c0f96056b3355010b9ccf6f..6b837e9e3c5dd11624eb6b1aeba09b069530983e 100644 (file)
--- 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 e3ad1e0950d92c19b49518bfa9d347ade0134700..186e3b013eeedb542d1971cef99a49729cb561ee 100644 (file)
--- 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 70caa4aa0b87a5ec3ea5211fcff8f568bfa5e90a..a931d7c9191ea31ebd8a4d5a373cec47abe874d4 100644 (file)
--- 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