maint.mk: extend proper_name_utf8-vs-LIBICONV-checking rule

* top/maint.mk (sc_proper_name_utf8_requires_ICONV): Adapt to work
also when $(LIBICONV) is part of LDADD, rather than ${prog}_LDADD.

diff --git a/ChangeLog b/ChangeLog
index 4d4137ed42bd7bd90d121d040dd0a5ea029e5f09..9bacb894b5a937d6150101c930e409b8417aa934 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-09  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: extend proper_name_utf8-vs-LIBICONV-checking rule
+       * top/maint.mk (sc_proper_name_utf8_requires_ICONV): Adapt to work
+       also when $(LIBICONV) is part of LDADD, rather than ${prog}_LDADD.
+
 2010-01-08  Simon Josefsson  <simon@josefsson.org>
 
        * lib/dup2.c (rpl_dup2): Improve comment.

diff --git a/top/maint.mk b/top/maint.mk
index 3cd1a93bf0db6987a6fb23799c15756e065e697a..3651543267fe14d8158d5f74d1a13b680c64698f 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -524,14 +524,20 @@ sc_prohibit_S_IS_definition:
        msg='do not define S_IS* macros; include <sys/stat.h>'          \
          $(_prohibit_regexp)
 
-# Each program that uses proper_name_utf8 must link with
-# one of the ICONV libraries.
+# Each program that uses proper_name_utf8 must link with one of the
+# ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.
+# The perl -0777 invocation below extracts the possibly-multi-line
+# definition of LDADD from the appropriate Makefile.am and exits 0
+# when it contains "ICONV".
 sc_proper_name_utf8_requires_ICONV:
        @progs=$$(grep -l 'proper_name_utf8 ''("' $$($(VC_LIST_EXCEPT)));\
        if test "x$$progs" != x; then                                   \
          fail=0;                                                       \
          for p in $$progs; do                                          \
            dir=$$(dirname "$$p");                                      \
+           perl -0777                                                  \
+             -ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)'  \
+             $$dir/Makefile.am && continue;                            \
            base=$$(basename "$$p" .c);                                 \
            grep "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null \
              || { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \