-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm getting link failures on cygwin, due to missing references to iconv.
OK to apply?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             [email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAks/f/oACgkQ84KuGfSFAYD6SACglIaq1POPo5ulCr8O6BekwLWn
Q1sAni0b73500IUhb7G7FOVtXKUTsArH
=0ezS
-----END PGP SIGNATURE-----
>From cae7ea77489373133d47833321d83b3f7bf5fe51 Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Sat, 2 Jan 2010 10:17:00 -0700
Subject: [PATCH] build: allow compilation on cygwin

* src/Makefile.am (cmp_LDADD): Move LIBICONV...
(LDADD): ...into global flags, since all programs need it.
---
 src/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 65e7fe8..48fbf7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,11 +28,12 @@ LDADD = \
   ../lib/libdiffutils.a \
   $(LIBCSTACK) \
   $(LIBINTL) \
+  $(LIBICONV) \
   $(LIBSIGSEGV) \
   $(LIB_CLOCK_GETTIME)

 diff_LDADD = $(LDADD)
-cmp_LDADD = $(LDADD) $(LIBICONV)
+cmp_LDADD = $(LDADD)
 sdiff_LDADD = $(LDADD)
 diff3_LDADD = $(LDADD)

-- 
1.6.4.2

Reply via email to