From: Vincent Torri <vincent.torri@gmail.com>
Date: Thu, 9 Jun 2011 10:02:14 +0000 (+0200)
Subject: (LIBNETTLE_LINK, LIBHOGWEED_LINK): Cygwin fix, from Vincent Torri.
X-Git-Tag: nettle_2.2_release_20110711~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92de427d8f91f35d0e59b4f76bef986203d822c9;p=thirdparty%2Fnettle.git

(LIBNETTLE_LINK, LIBHOGWEED_LINK): Cygwin fix, from Vincent Torri.

Rev: nettle/ChangeLog:1.182
Rev: nettle/configure.ac:1.31
---

diff --git a/ChangeLog b/ChangeLog
index 5152d1cc..ffb1109f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2011-06-09  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac (LIBNETTLE_LINK, LIBHOGWEED_LINK): Cygwin fix, from
+	Vincent Torri.
+
 2011-06-08  Niels Möller  <nisse@lysator.liu.se>
 
+	* serpent-encrypt.c (SBOX4): Renamed arguments.
+
 	* examples/eratosthenes.c (find_first_one): Fixed c99-style
 	declaration. Reported by Sebastian Reitenbach.
 	(find_first_one): Declare the lookup table as static const, and
diff --git a/configure.ac b/configure.ac
index dd0185e2..8dcc0809 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,13 +254,13 @@ case "$host_os" in
     LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
     LIBNETTLE_SONAME=''
     LIBNETTLE_FILE='libnettle.dll.a'
-    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_LIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
+    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
     LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)'
 
     LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
     LIBHOGWEED_SONAME=''
     LIBHOGWEED_FILE='libhogweed.dll.a'
-    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_LIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
+    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
     LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS)'
     ;;
   darwin*)