grep branch, master, updated. v2.5.4-214-g8a3a47d

[Eric Blake]

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  8a3a47de77958ec2781b94068919083d8abde388 (commit)
      from  f17211efe374200d532a9f27173e15b018e5538e (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=8a3a47de77958ec2781b94068919083d8abde388


commit 8a3a47de77958ec2781b94068919083d8abde388
Author: Eric Blake <address@hidden>
Date:   Mon Mar 22 11:21:45 2010 -0600

    build: fix cygwin build
    
    Portions of gnulib depend on -lintl, and cygwin does not allow
    lazy linking.
    
    * src/Makefile.am (LDADD): Include libraries in correct order.
    
    Signed-off-by: Eric Blake <address@hidden>

diff --git a/src/Makefile.am b/src/Makefile.am
index 5376b97..08f7aac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,13 @@ noinst_LIBRARIES = libgrep.a
 libgrep_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
        pcresearch.c main.c
 
-LDADD = $(LIBINTL) libgrep.a ../lib/libgreputils.a
+# Sometimes, the expansion of $(LIBINTL) includes -lc which may
+# include modules defining variables like `optind', so libgreputils.a
+# 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
+
 grep_LDADD = $(LDADD) $(PCRE_LIBS)
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"

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

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


hooks/post-receive
-- 
grep