grep branch, master, updated. v2.7-6-g0fdedfb

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  0fdedfb32dda12320e10df7973b9f5e72d2ac66b (commit)
      from  b92e6c21642dd200e3e352997f20ab9bfb556a61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=0fdedfb32dda12320e10df7973b9f5e72d2ac66b


commit 0fdedfb32dda12320e10df7973b9f5e72d2ac66b
Author: Bruno Haible <address@hidden>
Date:   Thu Sep 23 13:18:22 2010 +0200

    build: fix link error on systems that have libiconv but not libintl
    
    * src/Makefile.am (LDADD): Add $(LIBICONV).

diff --git a/src/Makefile.am b/src/Makefile.am
index 991c3b5..689ccab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,9 @@ libgrep_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c 
kwsearch.c \
 # must precede $(LIBINTL) in order to ensure we use GNU getopt.
 # But libgreputils.a must also follow $(LIBINTL), since libintl uses
 # replacement functions defined in libgreputils.a.
-LDADD = libgrep.a ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
+LDADD = \
+  libgrep.a \
+  ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a $(LIBICONV)
 
 grep_LDADD = $(LDADD) $(LIB_PCRE)
 localedir = $(datadir)/locale

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep